From 56a3a499f4d6140cd4fc159e216480f163bdaece Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 8 May 2023 13:43:35 -0400 Subject: [PATCH] configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini --- configs/CMPCPRO_defconfig | 5 -- configs/am62x_evm_r5_defconfig | 1 - configs/am64x_evm_r5_defconfig | 6 +-- configs/bcmns_defconfig | 24 ++++----- configs/imx8mq_reform2_defconfig | 8 ++- configs/imx8qm_dmsse20a1_defconfig | 86 +++++++++--------------------- configs/j7200_evm_r5_defconfig | 1 - configs/j721s2_evm_r5_defconfig | 1 - configs/smegw01_defconfig | 4 +- 9 files changed, 44 insertions(+), 92 deletions(-) diff --git a/configs/CMPCPRO_defconfig b/configs/CMPCPRO_defconfig index 7313715624..8bf4ddffd1 100644 --- a/configs/CMPCPRO_defconfig +++ b/configs/CMPCPRO_defconfig @@ -21,7 +21,6 @@ CONFIG_BAT0_NAME="FLASH" CONFIG_BAT0_BASE=0x40000000 CONFIG_BAT0_LENGTH_64_MBYTES=y CONFIG_BAT0_ACCESS_RW=y -CONFIG_BAT0_ICACHE_WRITETHROUGH=y CONFIG_BAT0_DCACHE_WRITETHROUGH=y CONFIG_BAT0_USER_MODE_VALID=y CONFIG_BAT0_SUPERVISOR_MODE_VALID=y @@ -43,7 +42,6 @@ CONFIG_BAT3=y CONFIG_BAT3_NAME="BCSR" CONFIG_BAT3_BASE=0xA0000000 CONFIG_BAT3_ACCESS_RW=y -CONFIG_BAT3_ICACHE_GUARDED=y CONFIG_BAT3_DCACHE_WRITETHROUGH=y CONFIG_BAT3_DCACHE_INHIBITED=y CONFIG_BAT3_DCACHE_GUARDED=y @@ -53,7 +51,6 @@ CONFIG_BAT4_NAME="PERIPHETH" CONFIG_BAT4_BASE=0x90000000 CONFIG_BAT4_LENGTH_64_MBYTES=y CONFIG_BAT4_ACCESS_RW=y -CONFIG_BAT4_ICACHE_GUARDED=y CONFIG_BAT4_DCACHE_WRITETHROUGH=y CONFIG_BAT4_DCACHE_INHIBITED=y CONFIG_BAT4_DCACHE_GUARDED=y @@ -63,7 +60,6 @@ CONFIG_BAT5_NAME="CARTEBASE" CONFIG_BAT5_BASE=0x80000000 CONFIG_BAT5_LENGTH_64_MBYTES=y CONFIG_BAT5_ACCESS_RW=y -CONFIG_BAT5_ICACHE_GUARDED=y CONFIG_BAT5_DCACHE_WRITETHROUGH=y CONFIG_BAT5_DCACHE_INHIBITED=y CONFIG_BAT5_DCACHE_GUARDED=y @@ -73,7 +69,6 @@ CONFIG_BAT6_NAME="IMMRBAR" CONFIG_BAT6_BASE=0xB0000000 CONFIG_BAT6_LENGTH_4_MBYTES=y CONFIG_BAT6_ACCESS_RW=y -CONFIG_BAT6_ICACHE_GUARDED=y CONFIG_BAT6_DCACHE_INHIBITED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig index 642600f92d..3c5f367298 100644 --- a/configs/am62x_evm_r5_defconfig +++ b/configs/am62x_evm_r5_defconfig @@ -31,7 +31,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000 -CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig index bb705a1c3c..023ee638a0 100644 --- a/configs/am64x_evm_r5_defconfig +++ b/configs/am64x_evm_r5_defconfig @@ -150,6 +150,9 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y +CONFIG_SYSRESET_TI_SCI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_OMAP_TIMER=y @@ -169,6 +172,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x6165 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 -CONFIG_SYSRESET=y -CONFIG_SPL_SYSRESET=y -CONFIG_SYSRESET_TI_SCI=y diff --git a/configs/bcmns_defconfig b/configs/bcmns_defconfig index 02e2fbe3db..3be6a37009 100644 --- a/configs/bcmns_defconfig +++ b/configs/bcmns_defconfig @@ -4,38 +4,34 @@ CONFIG_TEXT_BASE=0x00008000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_NR_DRAM_BANKS=2 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x00100000 CONFIG_DEFAULT_DEVICE_TREE="ns-board" +CONFIG_SYS_PROMPT="northstar> " CONFIG_IDENT_STRING="Broadcom Northstar" CONFIG_SYS_LOAD_ADDR=0x00008000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x00100000 +CONFIG_ENV_VARS_UBOOT_CONFIG=y # CONFIG_BOOTSTD is not set +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_BOOTDELAY=1 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Boot Northstar system in %d seconds\n" -CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run bootcmd_dlink_dir8xxl" -CONFIG_SYS_PROMPT="northstar> " -CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 -CONFIG_CMD_SEAMA=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_SEAMA=y +CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_USE_HOSTNAME=y CONFIG_HOSTNAME="NS" +# CONFIG_NET is not set CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y -CONFIG_MTD_RAW_NAND=y -CONFIG_NAND_BRCMNAND=y CONFIG_SYS_NAND_ONFI_DETECTION=y -CONFIG_CMD_NAND=y -CONFIG_DM_SERIAL=y -CONFIG_SYS_NS16550=y -# CONFIG_NET is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/imx8mq_reform2_defconfig b/configs/imx8mq_reform2_defconfig index 9b14a1bca1..be0a14166b 100644 --- a/configs/imx8mq_reform2_defconfig +++ b/configs/imx8mq_reform2_defconfig @@ -15,20 +15,21 @@ CONFIG_DEFAULT_DEVICE_TREE="imx8mq-mnt-reform2" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MQ_REFORM2=y CONFIG_SYS_PROMPT="u-boot=> " +CONFIG_DM_RESET=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y +CONFIG_SPL_STACK=0x187ff0 CONFIG_SPL=y CONFIG_IMX_BOOTAUX=y CONFIG_SYS_LOAD_ADDR=0x40480000 -CONFIG_DISTRO_DEFAULTS=y CONFIG_REMAKE_ELF=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_SYSTEM_SETUP=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="freescale/imx8mq-mnt-reform2.dtb" CONFIG_CONSOLE_MUX=y @@ -40,7 +41,6 @@ CONFIG_SPL_BSS_START_ADDR=0x180000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000 @@ -81,7 +81,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y -CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_FEC_MXC=y CONFIG_MII=y @@ -96,7 +95,6 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPL_POWER_I2C=y -CONFIG_DM_RESET=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_DM_THERMAL=y diff --git a/configs/imx8qm_dmsse20a1_defconfig b/configs/imx8qm_dmsse20a1_defconfig index 3341b5e447..70f7b378d5 100644 --- a/configs/imx8qm_dmsse20a1_defconfig +++ b/configs/imx8qm_dmsse20a1_defconfig @@ -3,127 +3,93 @@ CONFIG_SPL_SYS_ICACHE_OFF=y CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_ARCH_IMX8=y CONFIG_TEXT_BASE=0x80020000 -CONFIG_SPL_GPIO_SUPPORT=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_NR_DRAM_BANKS=4 CONFIG_SYS_MALLOC_LEN=0x2800000 CONFIG_SYS_MALLOC_F_LEN=0x4000 -CONFIG_SYS_MMC_IMG_LOAD_PART=0 +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_ENV_SOURCE_FILE="imx8qm_dmsse20-a1" +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 +CONFIG_ENV_OFFSET=0x80000 +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="imx8qm-dmsse20-a1" +CONFIG_AHAB_BOOT=y +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 CONFIG_TARGET_IMX8QM_DMSSE20_A1=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_ENV_OFFSET=0x80000 -CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x80280000 -CONFIG_SYS_MEMTEST_START=0xA0000000 -CONFIG_SYS_MEMTEST_END=0xC0000000 CONFIG_REMAKE_ELF=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_CONTROL=y -CONFIG_CI_UDC=y -CONFIG_DM_PCA953X=y -CONFIG_EVENT=y -CONFIG_DM_EVENT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else booti ${loadaddr} - ${fdt_addr}; fi" CONFIG_LOG=y +# CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_BSS_START_ADDR=0x00128000 CONFIG_SPL_MAX_SIZE=0x1f000 CONFIG_SPL_BSS_MAX_SIZE=0x1000 CONFIG_SPL_BOARD_INIT=y -CONFIG_SPL_SEPARATE_BSS=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y -CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SYS_BOOTM_LEN=0x04000000 CONFIG_HUSH_PARSER=y -CONFIG_IMX_BOOTAUX=y -CONFIG_FS_FAT=y -CONFIG_FS_EXT4=y # CONFIG_BOOTM_NETBSD is not set +CONFIG_SYS_BOOTM_LEN=0x04000000 +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y -CONFIG_MMC_UHS_SUPPORT=y -CONFIG_MMC_HS400_SUPPORT=y -CONFIG_MMC_BROKEN_CD=y -CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y CONFIG_CMD_EXT4=y -CONFIG_CMD_FUSE=y +CONFIG_CMD_FAT=y CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="imx8qm-dmsse20-a1" -CONFIG_ENV_SOURCE_FILE="imx8qm_dmsse20-a1" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SYS_MMC_ENV_DEV=2 -CONFIG_SYS_MMC_ENV_PART=0 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y CONFIG_CPU=y -CONFIG_DM_GPIO=y +CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_SYS_I2C_IMX_LPI2C=y +CONFIG_MISC=y +CONFIG_MMC_BROKEN_CD=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y CONFIG_PHY_GIGE=y -CONFIG_DM_ETH=y -# CONFIG_EFI_LOADER is not set CONFIG_FEC_MXC_SHARE_MDIO=y CONFIG_FEC_MXC_MDIO_BASE=0x5B040000 CONFIG_FEC_MXC=y -CONFIG_FEC1_ENET_DEV=0 -CONFIG_ETHPRIME="eth0" -CONFIG_FEC1_MXC_PHYADDR=0x4 -CONFIG_FEC2_ENET_DEV=1 -CONFIG_ETHPRIME1="eth1" -CONFIG_FEC2_MXC_PHYADDR=0x4 CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8=y CONFIG_POWER_DOMAIN=y CONFIG_IMX8_POWER_DOMAIN=y -CONFIG_IMX_SMMU=y CONFIG_DM_REGULATOR=y CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y -CONFIG_SPL_DM_REGULATOR_GPIO=y +CONFIG_DM_RTC=y +CONFIG_RTC_RV8803=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y -CONFIG_BAUDRATE=115200 -CONFIG_MISC=y -CONFIG_SMC_FUSE=y -CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 -CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_TINY_MEMSET=y -CONFIG_AHAB_BOOT=y -CONFIG_SYS_I2C_IMX_LPI2C=y -CONFIG_DM_RTC=y -CONFIG_RTC_RV8803=y -CONFIG_CMD_DATE=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig index dd4454943c..94a6523f06 100644 --- a/configs/j7200_evm_r5_defconfig +++ b/configs/j7200_evm_r5_defconfig @@ -28,7 +28,6 @@ CONFIG_SPL_SPI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000 -CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_USE_BOOTCOMMAND=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_MAX_SIZE=0xc0000 diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig index 7416ba2d38..4ddbe8faef 100644 --- a/configs/j721s2_evm_r5_defconfig +++ b/configs/j721s2_evm_r5_defconfig @@ -30,7 +30,6 @@ CONFIG_SPL_SPI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000 -CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_USE_BOOTCOMMAND=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 3d2713f528..3d43c9b996 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -18,9 +18,8 @@ CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y -CONFIG_AUTOBOOT_MENU_SHOW=y # CONFIG_BOOTSTD is not set -# CONFIG_CMD_BOOTEFI_BOOTMGR is not set +CONFIG_AUTOBOOT_MENU_SHOW=y CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if test \"${bootcount}\" -gt \"${bootlimit}\"; then run altbootcmd; else if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; run mmcboot; fi;" @@ -84,3 +83,4 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y +# CONFIG_CMD_BOOTEFI_BOOTMGR is not set -- 2.39.5