Merge tag 'zynq-defconfig-for-3.11' of git://git.xilinx.com/linux-xlnx into next/boards (f8ace40e) · Commits · 戴 / test

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>

arch/arm/configs/multi_v7_defconfig

+3 −0

Original line number	Original line	Diff line number	Diff line
	CONFIG_EXPERIMENTAL=y		CONFIG_EXPERIMENTAL=y
	CONFIG_NO_HZ=y		CONFIG_NO_HZ=y
	CONFIG_HIGH_RES_TIMERS=y		CONFIG_HIGH_RES_TIMERS=y
			CONFIG_BLK_DEV_INITRD=y
	CONFIG_ARCH_MVEBU=y		CONFIG_ARCH_MVEBU=y
	CONFIG_MACH_ARMADA_370=y		CONFIG_MACH_ARMADA_370=y
	CONFIG_ARCH_SIRF=y		CONFIG_ARCH_SIRF=y
	@@ -46,6 +47,8 @@ CONFIG_SERIAL_SIRFSOC=y
	CONFIG_SERIAL_SIRFSOC_CONSOLE=y		CONFIG_SERIAL_SIRFSOC_CONSOLE=y
	CONFIG_SERIAL_VT8500=y		CONFIG_SERIAL_VT8500=y
	CONFIG_SERIAL_VT8500_CONSOLE=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_HANDLER=y
	CONFIG_IPMI_SI=y		CONFIG_IPMI_SI=y
	CONFIG_I2C=y		CONFIG_I2C=y

Admin message