Cleanup the defconfig files by running `make defconfig` and `make savedefconfig` to get rid of unnecessarily selected options and sort options.
Signed-off-by: Michael Tretter <[email protected]> --- arch/arm/configs/socfpga-agilex5_defconfig | 1 - arch/arm/configs/socfpga-arria10_defconfig | 8 +------- arch/arm/configs/socfpga-xload_defconfig | 2 +- arch/arm/configs/socfpga_defconfig | 4 ---- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/arm/configs/socfpga-agilex5_defconfig b/arch/arm/configs/socfpga-agilex5_defconfig index 5711cb89ed27..2cfeef3ec30c 100644 --- a/arch/arm/configs/socfpga-agilex5_defconfig +++ b/arch/arm/configs/socfpga-agilex5_defconfig @@ -1,5 +1,4 @@ CONFIG_ARCH_SOCFPGA=y -CONFIG_64BIT=y CONFIG_MACH_SOCFPGA_ARROW_AXE5_EAGLE=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_MMU=y diff --git a/arch/arm/configs/socfpga-arria10_defconfig b/arch/arm/configs/socfpga-arria10_defconfig index f3c9993dcf06..46cd25a8254f 100644 --- a/arch/arm/configs/socfpga-arria10_defconfig +++ b/arch/arm/configs/socfpga-arria10_defconfig @@ -6,9 +6,7 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_NAME="socfpga-arria10_defconfig" CONFIG_MALLOC_SIZE=0x0 -CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y -CONFIG_RELOCATABLE=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y @@ -17,7 +15,6 @@ CONFIG_MENU=y CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y -CONFIG_BOOTM_OFTREE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_STATE=y CONFIG_LONGHELP=y @@ -60,7 +57,6 @@ CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y -CONFIG_CMD_STATE=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y CONFIG_OF_BAREBOX_DRIVERS=y @@ -73,13 +69,11 @@ CONFIG_MCI=y CONFIG_MCI_STARTUP=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_DW=y -CONFIG_STATE_DRV=y # CONFIG_PINCTRL is not set CONFIG_FS_TFTP=y CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y -CONFIG_FS_FAT_LFN=y +CONFIG_DIGEST_SHA256_ARM=y CONFIG_ZLIB=y CONFIG_LZO_DECOMPRESS=y -CONFIG_DIGEST_SHA256_ARM=y diff --git a/arch/arm/configs/socfpga-xload_defconfig b/arch/arm/configs/socfpga-xload_defconfig index ec966c91a8f7..31050cde6683 100644 --- a/arch/arm/configs/socfpga-xload_defconfig +++ b/arch/arm/configs/socfpga-xload_defconfig @@ -1,12 +1,12 @@ CONFIG_ARCH_SOCFPGA=y # CONFIG_CPU_V7VE is not set -CONFIG_ARCH_SOCFPGA_XLOAD=y CONFIG_MACH_SOCFPGA_ALTERA_SOCDK=y CONFIG_MACH_SOCFPGA_EBV_SOCRATES=y CONFIG_MACH_SOCFPGA_ENCLUSTRA_SA2=y CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC=y CONFIG_MACH_SOCFPGA_TERASIC_DE10_NANO=y CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT=y +CONFIG_ARCH_SOCFPGA_XLOAD=y CONFIG_THUMB2_BAREBOX=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y # CONFIG_ARM_EXCEPTIONS is not set diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 8f9e34d459ff..4f879cd45f0f 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -11,9 +11,7 @@ CONFIG_ARM_UNWIND=y CONFIG_NAME="socfpga_defconfig" CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x0 -CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y -CONFIG_RELOCATABLE=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y @@ -22,7 +20,6 @@ CONFIG_MENU=y CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y -CONFIG_BOOTM_OFTREE=y CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_LONGHELP=y @@ -114,4 +111,3 @@ CONFIG_FS_TFTP=y CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y -CONFIG_FS_FAT_LFN=y -- 2.47.3
