From 9e0864fdba917af1070cbb7dee47b15c3df99ddd Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Mon, 6 Nov 2023 14:41:58 -0500 Subject: [PATCH] configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com> --- configs/brsmarc1_defconfig | 1 - configs/evb-rk3036_defconfig | 1 - configs/imx28_xea_sb_defconfig | 1 - configs/inteno_xg6846_ram_defconfig | 15 +++++++-------- configs/kylin-rk3036_defconfig | 1 - configs/mt7620_rfb_defconfig | 1 - configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 2 -- configs/sandbox_noinst_defconfig | 1 - configs/sandbox_spl_defconfig | 1 - configs/sandbox_vpl_defconfig | 1 - configs/socfpga_secu1_defconfig | 1 - 13 files changed, 7 insertions(+), 21 deletions(-) diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig index cb06db61fb..3c3f6d55d5 100644 --- a/configs/brsmarc1_defconfig +++ b/configs/brsmarc1_defconfig @@ -96,7 +96,6 @@ CONFIG_NETCONSOLE=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y # CONFIG_OF_TRANSLATE is not set -# CONFIG_SPL_BLK is not set CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_MMC_OMAP_HS=y diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index 02254ef708..21c657a441 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -41,7 +41,6 @@ CONFIG_CMD_TIME=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y -# CONFIG_SPL_BLK is not set CONFIG_CLK=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig index ed53c11ad0..0b3259866e 100644 --- a/configs/imx28_xea_sb_defconfig +++ b/configs/imx28_xea_sb_defconfig @@ -68,7 +68,6 @@ CONFIG_HOSTNAME="xea" CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_DEVRES=y -# CONFIG_SPL_BLK is not set CONFIG_MXS_GPIO=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_MXS=y diff --git a/configs/inteno_xg6846_ram_defconfig b/configs/inteno_xg6846_ram_defconfig index 99c1ea6aa0..00fe36da68 100644 --- a/configs/inteno_xg6846_ram_defconfig +++ b/configs/inteno_xg6846_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="inteno,xg6846" -CONFIG_SYS_PROMPT="XG6846 # " CONFIG_DM_RESET=y CONFIG_IDENT_STRING="Inteno XG6846" CONFIG_SYS_LOAD_ADDR=0x81000000 @@ -16,27 +15,26 @@ CONFIG_MIPS_CACHE_SETUP=y CONFIG_MIPS_CACHE_DISABLE=y # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set # CONFIG_MIPS_BOOT_ENV_LEGACY is not set -# CONFIG_BOOTSTD is not set +CONFIG_MIPS_BOOT_FDT=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_REMAKE_ELF=y CONFIG_BOOTDELAY=1 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Boot XG6846 in %d seconds\n" +CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe; sf read 0x81000000 0x40000 0x500000; bootm 0x81000000" -CONFIG_MIPS_BOOT_FDT=y -CONFIG_LZMA=y -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_REMAKE_ELF=y -CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="XG6846 # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=541 -CONFIG_SYS_BOOTM_LEN=0x1000000 CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y # CONFIG_CMD_BOOTD is not set +CONFIG_SYS_BOOTM_LEN=0x1000000 # CONFIG_CMD_ELF is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EXPORTENV is not set @@ -72,3 +70,4 @@ CONFIG_BCM6345_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_BCM63XX_HSSPI=y +CONFIG_LZMA=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 1aab157591..8d3f1a7b09 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -45,7 +45,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y -# CONFIG_SPL_BLK is not set CONFIG_CLK=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y diff --git a/configs/mt7620_rfb_defconfig b/configs/mt7620_rfb_defconfig index fe57fd1892..954870bff8 100644 --- a/configs/mt7620_rfb_defconfig +++ b/configs/mt7620_rfb_defconfig @@ -54,7 +54,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y # CONFIG_SIMPLE_BUS is not set # CONFIG_SPL_SIMPLE_BUS is not set -# CONFIG_SPL_BLK is not set CONFIG_GPIO_HOG=y # CONFIG_INPUT is not set CONFIG_MMC=y diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 1a01f51a0b..6c488bac2b 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -50,7 +50,6 @@ CONFIG_CMD_GPT_RENAME=y CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_LOADM=y -CONFIG_CMD_MBR=y CONFIG_CMD_OSD=y CONFIG_CMD_PCI=y CONFIG_CMD_READ=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index c8a4669050..bc5bcb2a62 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -338,7 +338,6 @@ CONFIG_CMD_DHRYSTONE=y CONFIG_ECDSA=y CONFIG_ECDSA_VERIFY=y CONFIG_TPM=y -CONFIG_SHA384=y CONFIG_ERRNO_STR=y CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y CONFIG_EFI_CAPSULE_ON_DISK=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 44ab80725f..0b637727d9 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -43,8 +43,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y -CONFIG_CMD_MBR=y -CONFIG_CMD_MMC=y CONFIG_CMD_OSD=y CONFIG_CMD_PCI=y CONFIG_CMD_READ=y diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig index db05e63083..cd412ee269 100644 --- a/configs/sandbox_noinst_defconfig +++ b/configs/sandbox_noinst_defconfig @@ -80,7 +80,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y -CONFIG_CMD_MBR=y CONFIG_CMD_OSD=y CONFIG_CMD_PCI=y CONFIG_CMD_REMOTEPROC=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 56072b15ad..eeccee62b8 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -66,7 +66,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y -CONFIG_CMD_MBR=y CONFIG_CMD_OSD=y CONFIG_CMD_PCI=y CONFIG_CMD_REMOTEPROC=y diff --git a/configs/sandbox_vpl_defconfig b/configs/sandbox_vpl_defconfig index 5bd0281796..293e294d57 100644 --- a/configs/sandbox_vpl_defconfig +++ b/configs/sandbox_vpl_defconfig @@ -74,7 +74,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y -CONFIG_CMD_MBR=y CONFIG_CMD_OSD=y CONFIG_CMD_PCI=y CONFIG_CMD_REMOTEPROC=y diff --git a/configs/socfpga_secu1_defconfig b/configs/socfpga_secu1_defconfig index 157391a71c..b8052f1dee 100644 --- a/configs/socfpga_secu1_defconfig +++ b/configs/socfpga_secu1_defconfig @@ -73,7 +73,6 @@ CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="zImage" CONFIG_VERSION_VARIABLE=y CONFIG_SPL_DM_SEQ_ALIAS=y -# CONFIG_SPL_BLK is not set CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_BOOTCOUNT=y CONFIG_DM_BOOTCOUNT_RTC=y -- 2.39.5