From 90de827b9c238f8d8209bc7adc70190575514315 Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Wed, 19 Jun 2013 10:53:03 -0700 Subject: arm: multi_v7_defconfig: Enable Zynq UART driver Signed-off-by: Soren Brinkmann Signed-off-by: Michal Simek --- arch/arm/configs/multi_v7_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 2e67a272df70..bc1c4d772584 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -46,6 +46,8 @@ CONFIG_SERIAL_SIRFSOC=y CONFIG_SERIAL_SIRFSOC_CONSOLE=y CONFIG_SERIAL_VT8500=y CONFIG_SERIAL_VT8500_CONSOLE=y +CONFIG_SERIAL_XILINX_PS_UART=y +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y CONFIG_IPMI_HANDLER=y CONFIG_IPMI_SI=y CONFIG_I2C=y -- cgit v1.2.1 From c12d82b84353784f8233c28ee43cec0ac9fbd7d2 Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Wed, 19 Jun 2013 10:53:04 -0700 Subject: arm: multi_v7_defconfig: Enable initrd/initramfs support Add CONFIG_BLK_DEV_INITRD to the defconfig to support initramfs and initrd. Signed-off-by: Soren Brinkmann Signed-off-by: Michal Simek --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index bc1c4d772584..f3b97be37a44 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -1,6 +1,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BLK_DEV_INITRD=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_ARCH_SIRF=y -- cgit v1.2.1