summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-21 15:48:32 +0200
committerArnd Bergmann <arnd@arndb.de>2013-06-21 15:48:32 +0200
commitf8ace40e88eb7063f66697713373ac64cbc1412a (patch)
tree955a855c0f0329e9b1f5173f717dcfa474b485b2 /arch
parent969ae2ac40288b50a0ff4d84e8bddc2d8cc9d08a (diff)
parentc12d82b84353784f8233c28ee43cec0ac9fbd7d2 (diff)
downloadblackbird-op-linux-f8ace40e88eb7063f66697713373ac64cbc1412a.tar.gz
blackbird-op-linux-f8ace40e88eb7063f66697713373ac64cbc1412a.zip
Merge tag 'zynq-defconfig-for-3.11' of git://git.xilinx.com/linux-xlnx into next/boards
From Michal Simek: arm: Xilinx Zynq defconfig changes for v3.11 Enable zynq uartps driver and initrd in defconfig. * tag 'zynq-defconfig-for-3.11' of git://git.xilinx.com/linux-xlnx: arm: multi_v7_defconfig: Enable initrd/initramfs support arm: multi_v7_defconfig: Enable Zynq UART driver Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/multi_v7_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 2e67a272df70..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
@@ -46,6 +47,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
OpenPOWER on IntegriCloud