aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Stehlé <vincent.stehle@freescale.com>2013-07-03 04:12:58 -0400
committerOlof Johansson <olof@lixom.net>2013-07-12 14:02:17 -0400
commit1157d73d07b6143cbe49145ef917d52abbe531f1 (patch)
treeedcf78b6b8139e0394febc6490f2894c356ebe38
parentf4b96f5e4ff8d86699c851c10245e102809b0331 (diff)
arm: multi_v7_defconfig: add i.MX options and NFS root
- Add i.MX serial console support. This gives us the boot messages on UART on e.g. the i.MX6Q sabre sd platform. - Add the necessary config options, to allow booting with NFS root on an i.MX6 sabre sd. - Add Freescale LPUART serial console support. This gives us the boot messages on UART on e.g. the Vybrid VF610 Tower board. Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com> Cc: Russell King <linux@arm.linux.org.uk> [olof: squashed three commits down to one] Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/configs/multi_v7_defconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6d8d3c456b5f..80aacc6d3b48 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -47,6 +47,8 @@ CONFIG_ARM_APPENDED_DTB=y
47CONFIG_NET=y 47CONFIG_NET=y
48CONFIG_UNIX=y 48CONFIG_UNIX=y
49CONFIG_INET=y 49CONFIG_INET=y
50CONFIG_IP_PNP=y
51CONFIG_IP_PNP_DHCP=y
50CONFIG_DEVTMPFS=y 52CONFIG_DEVTMPFS=y
51CONFIG_DEVTMPFS_MOUNT=y 53CONFIG_DEVTMPFS_MOUNT=y
52CONFIG_BLK_DEV_SD=y 54CONFIG_BLK_DEV_SD=y
@@ -75,6 +77,10 @@ CONFIG_SERIAL_OMAP=y
75CONFIG_SERIAL_OMAP_CONSOLE=y 77CONFIG_SERIAL_OMAP_CONSOLE=y
76CONFIG_SERIAL_XILINX_PS_UART=y 78CONFIG_SERIAL_XILINX_PS_UART=y
77CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y 79CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
80CONFIG_SERIAL_IMX=y
81CONFIG_SERIAL_IMX_CONSOLE=y
82CONFIG_SERIAL_FSL_LPUART=y
83CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
78CONFIG_I2C_DESIGNWARE_PLATFORM=y 84CONFIG_I2C_DESIGNWARE_PLATFORM=y
79CONFIG_I2C_SIRF=y 85CONFIG_I2C_SIRF=y
80CONFIG_I2C_TEGRA=y 86CONFIG_I2C_TEGRA=y
@@ -147,6 +153,10 @@ CONFIG_PWM=y
147CONFIG_PWM_VT8500=y 153CONFIG_PWM_VT8500=y
148CONFIG_EXT4_FS=y 154CONFIG_EXT4_FS=y
149CONFIG_TMPFS=y 155CONFIG_TMPFS=y
156CONFIG_NFS_FS=y
157CONFIG_NFS_V3_ACL=y
158CONFIG_NFS_V4=y
159CONFIG_ROOT_NFS=y
150CONFIG_PRINTK_TIME=y 160CONFIG_PRINTK_TIME=y
151CONFIG_DEBUG_FS=y 161CONFIG_DEBUG_FS=y
152CONFIG_DEBUG_KERNEL=y 162CONFIG_DEBUG_KERNEL=y