diff options
author | Srinivas Kandagatla <srinivas.kandagatla@st.com> | 2013-12-04 08:10:13 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-12-04 16:57:38 -0500 |
commit | 4b7c0f41b112304875ac49fdf78d8dffd11e4ca0 (patch) | |
tree | 8811455323df757bf420655f3e7cf42d348f584a | |
parent | f07c71aeeedbb1a69ab6e6091af5ba27dc4301cb (diff) |
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>
-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 | |||
68 | CONFIG_KS8851=y | 68 | CONFIG_KS8851=y |
69 | CONFIG_SMSC911X=y | 69 | CONFIG_SMSC911X=y |
70 | CONFIG_STMMAC_ETH=y | 70 | CONFIG_STMMAC_ETH=y |
71 | CONFIG_ICPLUS_PHY=y | ||
71 | CONFIG_MDIO_SUN4I=y | 72 | CONFIG_MDIO_SUN4I=y |
72 | CONFIG_KEYBOARD_SPEAR=y | 73 | CONFIG_KEYBOARD_SPEAR=y |
73 | CONFIG_SERIO_AMBAKMI=y | 74 | CONFIG_SERIO_AMBAKMI=y |
@@ -90,6 +91,8 @@ CONFIG_SERIAL_XILINX_PS_UART=y | |||
90 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y | 91 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y |
91 | CONFIG_SERIAL_FSL_LPUART=y | 92 | CONFIG_SERIAL_FSL_LPUART=y |
92 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y | 93 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y |
94 | CONFIG_SERIAL_ST_ASC=y | ||
95 | CONFIG_SERIAL_ST_ASC_CONSOLE=y | ||
93 | CONFIG_I2C_DESIGNWARE_PLATFORM=y | 96 | CONFIG_I2C_DESIGNWARE_PLATFORM=y |
94 | CONFIG_I2C_SIRF=y | 97 | CONFIG_I2C_SIRF=y |
95 | CONFIG_I2C_TEGRA=y | 98 | CONFIG_I2C_TEGRA=y |