[PATCH] ARM: socfpga-xload_*defconfig: merge and disable unused features

[Sascha Hauer]

The socfpga-xload_*defconfig have MC13xxx, AT25 and SPI support enabled.
Disable these as they are unused. This makes the configs small enough so
that we can merge the two existing configs into one.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/configs/socfpga-xload-2_defconfig | 28 ----------------------
 arch/arm/configs/socfpga-xload_defconfig   |  9 +++----
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 arch/arm/configs/socfpga-xload-2_defconfig

diff --git a/arch/arm/configs/socfpga-xload-2_defconfig b/arch/arm/configs/socfpga-xload-2_defconfig
deleted file mode 100644
index 78b07aae5b..0000000000
--- a/arch/arm/configs/socfpga-xload-2_defconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-CONFIG_ARCH_SOCFPGA=y
-CONFIG_ARCH_SOCFPGA_XLOAD=y
-CONFIG_MACH_SOCFPGA_ALTERA_SOCDK=y
-CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC=y
-CONFIG_MACH_SOCFPGA_TERASIC_DE10_NANO=y
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-# CONFIG_ARM_EXCEPTIONS is not set
-# CONFIG_MEMINFO is not set
-CONFIG_MMU=y
-CONFIG_MALLOC_SIZE=0x0
-CONFIG_MALLOC_DUMMY=y
-CONFIG_RELOCATABLE=y
-CONFIG_SHELL_NONE=y
-# CONFIG_ERRNO_MESSAGES is not set
-# CONFIG_TIMESTAMP is not set
-CONFIG_DRIVER_SERIAL_NS16550=y
-CONFIG_MCI=y
-CONFIG_MCI_STARTUP=y
-# CONFIG_MCI_WRITE is not set
-CONFIG_MCI_DW=y
-CONFIG_MFD_MC13XXX=y
-CONFIG_EEPROM_AT25=y
-# CONFIG_FS_RAMFS is not set
-# CONFIG_FS_DEVFS is not set
-CONFIG_FS_FAT=y
-CONFIG_BOOTSTRAP=y
-CONFIG_BOOTSTRAP_DISK=y
diff --git a/arch/arm/configs/socfpga-xload_defconfig b/arch/arm/configs/socfpga-xload_defconfig
index 008ba64865..37e9ecec71 100644
--- a/arch/arm/configs/socfpga-xload_defconfig
+++ b/arch/arm/configs/socfpga-xload_defconfig
@@ -1,6 +1,9 @@
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_ARCH_SOCFPGA_XLOAD=y
+CONFIG_MACH_SOCFPGA_ALTERA_SOCDK=y
 CONFIG_MACH_SOCFPGA_EBV_SOCRATES=y
+CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC=y
+CONFIG_MACH_SOCFPGA_TERASIC_DE10_NANO=y
 CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_THUMB2_BAREBOX=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
@@ -9,17 +12,15 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_MMU=y
 CONFIG_MALLOC_SIZE=0x0
 CONFIG_MALLOC_DUMMY=y
-CONFIG_RELOCATABLE=y
 CONFIG_SHELL_NONE=y
 # CONFIG_ERRNO_MESSAGES is not set
-# CONFIG_TIMESTAMP is not set
 CONFIG_DRIVER_SERIAL_NS16550=y
+# CONFIG_SPI is not set
 CONFIG_MCI=y
 CONFIG_MCI_STARTUP=y
 # CONFIG_MCI_WRITE is not set
 CONFIG_MCI_DW=y
-CONFIG_MFD_MC13XXX=y
-CONFIG_EEPROM_AT25=y
+# CONFIG_VIRTIO_MENU is not set
 # CONFIG_FS_RAMFS is not set
 # CONFIG_FS_DEVFS is not set
 CONFIG_FS_FAT=y
-- 
2.39.2