[PATCH 27/27] ARM: multi_v5_v6_defconfig: enable PXA support

[Sascha Hauer]

Enable PXA support along with the Raumfeld Speaker board and PXA peripherals.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/configs/multi_v5_v6_defconfig | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/arch/arm/configs/multi_v5_v6_defconfig b/arch/arm/configs/multi_v5_v6_defconfig
index bc6645b3ce..5f71ec0fd8 100644
--- a/arch/arm/configs/multi_v5_v6_defconfig
+++ b/arch/arm/configs/multi_v5_v6_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARCH_BCM283X=y
 CONFIG_ARCH_IMX=y
+CONFIG_ARCH_PXA=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_MACH_RPI=y
 CONFIG_MACH_SCB9328=y
@@ -8,15 +9,15 @@ CONFIG_MACH_PCA100=y
 CONFIG_MACH_PCM038=y
 CONFIG_IMX_IIM=y
 CONFIG_IMX_IIM_FUSE_BLOW=y
-CONFIG_BOARD_GENERIC_DT=y
+CONFIG_BAREBOX_UPDATE_PXA_NAND=y
+CONFIG_MACH_RAUMFELD_SPEAKER=y
 CONFIG_AEABI=y
-CONFIG_BOOT_ATAGS=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
+CONFIG_BOOT_ATAGS=y
 CONFIG_NAME="multi_v5_v6_defconfig"
 CONFIG_MMU=y
 CONFIG_MALLOC_SIZE=0x0
-CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
 CONFIG_PANIC_HANG=y
 CONFIG_HUSH_FANCY_PROMPT=y
@@ -26,10 +27,9 @@ CONFIG_MENU=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_VERBOSE=y
 CONFIG_BOOTM_INITRD=y
-CONFIG_BOOTM_OFTREE=y
 CONFIG_BLSPEC=y
-CONFIG_CONSOLE_ACTIVATE_ALL_FALLBACK=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
+# CONFIG_BOOT_DEFAULTS is not set
 CONFIG_RESET_SOURCE=y
 CONFIG_LONGHELP=y
 CONFIG_CMD_IOMEM=y
@@ -81,7 +81,9 @@ CONFIG_NET=y
 CONFIG_NET_NETCONSOLE=y
 CONFIG_OF_BAREBOX_DRIVERS=y
 CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_DRIVER_SERIAL_PXA=y
 CONFIG_DRIVER_NET_FEC_IMX=y
+CONFIG_DRIVER_NET_SMC911X=y
 CONFIG_DRIVER_NET_SMC91111=y
 CONFIG_NET_USB=y
 CONFIG_NET_USB_ASIX=y
@@ -94,6 +96,7 @@ CONFIG_CFI_BUFFER_WRITE=y
 CONFIG_NAND=y
 CONFIG_NAND_ALLOW_ERASE_BAD=y
 CONFIG_NAND_IMX=y
+CONFIG_NAND_MRVL_NFC=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_USB_HOST=y
@@ -110,6 +113,8 @@ CONFIG_EEPROM_AT25=y
 CONFIG_EEPROM_AT24=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_IMX=y
+CONFIG_GPIO_PXA=y
+# CONFIG_PINCTRL is not set
 CONFIG_IMX_WEIM=y
 CONFIG_GENERIC_PHY=y
 CONFIG_USB_NOP_XCEIV=y
@@ -120,7 +125,6 @@ CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_UBIFS=y
 CONFIG_FS_UBIFS_COMPRESSION_LZO=y
+CONFIG_FS_QEMU_FW_CFG=y
 CONFIG_DIGEST_SHA1_ARM=y
 CONFIG_DIGEST_SHA256_ARM=y
-CONFIG_QEMU_FW_CFG=y
-CONFIG_FS_QEMU_FW_CFG=y

-- 
2.47.3