diff options
author | Srinivas Kandagatla <srinivas.kandagatla@st.com> | 2013-12-04 13:10:13 +0000 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-12-04 13:57:38 -0800 |
commit | 4b7c0f41b112304875ac49fdf78d8dffd11e4ca0 (patch) | |
tree | 8811455323df757bf420655f3e7cf42d348f584a /arch/arm/configs | |
parent | f07c71aeeedbb1a69ab6e6091af5ba27dc4301cb (diff) | |
download | linux-4b7c0f41b112304875ac49fdf78d8dffd11e4ca0.tar.gz linux-4b7c0f41b112304875ac49fdf78d8dffd11e4ca0.tar.bz2 linux-4b7c0f41b112304875ac49fdf78d8dffd11e4ca0.zip |
ARM: multi_v7_defconfig: Fix STi support
This patch adds ST serial driver (st-asc) and ICPLUS ethernet PHY to
multi_v7_defconfig. All STi based SOCs use ST-ASC as default serial
console, and most of the STi SOC based boards have ICPLUS external
ethernet PHY. These two options makes the system boot nfs root with
console.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 4a5903e04827..d5a6f3233fa0 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -68,6 +68,7 @@ CONFIG_NET_CALXEDA_XGMAC=y CONFIG_KS8851=y CONFIG_SMSC911X=y CONFIG_STMMAC_ETH=y +CONFIG_ICPLUS_PHY=y CONFIG_MDIO_SUN4I=y CONFIG_KEYBOARD_SPEAR=y CONFIG_SERIO_AMBAKMI=y @@ -90,6 +91,8 @@ CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_ST_ASC=y +CONFIG_SERIAL_ST_ASC_CONSOLE=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_SIRF=y CONFIG_I2C_TEGRA=y |