From c2a38411d11d4b4bed5d89990fb5940c2cbaa02e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 2 Jun 2020 17:26:33 -0400 Subject: [PATCH 01/17] serial: Convert ARM_DCC to Kconfig The symbol "CONFIG_ARM_DCC" is used to control building drivers/serial/arm_dcc.c. Provide a simple Kconfig entry for this. Cc: Luca Ceresoli Cc: Michal Simek Cc: Tom McLeod Cc: Mike Looijmans Signed-off-by: Tom Rini Reviewed-by: Luca Ceresoli --- .../avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 + configs/bitmain_antminer_s9_defconfig | 1 + configs/syzygy_hub_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamilite_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/xilinx_versal_mini_defconfig | 1 + configs/xilinx_versal_mini_emmc0_defconfig | 1 + configs/xilinx_versal_mini_emmc1_defconfig | 1 + configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_single_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + drivers/serial/Kconfig | 6 ++++++ include/configs/xilinx_versal.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 2 -- scripts/config_whitelist.txt | 1 - 26 files changed, 27 insertions(+), 5 deletions(-) diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig index 785283fbea..030d28a5df 100644 --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig @@ -55,6 +55,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y CONFIG_SPI=y CONFIG_ZYNQMP_GQSPI=y diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig index 9f88023836..ef5f567615 100644 --- a/configs/bitmain_antminer_s9_defconfig +++ b/configs/bitmain_antminer_s9_defconfig @@ -66,6 +66,7 @@ CONFIG_MII=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y # CONFIG_WATCHDOG is not set CONFIG_WDT=y diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig index db6077c11b..242ebf89e1 100644 --- a/configs/syzygy_hub_defconfig +++ b/configs/syzygy_hub_defconfig @@ -48,6 +48,7 @@ CONFIG_PHY_XILINX=y CONFIG_MII=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index f50d12d154..26b6a8e034 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -49,6 +49,7 @@ CONFIG_SF_DEFAULT_SPEED=108000000 CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_DEBUG_UART_ZYNQ=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y CONFIG_ZYNQ_QSPI=y CONFIG_USB=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index d2fe64ed9e..fb967e90f8 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -49,6 +49,7 @@ CONFIG_SF_DEFAULT_SPEED=108000000 CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_DEBUG_UART_ZYNQ=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y CONFIG_ZYNQ_QSPI=y CONFIG_USB=y diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 9afd7f6bca..23ad93f423 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -49,6 +49,7 @@ CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set # CONFIG_NETDEVICES is not set CONFIG_DEBUG_UART_ZYNQ=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y CONFIG_ZYNQ_QSPI=y CONFIG_USB=y diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig index a3b71ccc3e..3186c9843e 100644 --- a/configs/xilinx_versal_mini_defconfig +++ b/configs/xilinx_versal_mini_defconfig @@ -54,4 +54,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_DM_WARN is not set # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_MMC is not set +CONFIG_ARM_DCC=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig index e25077b000..1024021267 100644 --- a/configs/xilinx_versal_mini_emmc0_defconfig +++ b/configs/xilinx_versal_mini_emmc0_defconfig @@ -52,5 +52,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_ARM_DCC=y CONFIG_FAT_WRITE=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig index 3b477ad103..d38a52016f 100644 --- a/configs/xilinx_versal_mini_emmc1_defconfig +++ b/configs/xilinx_versal_mini_emmc1_defconfig @@ -52,5 +52,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_ARM_DCC=y CONFIG_FAT_WRITE=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index b629f8ba69..4ed14f7030 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -69,6 +69,7 @@ CONFIG_PHY_FIXED=y CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_ZYNQ_GEM=y +CONFIG_ARM_DCC=y CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index 375d54cbad..5da7440af2 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -88,6 +88,7 @@ CONFIG_PHY_REALTEK=y CONFIG_PHY_XILINX=y CONFIG_MII=y CONFIG_ZYNQ_GEM=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y CONFIG_ZYNQ_SPI=y CONFIG_ZYNQ_QSPI=y diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index c28efa3582..d010f429cb 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -52,5 +52,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_DM_WARN is not set # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_MMC is not set +CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index cb2983d247..2fdc0f9ac4 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -55,5 +55,6 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index f7bec364c3..2f1c6e266b 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -55,5 +55,6 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index 01e0971991..02d2e29dea 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -51,5 +51,6 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ARASAN=y CONFIG_SYS_NAND_MAX_CHIPS=2 +CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig index 20e76cb11e..1d5a30c140 100644 --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig @@ -50,5 +50,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ARASAN=y +CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index c6e03cd256..6faf3bed81 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -60,6 +60,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_ARM_DCC=y CONFIG_SPI=y CONFIG_ZYNQMP_GQSPI=y CONFIG_PANIC_HANG=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 57be5a49f6..7886d5a38f 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -116,6 +116,7 @@ CONFIG_MII=y CONFIG_ZYNQ_GEM=y CONFIG_SCSI=y CONFIG_DM_SCSI=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y CONFIG_SPI=y CONFIG_ZYNQ_SPI=y diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index 6a01da2e4e..8ba8000b13 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -56,4 +56,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ZYNQ=y +CONFIG_ARM_DCC=y # CONFIG_EFI_LOADER is not set diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 7b18ba3cd5..159606c7c7 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -59,4 +59,5 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_CFI_FLASH=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y +CONFIG_ARM_DCC=y # CONFIG_EFI_LOADER is not set diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index 15d8473b27..c8cd1f938e 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -69,5 +69,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_DEBUG_UART_ARM_DCC=y +CONFIG_ARM_DCC=y CONFIG_ZYNQ_QSPI=y # CONFIG_EFI_LOADER is not set diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 90e3983170..6d1e47cc34 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -504,6 +504,12 @@ config ARC_SERIAL Select this to enable support for ARC UART now typically only used in Synopsys DesignWare ARC simulators like nSIM. +config ARM_DCC + bool "ARM Debug Communication Channel (DCC) as UART support" + depends on ARM + help + Select this to enable using the ARM DCC as a form of UART. + config ATMEL_USART bool "Atmel USART support" help diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index da640d6f14..1276612503 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -27,7 +27,6 @@ #endif /* Serial setup */ -#define CONFIG_ARM_DCC #define CONFIG_CPU_ARMV8 #define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index b744a91fa6..6cde7e83e9 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x2000000) /* Serial setup */ -#define CONFIG_ARM_DCC #define CONFIG_CPU_ARMV8 #define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 9e83e17775..59e77f6ecc 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} -#define CONFIG_ARM_DCC - /* Ethernet driver */ #if defined(CONFIG_ZYNQ_GEM) # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fe9a1971cc..2210f46e44 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -51,7 +51,6 @@ CONFIG_ARMV7_SECURE_MAX_SIZE CONFIG_ARMV7_SECURE_RESERVE_SIZE CONFIG_ARMV8_SWITCH_TO_EL1 CONFIG_ARM_ARCH_CP15_ERRATA -CONFIG_ARM_DCC CONFIG_ARM_FREQ CONFIG_ARM_GIC_BASE_ADDRESS CONFIG_ARM_PL180_MMCI_BASE From 4cc24aeaf420f33f7ee92f76e025a86fc9aaefec Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 28 May 2020 12:05:12 +0200 Subject: [PATCH 02/17] serial: Add missing Kconfig dependencies for debug consoles Debug console is the part of serial driver in the same file. It means to be able to enable debug console you also need to enable driver itself. That's why add all dependecies and list only debug consoles which are enabled based on driver selection to avoid compilation error when user asks for certain debug console but driver is not enable for it. Error: aarch64-linux-gnu-ld.bfd: common/built-in.o: in function `putc': /home/monstr/data/disk/u-boot/common/console.c:513: undefined reference to `printch' aarch64-linux-gnu-ld.bfd: common/built-in.o: in function `puts': /home/monstr/data/disk/u-boot/common/console.c:563: undefined reference to `printch' Signed-off-by: Michal Simek Reviewed-by: Simon Glass [trini: Fix ns16550 dependency, add ZYNQ_SERIAL, change S5P] Signed-off-by: Tom Rini --- drivers/serial/Kconfig | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 6d1e47cc34..17d0e73623 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -189,6 +189,7 @@ choice config DEBUG_UART_ALTERA_JTAGUART bool "Altera JTAG UART" + depends on ALTERA_JTAG_UART help Select this to enable a debug UART using the altera_jtag_uart driver. You will need to provide parameters to make this work. The driver will @@ -196,6 +197,7 @@ config DEBUG_UART_ALTERA_JTAGUART config DEBUG_UART_ALTERA_UART bool "Altera UART" + depends on ALTERA_UART help Select this to enable a debug UART using the altera_uart driver. You will need to provide parameters to make this work. The driver will @@ -221,6 +223,7 @@ config DEBUG_ARC_SERIAL config DEBUG_UART_ATMEL bool "Atmel USART" + depends on ATMEL_USART help Select this to enable a debug UART using the atmel usart driver. You will need to provide parameters to make this work. The driver will @@ -236,6 +239,7 @@ config DEBUG_UART_BCM6345 config DEBUG_UART_NS16550 bool "ns16550" + depends on SYS_NS16550 help Select this to enable a debug UART using the ns16550 driver. You will need to provide parameters to make this work. The driver will @@ -252,6 +256,7 @@ config DEBUG_EFI_CONSOLE config DEBUG_UART_S5P bool "Samsung S5P" + depends on ARCH_EXYNOS || ARCH_S5PC1XX help Select this to enable a debug UART using the serial_s5p driver. You will need to provide parameters to make this work. The driver will @@ -267,6 +272,7 @@ config DEBUG_UART_MESON config DEBUG_UART_UARTLITE bool "Xilinx Uartlite" + depends on XILINX_UARTLITE help Select this to enable a debug UART using the serial_uartlite driver. You will need to provide parameters to make this work. The driver will @@ -274,6 +280,7 @@ config DEBUG_UART_UARTLITE config DEBUG_UART_ARM_DCC bool "ARM DCC" + depends on ARM_DCC help Select this to enable a debug UART using the ARM JTAG DCC port. The DCC port can be used for very early debugging and doesn't require @@ -285,6 +292,7 @@ config DEBUG_UART_ARM_DCC config DEBUG_MVEBU_A3700_UART bool "Marvell Armada 3700" + depends on MVEBU_A3700_UART help Select this to enable a debug UART using the serial_mvebu driver. You will need to provide parameters to make this work. The driver will @@ -292,6 +300,7 @@ config DEBUG_MVEBU_A3700_UART config DEBUG_UART_ZYNQ bool "Xilinx Zynq" + depends on ZYNQ_SERIAL help Select this to enable a debug UART using the serial_zynq driver. You will need to provide parameters to make this work. The driver will @@ -307,6 +316,7 @@ config DEBUG_UART_APBUART config DEBUG_UART_PL010 bool "pl010" + depends on PL01X_SERIAL help Select this to enable a debug UART using the pl01x driver with the PL010 UART type. You will need to provide parameters to make this @@ -315,6 +325,7 @@ config DEBUG_UART_PL010 config DEBUG_UART_PL011 bool "pl011" + depends on PL011_SERIAL help Select this to enable a debug UART using the pl01x driver with the PL011 UART type. You will need to provide parameters to make this @@ -348,6 +359,7 @@ config DEBUG_UART_SANDBOX config DEBUG_UART_SIFIVE bool "SiFive UART" + depends on PL01X_SERIAL help Select this to enable a debug UART using the serial_sifive driver. You will need to provide parameters to make this work. The driver will @@ -373,6 +385,7 @@ config DEBUG_UART_UNIPHIER config DEBUG_UART_OMAP bool "OMAP uart" + depends on OMAP_SERIAL help Select this to enable a debug UART using the omap ns16550 driver. You will need to provide parameters to make this work. The driver From 049756c2fee45bc4bc9054dbe024c3c80584b446 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:12 -0400 Subject: [PATCH 03/17] pfla02: Rework excluding NAND from SPL Rather than only enable CONFIG_CMD_NAND for non-SPL builds, move the CMD options to defconfig and rework the guards to not try and call the function in SPL builds. Cc: Stefano Babic Signed-off-by: Tom Rini Acked-by: Stefano Babic --- board/phytec/pfla02/pfla02.c | 8 ++++---- configs/pfla02_defconfig | 2 +- include/configs/pfla02.h | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c index fed8f52e3e..0a961cc8a5 100644 --- a/board/phytec/pfla02/pfla02.c +++ b/board/phytec/pfla02/pfla02.c @@ -117,7 +117,7 @@ static iomux_v3_cfg_t const gpios_pads[] = { IOMUX_PADS(PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) /* NAND */ static iomux_v3_cfg_t const nfc_pads[] = { IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NAND_PAD_CTRL)), @@ -274,7 +274,7 @@ static void setup_gpios(void) SETUP_IOMUX_PADS(gpios_pads); } -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) static void setup_gpmi_nand(void) { struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; @@ -361,7 +361,7 @@ int board_init(void) setup_gpios(); -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) setup_gpmi_nand(); #endif return 0; @@ -657,7 +657,7 @@ void board_init_f(ulong dummy) .refr = 7, /* 8 refresh commands per refresh cycle */ }; -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) /* Enable NAND */ setup_gpmi_nand(); #endif diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index 5e5bbb05bd..52cebd9e22 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -37,7 +37,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -# CONFIG_CMD_NAND is not set +CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index d4a7de7df6..4162a71ca6 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -41,15 +41,11 @@ #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 0 */ #define CONFIG_SYS_I2C_SPEED 100000 -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_NAND /* Enable NAND support */ -#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_ONFI_DETECTION -#endif /* DMA stuff, needed for GPMI/MXS NAND support */ From a4c67b0eb352748293b3580f8fc148b715190447 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:13 -0400 Subject: [PATCH 04/17] mx6memcal: Finish migration to defconfig options The config header for this platform uses '#undef' in a number of cases. All of the MMC related ones were already handled correctly in the defconfig file. In the case of CONFIG_CMD_FUSE, the command was being built and enabled via defconfig. Disable it in the defconfig, cleanup the header. Reviewed-by: Eric Nelson Signed-off-by: Tom Rini --- configs/mx6memcal_defconfig | 1 + include/configs/mx6memcal.h | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 8b5e0ff9b1..ed24b7996b 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x10000000 CONFIG_SYS_MEMTEST_END=0x20000000 +# CONFIG_CMD_FUSE is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_CACHE=y diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index 3d79a7e437..b774b167f6 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -13,11 +13,6 @@ #include "mx6_common.h" #include "imx6_spl.h" -#undef CONFIG_MMC -#undef CONFIG_SPL_MMC_SUPPORT -#undef CONFIG_GENERIC_MMC -#undef CONFIG_CMD_FUSE - #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #define CONFIG_MXC_UART From 559c99f62818749c77f9078af929b214a0a7f819 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:14 -0400 Subject: [PATCH 05/17] bcmstb: Migrate CONFIG_CMD_EXT[24] The common config header for bcm7260 and bcm7445 enable CONFIG_CMD_EXT2/EXT4 but the defconfigs do not. This results in the commands being disabled. Enable them via the defconfig. Cc: Thomas Fitzsimmons Signed-off-by: Tom Rini --- configs/bcm7260_defconfig | 2 ++ configs/bcm7445_defconfig | 2 ++ include/configs/bcmstb.h | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index d467e62dee..4ddca7cc7f 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -14,6 +14,8 @@ CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsavea CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot>" CONFIG_CMD_MMC=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y CONFIG_EFI_PARTITION=y CONFIG_OF_PRIOR_STAGE=y CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 2c71a5efed..85dcdded9d 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -17,6 +17,8 @@ CONFIG_SYS_PROMPT="U-Boot>" CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_SPI=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y CONFIG_OF_PRIOR_STAGE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 5f6bf62524..b906c750ed 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -129,7 +129,6 @@ extern phys_addr_t prior_stage_fdt_address; */ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE -#define CONFIG_CMD_EXT2 /* * Flash configuration. @@ -142,8 +141,6 @@ extern phys_addr_t prior_stage_fdt_address; * Filesystem configuration. */ #define CONFIG_DOS_PARTITION -#define CONFIG_CMD_EXT4 -#define CONFIG_FS_EXT4 #define CONFIG_CMD_FS_GENERIC /* From 31f39b2f46a4ab49a38179e59dd7c468065e43e3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:15 -0400 Subject: [PATCH 06/17] ARM: rmobile: blanche: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI The config header for this platform disables both CMD_SF and CMD_SPI and the defconfig leaves them enabled. Disable them from the defconfig and enable them in the header. Cc: Marek Vasut Cc: Masakazu Mochizuki Signed-off-by: Tom Rini --- configs/blanche_defconfig | 2 +- include/configs/blanche.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 137acceea0..641b779023 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SDRAM=y -CONFIG_CMD_SPI=y +# CONFIG_CMD_SF is not set CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/include/configs/blanche.h b/include/configs/blanche.h index fd29c5d0f1..f048f158ed 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -42,8 +42,6 @@ #define CONFIG_SYS_FLASH_WRITE_TOUT 3000 #define CONFIG_SYS_FLASH_LOCK_TOUT 3000 #define CONFIG_SYS_FLASH_UNLOCK_TOUT 3000 -#undef CONFIG_CMD_SF -#undef CONFIG_CMD_SPI #endif /* Board Clock */ From f03af6e299d2da326d6a740c4fae70de6c313153 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:16 -0400 Subject: [PATCH 07/17] topic_miami: Disable GPIO Per the boards config header file, there is no useful GPIO on these boards. Remove CONFIG_CMD_GPIO from the defconfigs. Cc: Mike Looijmans Signed-off-by: Tom Rini --- configs/topic_miami_defconfig | 1 - configs/topic_miamilite_defconfig | 1 - configs/topic_miamiplus_defconfig | 1 - include/configs/topic_miami.h | 4 ---- 4 files changed, 7 deletions(-) diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index 26b6a8e034..721ed3f8a6 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x18000000 CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index fb967e90f8..56981bb736 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x18000000 CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 23ad93f423..129c8f657d 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x18000000 CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 0e4a824c42..a2dcd1ae20 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -25,10 +25,6 @@ /* sspi command isn't useful */ #undef CONFIG_CMD_SPI -/* No useful gpio */ -#undef CONFIG_ZYNQ_GPIO -#undef CONFIG_CMD_GPIO - /* No falcon support */ #undef CONFIG_SPL_OS_BOOT #undef CONFIG_SPL_FPGA_SUPPORT From d16c9d0b3729b1b120caa1b9836660c3bbcd7b87 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:17 -0400 Subject: [PATCH 08/17] Convert CONFIG_BZIP2 et al to Kconfig This converts the following to Kconfig: CONFIG_BZIP2 CONFIG_GZIP CONFIG_LZO CONFIG_ZLIB CONFIG_LZMA CONFIG_LZO Signed-off-by: Tom Rini --- README | 15 --------------- configs/bayleybay_defconfig | 1 + configs/cherryhill_defconfig | 1 + configs/chromebook_coral_defconfig | 1 + configs/chromebook_link64_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_samus_defconfig | 1 + configs/chromebook_samus_tpl_defconfig | 1 + configs/chromebox_panther_defconfig | 1 + ...onga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/coreboot64_defconfig | 1 + configs/coreboot_defconfig | 1 + configs/cougarcanyon2_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/efi-x86_app_defconfig | 1 + configs/efi-x86_payload32_defconfig | 1 + configs/efi-x86_payload64_defconfig | 1 + configs/galileo_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/slimbootloader_defconfig | 1 + configs/som-db5800-som-6867_defconfig | 1 + ...adorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/wb45n_defconfig | 1 + configs/x530_defconfig | 1 + configs/xilinx_versal_mini_defconfig | 1 + configs/xilinx_versal_mini_emmc0_defconfig | 1 + configs/xilinx_versal_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_single_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + include/configs/dh_imx6.h | 2 -- include/configs/guruplug.h | 1 - include/configs/ib62x0.h | 5 ----- include/configs/iconnect.h | 5 ----- include/configs/nsa310s.h | 3 --- include/configs/sheevaplug.h | 1 - include/configs/wb45n.h | 1 - include/configs/x530.h | 1 - include/configs/x86-common.h | 2 -- include/configs/xilinx_versal_mini.h | 2 -- include/configs/xilinx_zynqmp_mini.h | 2 -- include/configs/zynq_cse.h | 2 -- 60 files changed, 47 insertions(+), 42 deletions(-) diff --git a/README b/README index 17dc0ee33b..aefdfe4f6b 100644 --- a/README +++ b/README @@ -1330,21 +1330,6 @@ The following options need to be configured: can be displayed via the splashscreen support or the bmp command. -- Compression support: - CONFIG_GZIP - - Enabled by default to support gzip compressed images. - - CONFIG_BZIP2 - - If this option is set, support for bzip2 compressed - images is included. If not, only uncompressed and gzip - compressed images are supported. - - NOTE: the bzip2 algorithm requires a lot of RAM, so - the malloc area (as defined by CONFIG_SYS_MALLOC_LEN) should - be at least 4MB. - - MII/PHY support: CONFIG_PHY_CLOCK_FREQ (ppc4xx) diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 80a817a3f3..ee032e25f6 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -56,3 +56,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11B=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/cherryhill_defconfig b/configs/cherryhill_defconfig index c3ad39c725..c1b6e715f4 100644 --- a/configs/cherryhill_defconfig +++ b/configs/cherryhill_defconfig @@ -41,3 +41,4 @@ CONFIG_RTL8169=y CONFIG_SPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y +# CONFIG_GZIP is not set diff --git a/configs/chromebook_coral_defconfig b/configs/chromebook_coral_defconfig index 2039ea6186..d7cab2334b 100644 --- a/configs/chromebook_coral_defconfig +++ b/configs/chromebook_coral_defconfig @@ -98,4 +98,5 @@ CONFIG_SPL_FS_CBFS=y CONFIG_TPL_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index a13f6eac80..75f3d2c411 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -73,3 +73,4 @@ CONFIG_VIDEO_IVYBRIDGE_IGD=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y +# CONFIG_GZIP is not set diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index de4186cdf2..3d51ec9606 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -68,4 +68,5 @@ CONFIG_VIDEO_IVYBRIDGE_IGD=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index fb4d88028c..c18cba9cf4 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -71,3 +71,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_TPM=y +# CONFIG_GZIP is not set diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig index a12a04b0bf..82172ba810 100644 --- a/configs/chromebook_samus_tpl_defconfig +++ b/configs/chromebook_samus_tpl_defconfig @@ -87,3 +87,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_TPM=y +# CONFIG_GZIP is not set diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index 48bcd94a62..fd87ab262b 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -55,3 +55,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_TPM=y +# CONFIG_GZIP is not set diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index abf5263081..eacc9852bd 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -66,3 +66,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index aac0ed2928..04b9d5eee9 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -62,3 +62,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig index 39469b5203..6bba9ec72b 100644 --- a/configs/coreboot64_defconfig +++ b/configs/coreboot64_defconfig @@ -46,3 +46,4 @@ CONFIG_SYSCON=y CONFIG_SOUND=y CONFIG_SOUND_I8254=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig index ad41c91e6e..4a43b59e0f 100644 --- a/configs/coreboot_defconfig +++ b/configs/coreboot_defconfig @@ -41,3 +41,4 @@ CONFIG_SYSCON=y CONFIG_SOUND=y CONFIG_SOUND_I8254=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig index aac8a391fd..4cb734477e 100644 --- a/configs/cougarcanyon2_defconfig +++ b/configs/cougarcanyon2_defconfig @@ -46,3 +46,4 @@ CONFIG_SPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y # CONFIG_VIDEO_VESA is not set +# CONFIG_GZIP is not set diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 06d5ce4cad..706f5cd1c4 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -52,3 +52,4 @@ CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index fdf686f956..56fc282762 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -61,3 +61,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index e0dfffa4b5..d20405e5b2 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -100,3 +100,4 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_IMX_WATCHDOG=y +CONFIG_BZIP2=y diff --git a/configs/efi-x86_app_defconfig b/configs/efi-x86_app_defconfig index 790268a1ff..5252659942 100644 --- a/configs/efi-x86_app_defconfig +++ b/configs/efi-x86_app_defconfig @@ -34,5 +34,6 @@ CONFIG_SYSCON=y # CONFIG_DM_ETH is not set CONFIG_DEBUG_EFI_CONSOLE=y # CONFIG_REGEX is not set +# CONFIG_GZIP is not set CONFIG_EFI=y # CONFIG_EFI_LOADER is not set diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig index f3ee5284d5..0f5f787707 100644 --- a/configs/efi-x86_payload32_defconfig +++ b/configs/efi-x86_payload32_defconfig @@ -36,5 +36,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_PCI_PNP is not set +# CONFIG_GZIP is not set CONFIG_EFI=y CONFIG_EFI_STUB=y diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig index b83e609966..dafad67e7e 100644 --- a/configs/efi-x86_payload64_defconfig +++ b/configs/efi-x86_payload64_defconfig @@ -36,6 +36,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_PCI_PNP is not set +# CONFIG_GZIP is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_STUB_64BIT=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 4e2a23f638..612fbacf99 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -45,3 +45,4 @@ CONFIG_CPU=y CONFIG_SPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y +# CONFIG_GZIP is not set diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 8d862696ca..0401effee6 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -51,3 +51,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index fea69d32e9..ac7a794afe 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -44,3 +44,4 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 4281aa93bc..d5a0ecada0 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -39,3 +39,4 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 127fd5d53e..40ed9e4120 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -62,3 +62,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11B=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 7a864bddf3..62edcd83f3 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -41,4 +41,5 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y CONFIG_OF_LIBFDT=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 4e8eab531c..90d287b7b0 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -60,3 +60,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144 CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 565f232b4f..4309c2352d 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -44,3 +44,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144 CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index d350429cad..39939ccf60 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -50,3 +50,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y diff --git a/configs/slimbootloader_defconfig b/configs/slimbootloader_defconfig index 4a4fb1100d..dce540342b 100644 --- a/configs/slimbootloader_defconfig +++ b/configs/slimbootloader_defconfig @@ -21,3 +21,4 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_PCI_PNP is not set CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 4d7accc7c4..854381d6e7 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -57,3 +57,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig index 7a8feee521..ed68f09d14 100644 --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -65,3 +65,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index dbbac6b103..c414b95f6f 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -64,3 +64,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index de9701afe6..3a8037757e 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -61,3 +61,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index d2de463aaa..5728cfb454 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -40,4 +40,5 @@ CONFIG_NAND_ATMEL=y CONFIG_PMECC_CAP=4 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y CONFIG_LZMA=y +CONFIG_LZO=y CONFIG_OF_LIBFDT=y diff --git a/configs/x530_defconfig b/configs/x530_defconfig index 67c8fbf663..ab23fd5ab1 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -80,3 +80,4 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_WDT=y CONFIG_WDT_ORION=y +CONFIG_LZO=y diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig index 3186c9843e..6ad53b798a 100644 --- a/configs/xilinx_versal_mini_defconfig +++ b/configs/xilinx_versal_mini_defconfig @@ -55,4 +55,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_MMC is not set CONFIG_ARM_DCC=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig index 1024021267..99880d80de 100644 --- a/configs/xilinx_versal_mini_emmc0_defconfig +++ b/configs/xilinx_versal_mini_emmc0_defconfig @@ -54,4 +54,5 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_FAT_WRITE=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig index d38a52016f..c1b27d3b54 100644 --- a/configs/xilinx_versal_mini_emmc1_defconfig +++ b/configs/xilinx_versal_mini_emmc1_defconfig @@ -54,4 +54,5 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_FAT_WRITE=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index d010f429cb..4305db4058 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -54,4 +54,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_MMC is not set CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index 2fdc0f9ac4..b041b40b84 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -57,4 +57,5 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index 2f1c6e266b..bd5603a6a1 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -57,4 +57,5 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index 02d2e29dea..4f4efa0cfa 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -53,4 +53,5 @@ CONFIG_NAND_ARASAN=y CONFIG_SYS_NAND_MAX_CHIPS=2 CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig index 1d5a30c140..3f780f746c 100644 --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig @@ -52,4 +52,5 @@ CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ARASAN=y CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 6faf3bed81..1f36f5c8e9 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -64,4 +64,5 @@ CONFIG_ARM_DCC=y CONFIG_SPI=y CONFIG_ZYNQMP_GQSPI=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index 8ba8000b13..0c05a73a57 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -57,4 +57,5 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ZYNQ=y CONFIG_ARM_DCC=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 159606c7c7..abf9401313 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -60,4 +60,5 @@ CONFIG_CFI_FLASH=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_ARM_DCC=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index c8cd1f938e..6ef0e23110 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -71,4 +71,5 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_DEBUG_UART_ARM_DCC=y CONFIG_ARM_DCC=y CONFIG_ZYNQ_QSPI=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index efb3cfee35..5bfdf4044b 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -32,8 +32,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_BZIP2 - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M) diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 768f4ebcbb..1e1e5da4d5 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -17,7 +17,6 @@ /* * Standard filesystems */ -#define CONFIG_BZIP2 /* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 71738bfb7d..f27dbfbc5f 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -15,11 +15,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Compression configuration - */ -#define CONFIG_BZIP2 - /* * Commands configuration */ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index a694b2e92b..3754cd1e65 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -20,11 +20,6 @@ */ #define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT -/* - * Compression configuration - */ -#define CONFIG_BZIP2 - /* * Commands configuration */ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index e59ef11e66..ce1e3214a6 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -15,9 +15,6 @@ #define CONFIG_KW88F6702 1 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* compression configuration */ -#define CONFIG_BZIP2 - /* commands configuration */ /* diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index ed5e284077..3ee6e684fd 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -21,7 +21,6 @@ /* * Standard filesystems */ -#define CONFIG_BZIP2 /* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index aecf2737f8..d256ce8e4b 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5 #define CONFIG_RBTREE -#define CONFIG_LZO /* Ethernet */ #define CONFIG_MACB diff --git a/include/configs/x530.h b/include/configs/x530.h index 9081f41660..99531ed319 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -71,7 +71,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -#define CONFIG_LZO #define CONFIG_CMD_MTDPARTS #define CONFIG_SYS_MALLOC_LEN (4 << 20) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 016b797a53..ff45714c82 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -18,8 +18,6 @@ #define CONFIG_LMB -#undef CONFIG_ZLIB -#undef CONFIG_GZIP #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* SATA AHCI storage */ diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h index ae7eca1155..a1a98f9193 100644 --- a/include/configs/xilinx_versal_mini.h +++ b/include/configs/xilinx_versal_mini.h @@ -17,8 +17,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_ZLIB -#undef CONFIG_GZIP #undef CONFIG_CMD_ENV /* BOOTP options */ diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 3078b9c55b..ccc938267d 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -19,8 +19,6 @@ #undef CONFIG_BOOTCOMMAND #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_SYS_MALLOC_LEN -#undef CONFIG_ZLIB -#undef CONFIG_GZIP #undef CONFIG_CMD_ENV #undef CONFIG_SYS_INIT_SP_ADDR diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index 917f35b24c..0491cf5136 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -15,8 +15,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_ZLIB -#undef CONFIG_GZIP #undef CONFIG_SYS_CBSIZE From e985eb14ac5cff260321519a309f540909b77c16 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:18 -0400 Subject: [PATCH 09/17] Convert CONFIG_CMD_ASKENV et al to Kconfig This converts the following to Kconfig: CONFIG_CMD_ASKENV CONFIG_CMD_BMP CONFIG_CMD_BOOTD CONFIG_CMD_CACHE CONFIG_CMD_CRC32 CONFIG_CMD_DHCP CONFIG_CMD_ENV CONFIG_CMD_EXPORTENV CONFIG_CMD_EXT2 CONFIG_CMD_EXT4 CONFIG_CMD_FLASH CONFIG_CMD_FS_GENERIC CONFIG_CMD_FUSE CONFIG_CMD_GPIO CONFIG_CMD_GPT CONFIG_CMD_GREPENV CONFIG_CMD_I2C CONFIG_CMD_IMLS CONFIG_CMD_IMPORTENV CONFIG_CMD_LOADB CONFIG_CMD_LOADS CONFIG_CMD_MEMINFO CONFIG_CMD_MII CONFIG_CMD_MTDPARTS CONFIG_CMD_NAND CONFIG_CMD_NAND_TRIMFFS CONFIG_CMD_NFS CONFIG_CMD_PCA953X CONFIG_CMD_PCA953X_INFO CONFIG_CMD_PCI CONFIG_CMD_PING CONFIG_CMD_READ CONFIG_CMD_SF CONFIG_CMD_SPI CONFIG_CMD_SPL CONFIG_CMD_SPL_WRITE_SIZE CONFIG_CMD_TIME CONFIG_CMD_TRACE CONFIG_CMD_UBI CONFIG_CMD_UBIFS CONFIG_CMD_UNZIP CONFIG_FS_EXT4 Signed-off-by: Tom Rini --- README | 8 -------- configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_shc_netboot_defconfig | 1 + configs/am335x_shc_sdboot_defconfig | 1 + configs/apalis-tk1_defconfig | 1 + configs/apalis_imx6_defconfig | 4 ++++ configs/bcm7260_defconfig | 6 +++++- configs/bcm7445_defconfig | 3 +++ configs/cl-som-imx7_defconfig | 1 + configs/colibri_imx6_defconfig | 4 ++++ configs/deneb_defconfig | 3 +++ configs/display5_defconfig | 1 + configs/display5_factory_defconfig | 1 + configs/ds109_defconfig | 2 +- configs/ge_bx50v3_defconfig | 1 + configs/giedi_defconfig | 3 +++ configs/gurnard_defconfig | 3 +++ configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/imx6dl_mamoj_defconfig | 1 + configs/imx6qdl_icore_mipi_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + configs/imx8mq_evk_defconfig | 8 ++++++++ configs/imx8mq_phanbell_defconfig | 7 +++++++ configs/imx8qm_mek_defconfig | 2 ++ configs/imx8qm_rom7720_a1_4G_defconfig | 1 + configs/imx8qxp_mek_defconfig | 2 ++ configs/ls1012a2g5rdb_qspi_defconfig | 1 + configs/ls1012a2g5rdb_tfa_defconfig | 1 + configs/ls1012afrdm_qspi_defconfig | 1 + configs/ls1012afrdm_tfa_defconfig | 1 + configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_qspi_defconfig | 1 + configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_tfa_defconfig | 1 + configs/ls1012aqds_qspi_defconfig | 1 + configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012aqds_tfa_defconfig | 1 + configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012ardb_qspi_defconfig | 1 + configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012ardb_tfa_defconfig | 1 + configs/ls1021aiot_qspi_defconfig | 6 ++++++ configs/ls1021aiot_sdcard_defconfig | 6 ++++++ configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_sdcard_defconfig | 1 + configs/ls1088aqds_defconfig | 4 ++++ configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 4 ++++ configs/ls1088aqds_qspi_defconfig | 4 ++++ configs/ls1088aqds_sdcard_ifc_defconfig | 4 ++++ configs/ls1088aqds_sdcard_qspi_defconfig | 4 ++++ configs/ls1088aqds_tfa_defconfig | 4 ++++ configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 4 ++++ configs/ls1088ardb_qspi_defconfig | 4 ++++ configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 4 ++++ configs/ls1088ardb_sdcard_qspi_defconfig | 4 ++++ configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 4 ++++ configs/ls1088ardb_tfa_defconfig | 4 ++++ configs/mx25pdk_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/mx7ulp_com_defconfig | 1 + configs/mx7ulp_evk_defconfig | 1 + configs/mx7ulp_evk_plugin_defconfig | 1 + configs/pico-imx8mq_defconfig | 7 +++++++ configs/s32v234evb_defconfig | 1 + configs/somlabs_visionsom_6ull_defconfig | 1 + configs/stih410-b2260_defconfig | 1 + ...theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/ti816x_evm_defconfig | 1 + configs/tplink_wdr4300_defconfig | 2 ++ configs/vyasa-rk3288_defconfig | 1 + configs/x530_defconfig | 5 +++-- include/configs/M5249EVB.h | 4 ---- include/configs/M5253DEMO.h | 4 ---- include/configs/M5272C3.h | 3 --- include/configs/M5282EVB.h | 3 --- include/configs/MPC8308RDB.h | 4 ---- include/configs/MPC8313ERDB_NAND.h | 4 ---- include/configs/MPC8313ERDB_NOR.h | 4 ---- include/configs/MPC8315ERDB.h | 4 ---- include/configs/MPC8323ERDB.h | 4 ---- include/configs/MPC832XEMDS.h | 4 ---- include/configs/MPC8349EMDS.h | 4 ---- include/configs/MPC8349EMDS_SDRAM.h | 4 ---- include/configs/MPC837XEMDS.h | 4 ---- include/configs/MPC837XERDB.h | 4 ---- include/configs/MPC8540ADS.h | 4 ---- include/configs/MPC8610HPCD.h | 4 ---- include/configs/P2041RDB.h | 4 ---- include/configs/T4240RDB.h | 4 ---- include/configs/am335x_shc.h | 3 --- include/configs/am57xx_evm.h | 1 - include/configs/apalis-tk1.h | 2 -- include/configs/apalis_imx6.h | 6 ------ include/configs/aspenite.h | 7 ------- include/configs/astro_mcf5373l.h | 1 - include/configs/at91-sama5_common.h | 4 ---- include/configs/at91rm9200ek.h | 4 ---- include/configs/bcm7260.h | 2 -- include/configs/bcmstb.h | 3 --- include/configs/caddy2.h | 3 --- include/configs/capricorn-common.h | 5 ----- include/configs/ci20.h | 1 - include/configs/cl-som-imx7.h | 1 - include/configs/clearfog.h | 4 ---- include/configs/cobra5272.h | 4 ---- include/configs/colibri_imx6.h | 6 ------ include/configs/controlcenterd.h | 4 ---- include/configs/db-88f6720.h | 4 ---- include/configs/db-88f6820-amc.h | 4 ---- include/configs/db-88f6820-gp.h | 4 ---- include/configs/display5.h | 2 -- include/configs/dns325.h | 8 -------- include/configs/dra7xx_evm.h | 1 - include/configs/dreamplug.h | 8 -------- include/configs/ds109.h | 9 --------- include/configs/ds414.h | 4 ---- include/configs/eb_cpu5282.h | 4 ---- include/configs/edminiv2.h | 3 --- include/configs/ge_bx50v3.h | 1 - include/configs/goflexhome.h | 8 -------- include/configs/gplugd.h | 4 ---- include/configs/gw_ventana.h | 1 - include/configs/helios4.h | 4 ---- include/configs/highbank.h | 4 ---- include/configs/hikey.h | 2 -- include/configs/hrcon.h | 4 ---- include/configs/ib62x0.h | 8 -------- include/configs/iconnect.h | 8 -------- include/configs/imx6-engicam.h | 2 -- include/configs/imx6dl-mamoj.h | 2 -- include/configs/imx8mq_evk.h | 11 ----------- include/configs/imx8mq_phanbell.h | 11 ----------- include/configs/imx8qm_mek.h | 6 ------ include/configs/imx8qm_rom7720.h | 1 - include/configs/imx8qxp_mek.h | 8 -------- include/configs/integratorap.h | 3 --- include/configs/integratorcp.h | 3 --- include/configs/ls1012a2g5rdb.h | 2 -- include/configs/ls1012afrdm.h | 3 --- include/configs/ls1012afrwy.h | 2 -- include/configs/ls1012aqds.h | 3 --- include/configs/ls1012ardb.h | 3 --- include/configs/ls1021aiot.h | 7 ------- include/configs/ls1028aqds.h | 3 --- include/configs/ls1028ardb.h | 3 --- include/configs/ls1043a_common.h | 2 -- include/configs/ls1043ardb.h | 4 ---- include/configs/ls1046a_common.h | 2 -- include/configs/ls1088a_common.h | 6 ------ include/configs/ls1088aqds.h | 4 ---- include/configs/ls1088ardb.h | 4 ---- include/configs/ls2080a_common.h | 2 -- include/configs/lsxl.h | 8 -------- include/configs/maxbcm.h | 4 ---- include/configs/mpc8308_p1m.h | 4 ---- include/configs/mx25pdk.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/mx7ulp_com.h | 4 ---- include/configs/mx7ulp_evk.h | 4 ---- include/configs/nas220.h | 8 -------- include/configs/nsa310s.h | 6 ------ include/configs/openrd.h | 8 -------- include/configs/pico-imx8mq.h | 11 ----------- include/configs/picosam9g45.h | 4 ---- include/configs/pogo_e02.h | 8 -------- include/configs/poplar.h | 1 - include/configs/qemu-mips.h | 4 ---- include/configs/qemu-mips64.h | 4 ---- include/configs/qemu-ppce500.h | 4 ---- include/configs/s32v234evb.h | 4 ---- include/configs/sama5d27_som1_ek.h | 1 - include/configs/sama5d2_icp.h | 1 - include/configs/sandbox.h | 1 - include/configs/sbc8349.h | 4 ---- include/configs/sheevaplug.h | 12 ------------ include/configs/snapper9g45.h | 4 ---- include/configs/somlabs_visionsom_6ull.h | 2 -- include/configs/stih410-b2260.h | 1 - include/configs/stm32f429-discovery.h | 4 ---- include/configs/stm32f429-evaluation.h | 4 ---- include/configs/stm32f469-discovery.h | 4 ---- include/configs/stm32f746-disco.h | 3 --- include/configs/stm32h743-disco.h | 3 --- include/configs/stm32h743-eval.h | 3 --- include/configs/strider.h | 4 ---- include/configs/t4qds.h | 4 ---- include/configs/tb100.h | 4 ---- include/configs/theadorable-x86-common.h | 1 - include/configs/theadorable.h | 4 ---- include/configs/ti816x_evm.h | 2 -- include/configs/topic_miami.h | 3 --- include/configs/tplink_wdr4300.h | 2 -- include/configs/ve8313.h | 4 ---- include/configs/vme8349.h | 3 --- include/configs/vyasa-rk3288.h | 2 -- include/configs/x530.h | 8 -------- include/configs/x86-common.h | 4 ---- include/configs/xilinx_versal_mini.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/xilinx_zynqmp_mini.h | 1 - include/configs/zmx25.h | 8 -------- 207 files changed, 164 insertions(+), 526 deletions(-) diff --git a/README b/README index aefdfe4f6b..bcf1983631 100644 --- a/README +++ b/README @@ -1552,14 +1552,6 @@ The following options need to be configured: This enable the NEW i2c subsystem, and will allow you to use i2c commands at the u-boot command line (as long as you set - CONFIG_CMD_I2C in CONFIG_COMMANDS) and communicate with i2c - based realtime clock chips or other i2c devices. See - common/cmd_i2c.c for a description of the command line - interface. - - ported i2c driver to the new framework: - - drivers/i2c/soft_i2c.c: - - activate first bus with CONFIG_SYS_I2C_SOFT define CONFIG_SYS_I2C_SOFT_SPEED and CONFIG_SYS_I2C_SOFT_SLAVE for defining speed and slave address - activate second bus with I2C_SOFT_DECLARATIONS2 define diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index c0bb093c4d..94c513457c 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index 026a81538e..6650b3eb6d 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index 91c1ce7f54..f03f1fa0ae 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -42,6 +42,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index 4fa7b6dbc4..13b3686417 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index 604a473fa9..868303a29c 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_PCI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_NFS is not set +CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 4c6b100654..6b0f0e4638 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -45,12 +45,16 @@ CONFIG_SYS_MEMTEST_END=0x10010000 CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index 4ddca7cc7f..55e290c766 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -13,10 +13,14 @@ CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot>" +CONFIG_CMD_ASKENV=y +CONFIG_CMD_GPT=y +# CONFIG_RANDOM_UUID is not set CONFIG_CMD_MMC=y +CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y -CONFIG_EFI_PARTITION=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_PRIOR_STAGE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 85dcdded9d..338f525bf5 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -14,11 +14,14 @@ CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot>" +CONFIG_CMD_ASKENV=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_SPI=y +CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_PRIOR_STAGE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index d2766190de..c1eac88fcd 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -57,6 +57,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb" # CONFIG_ENV_IS_IN_MMC is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_CMD_PCA953X=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index adb7c95019..44a3ff859c 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -44,12 +44,16 @@ CONFIG_SYS_MEMTEST_END=0x10010000 CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y CONFIG_CMD_UUID=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 628b3516a8..9682cb7ca1 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -36,13 +36,16 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_CMD_CPU=y +# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set CONFIG_CMD_CLK=y CONFIG_CMD_DM=y CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_READ=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 6241375c4c..78e4627bda 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -46,6 +46,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="display5 > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_ELF is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_EEPROM=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index eb46e3b256..d453073ddb 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -46,6 +46,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="display5 factory > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_ELF is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_EEPROM=y diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index 89ed5eb13c..12419ac6dd 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y @@ -46,4 +47,3 @@ CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y -CONFIG_FS_EXT4=y diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index f0893ce08e..58778e670c 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y # CONFIG_CMD_NFS is not set +CONFIG_CMD_BMP=y CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_CLS=y diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 3cae981a61..4e22a02aac 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -36,13 +36,16 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_CMD_CPU=y +# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set CONFIG_CMD_CLK=y CONFIG_CMD_DM=y CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_READ=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index 7e394d9aec..0d1a46315b 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -23,7 +23,10 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +# CONFIG_CMD_MDIO is not set CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard" diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 639cb99862..64388f1044 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -40,6 +40,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y CONFIG_CMD_SPL_WRITE_SIZE=0x20000 +CONFIG_CMD_UNZIP=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 67ea57c7fc..30aea0232b 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -40,6 +40,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y CONFIG_CMD_SPL_WRITE_SIZE=0x20000 +CONFIG_CMD_UNZIP=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index f6e85b680b..deb879cd49 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -42,6 +42,7 @@ CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y CONFIG_CMD_SPL_NAND_OFS=0x1100000 CONFIG_CMD_SPL_WRITE_SIZE=0x20000 +CONFIG_CMD_UNZIP=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index 7c4913debd..f1ad86566b 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_OS_BOOT=y +CONFIG_CMD_SPL=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 diff --git a/configs/imx6qdl_icore_mipi_defconfig b/configs/imx6qdl_icore_mipi_defconfig index 7b13e1fd78..7e55996065 100644 --- a/configs/imx6qdl_icore_mipi_defconfig +++ b/configs/imx6qdl_icore_mipi_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-mipi> " +CONFIG_CMD_SPL=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 4b2e1f4780..19b5e1a890 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -32,6 +32,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl> " +CONFIG_CMD_SPL=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index a224baf639..5f356b2d06 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-rqs> " +CONFIG_CMD_SPL=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 7472bad9e6..c13a954b36 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -17,9 +17,17 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +# CONFIG_CMD_MDIO is not set +CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT2=y diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig index 045d204897..5364b58b7b 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -19,9 +19,16 @@ CONFIG_SD_BOOT=y CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT2=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 428c7c47cd..dc490bcf57 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -30,7 +30,9 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_BOOTM_NETBSD is not set +# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set CONFIG_CMD_CLK=y CONFIG_CMD_DM=y CONFIG_CMD_GPIO=y diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index 35191447ae..305c4e827c 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_CPU=y # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_CLK=y CONFIG_CMD_DM=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 4cc37f5de7..9a31fb8e80 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -29,7 +29,9 @@ CONFIG_SPL_POWER_DOMAIN=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_BOOTM_NETBSD is not set +# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set CONFIG_CMD_CLK=y CONFIG_CMD_DM=y CONFIG_CMD_FUSE=y diff --git a/configs/ls1012a2g5rdb_qspi_defconfig b/configs/ls1012a2g5rdb_qspi_defconfig index 07ba4d6472..53f880714c 100644 --- a/configs/ls1012a2g5rdb_qspi_defconfig +++ b/configs/ls1012a2g5rdb_qspi_defconfig @@ -22,6 +22,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012a2g5rdb_tfa_defconfig b/configs/ls1012a2g5rdb_tfa_defconfig index 8999d01f66..f7d2354abf 100644 --- a/configs/ls1012a2g5rdb_tfa_defconfig +++ b/configs/ls1012a2g5rdb_tfa_defconfig @@ -22,6 +22,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig index 541cbb07ce..715863bb67 100644 --- a/configs/ls1012afrdm_qspi_defconfig +++ b/configs/ls1012afrdm_qspi_defconfig @@ -21,6 +21,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012afrdm_tfa_defconfig b/configs/ls1012afrdm_tfa_defconfig index b5043d7a18..fa6862cba5 100644 --- a/configs/ls1012afrdm_tfa_defconfig +++ b/configs/ls1012afrdm_tfa_defconfig @@ -21,6 +21,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig index f105aaf2bc..0639db959c 100644 --- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig @@ -20,6 +20,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012afrwy_qspi_defconfig b/configs/ls1012afrwy_qspi_defconfig index 492276439e..02e32a74a3 100644 --- a/configs/ls1012afrwy_qspi_defconfig +++ b/configs/ls1012afrwy_qspi_defconfig @@ -21,6 +21,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig index 9c89064150..f46477afe7 100644 --- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig @@ -20,6 +20,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012afrwy_tfa_defconfig b/configs/ls1012afrwy_tfa_defconfig index 2948fd57ec..32e410a2a4 100644 --- a/configs/ls1012afrwy_tfa_defconfig +++ b/configs/ls1012afrwy_tfa_defconfig @@ -21,6 +21,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index 65e8e5c791..bbd1419eae 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -25,6 +25,7 @@ CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig index 529cd08b12..e5dd45c30c 100644 --- a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig @@ -23,6 +23,7 @@ CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012aqds_tfa_defconfig b/configs/ls1012aqds_tfa_defconfig index 79d196c77b..2c803a8058 100644 --- a/configs/ls1012aqds_tfa_defconfig +++ b/configs/ls1012aqds_tfa_defconfig @@ -25,6 +25,7 @@ CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig index 1483e64d8c..6db9a26018 100644 --- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig @@ -22,6 +22,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig index e39de4caf5..dbca32ea10 100644 --- a/configs/ls1012ardb_qspi_defconfig +++ b/configs/ls1012ardb_qspi_defconfig @@ -22,6 +22,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig index 8b67798429..1323c0a982 100644 --- a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig @@ -22,6 +22,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1012ardb_tfa_defconfig b/configs/ls1012ardb_tfa_defconfig index e0d203d442..6cd8f6577c 100644 --- a/configs/ls1012ardb_tfa_defconfig +++ b/configs/ls1012ardb_tfa_defconfig @@ -22,6 +22,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig index cb73a04b35..85ceeb480a 100644 --- a/configs/ls1021aiot_qspi_defconfig +++ b/configs/ls1021aiot_qspi_defconfig @@ -11,9 +11,15 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_MISC_INIT_R=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +# CONFIG_CMD_MDIO is not set CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig index 10b6930914..11ccf57aad 100644 --- a/configs/ls1021aiot_sdcard_defconfig +++ b/configs/ls1021aiot_sdcard_defconfig @@ -16,9 +16,15 @@ CONFIG_SPL_FSL_PBL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8 CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +# CONFIG_CMD_MDIO is not set CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig index 224321810a..1b2e2e082f 100644 --- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@ -31,6 +31,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_IMLS=y +CONFIG_CMD_SPL=y CONFIG_CMD_DM=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig index bf557d7650..e13d5e349e 100644 --- a/configs/ls1043ardb_sdcard_defconfig +++ b/configs/ls1043ardb_sdcard_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_IMLS=y +CONFIG_CMD_SPL=y CONFIG_CMD_DM=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y diff --git a/configs/ls1088aqds_defconfig b/configs/ls1088aqds_defconfig index 61e05ceda6..d06fafde8d 100644 --- a/configs/ls1088aqds_defconfig +++ b/configs/ls1088aqds_defconfig @@ -18,15 +18,19 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" diff --git a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig index e51fdcab20..d8ae560744 100644 --- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig @@ -20,14 +20,18 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig index f7d0c15707..d65cef8e55 100644 --- a/configs/ls1088aqds_qspi_defconfig +++ b/configs/ls1088aqds_qspi_defconfig @@ -21,14 +21,18 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" diff --git a/configs/ls1088aqds_sdcard_ifc_defconfig b/configs/ls1088aqds_sdcard_ifc_defconfig index 57e706a4c4..a64cf136f5 100644 --- a/configs/ls1088aqds_sdcard_ifc_defconfig +++ b/configs/ls1088aqds_sdcard_ifc_defconfig @@ -29,15 +29,19 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig index 4ff7173369..e9750cfae0 100644 --- a/configs/ls1088aqds_sdcard_qspi_defconfig +++ b/configs/ls1088aqds_sdcard_qspi_defconfig @@ -31,14 +31,18 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" diff --git a/configs/ls1088aqds_tfa_defconfig b/configs/ls1088aqds_tfa_defconfig index c184843a6d..d685e8f190 100644 --- a/configs/ls1088aqds_tfa_defconfig +++ b/configs/ls1088aqds_tfa_defconfig @@ -24,15 +24,19 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_DM=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig index f00307f964..31d66ecd17 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig @@ -21,15 +21,19 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_DM=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb" diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig index 0572c9c241..3071c76f27 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_qspi_defconfig @@ -22,15 +22,19 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_DM=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb" diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig index 3e00a25857..560f09b961 100644 --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig @@ -33,15 +33,19 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_DM=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb" diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig index b6e21b2756..b80a6a48a2 100644 --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_defconfig @@ -32,15 +32,19 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_DM=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb" diff --git a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig index dba4526734..c90c8a8151 100644 --- a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig @@ -24,14 +24,18 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_DM=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb" diff --git a/configs/ls1088ardb_tfa_defconfig b/configs/ls1088ardb_tfa_defconfig index 53b236ce9e..828ee5ccf2 100644 --- a/configs/ls1088ardb_tfa_defconfig +++ b/configs/ls1088ardb_tfa_defconfig @@ -25,15 +25,19 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff CONFIG_CMD_DM=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MDIO is not set +CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb" diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig index aa08e100a2..ffcab918e6 100644 --- a/configs/mx25pdk_defconfig +++ b/configs/mx25pdk_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg" CONFIG_DEFAULT_FDT_FILE="imx25-pdk.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_FUSE=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 0b6564ce5c..2eab6f219a 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -20,6 +20,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_DM=y +CONFIG_CMD_FUSE=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/mx7ulp_com_defconfig b/configs/mx7ulp_com_defconfig index e986355c20..05685f7073 100644 --- a/configs/mx7ulp_com_defconfig +++ b/configs/mx7ulp_com_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_READ=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-com" diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index 680445bea7..6908aeb2cc 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk" diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index b70c36c7c9..4cc7cca349 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk" diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index 470fd3a355..cf1f10ad08 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -17,9 +17,16 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT2=y diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig index 78450c23d6..f687de4ef8 100644 --- a/configs/s32v234evb_defconfig +++ b/configs/s32v234evb_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0xc0000000 CONFIG_SYS_MEMTEST_END=0xc7c00000 CONFIG_CMD_MMC=y +CONFIG_CMD_CACHE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y diff --git a/configs/somlabs_visionsom_6ull_defconfig b/configs/somlabs_visionsom_6ull_defconfig index 08469d68b6..f8c9e1fb3e 100644 --- a/configs/somlabs_visionsom_6ull_defconfig +++ b/configs/somlabs_visionsom_6ull_defconfig @@ -17,6 +17,7 @@ CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y +CONFIG_CMD_READ=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/stih410-b2260_defconfig b/configs/stih410-b2260_defconfig index 0b18971087..8257fb2b33 100644 --- a/configs/stih410-b2260_defconfig +++ b/configs/stih410-b2260_defconfig @@ -11,6 +11,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SYS_PROMPT="stih410-b2260 => " +CONFIG_CMD_ASKENV=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig index ed68f09d14..7a125751da 100644 --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y +CONFIG_CMD_BMP=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_EXT2=y diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index c414b95f6f..9afad6a16b 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y +CONFIG_CMD_BMP=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_EXT2=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 3a8037757e..ee83584b4a 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y +CONFIG_CMD_BMP=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_EXT2=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index 17aa6a0206..21d152aea9 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -27,6 +27,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_NAND_SUPPORT=y +CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig index f9d37b1365..8854e8f1af 100644 --- a/configs/tplink_wdr4300_defconfig +++ b/configs/tplink_wdr4300_defconfig @@ -20,6 +20,8 @@ CONFIG_SYS_MEMTEST_END=0x83f00000 CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +# CONFIG_CMD_MDIO is not set CONFIG_CMD_PING=y # CONFIG_ISO_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tplink_wdr4300" diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig index 9e6a0c1e7a..c46eed5ae3 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -17,6 +17,7 @@ CONFIG_DEFAULT_FDT_FILE="rk3288-vyasa.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 +CONFIG_CMD_SPL=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y diff --git a/configs/x530_defconfig b/configs/x530_defconfig index ab23fd5ab1..de077cb71f 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y +CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -43,6 +44,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_UBI=y CONFIG_DEFAULT_DEVICE_TREE="armada-385-atl-x530" CONFIG_ENV_ADDR=0x100000 CONFIG_SPL_OF_TRANSLATE=y @@ -62,7 +65,6 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y -CONFIG_MTD_UBI=y CONFIG_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_MVEBU=y @@ -80,4 +82,3 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_WDT=y CONFIG_WDT_ORION=y -CONFIG_LZO=y diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 065e1e9281..de7132940c 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -31,10 +31,6 @@ */ #undef CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ #define CONFIG_SYS_LOAD_ADDR 0x200000 /* default load address */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 69e3fbae78..54f6fa7c16 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -24,10 +24,6 @@ . = DEFINED(env_offset) ? env_offset : .; \ env/embedded.o(.text*); -/* - * Command line configuration. - */ - #ifdef CONFIG_IDE /* ATA */ # define CONFIG_IDE_RESET 1 diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 5056629043..2cdd4369da 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -39,9 +39,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ #ifdef CONFIG_MCFFEC # define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index e7859f334a..6a50a25d32 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -36,9 +36,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ #ifdef CONFIG_MCFFEC # define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 788a325b64..eccbe58676 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -257,10 +257,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h index d8485f6fbd..e70b90765a 100644 --- a/include/configs/MPC8313ERDB_NAND.h +++ b/include/configs/MPC8313ERDB_NAND.h @@ -305,10 +305,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h index 029d2f1ec3..38245860ee 100644 --- a/include/configs/MPC8313ERDB_NOR.h +++ b/include/configs/MPC8313ERDB_NOR.h @@ -274,10 +274,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 2c35223868..da68f3ccca 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -304,10 +304,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index ff18d10872..eaa95bbeff 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -220,10 +220,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index bfcff2e4f8..d2d1b2fa47 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -244,10 +244,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 0a80a60d30..4707dcf1ab 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -278,10 +278,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index 79dd956174..d92312b408 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -333,10 +333,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 1254b4fc10..b5660f9ff5 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -304,10 +304,6 @@ extern int board_pci_host_broken(void); */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 8c2297a910..7ff0b77db5 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -322,10 +322,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 2ba7322021..f78782a1c1 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -288,10 +288,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index eb85141702..b2acc72973 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -391,10 +391,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #define CONFIG_WATCHDOG /* watchdog enabled */ #define CONFIG_SYS_WATCHDOG_FREQ 5000 /* Feed interval, 5s */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 59404cbaf9..94cbe10dd3 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -484,10 +484,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -/* - * Command line configuration. - */ - /* * USB */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index fcfd3b0b4b..9832f85405 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -248,10 +248,6 @@ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 6e1a40c678..cf964373f0 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -15,9 +15,6 @@ #include /* settings we don;t want on this board */ -#undef CONFIG_CMD_SPI - -#define CONFIG_CMD_CACHE #ifndef CONFIG_SPL_BUILD # define CONFIG_TIMESTAMP diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index fea9300a67..e94b7c8d21 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -40,7 +40,6 @@ DFU_ALT_INFO_RAM \ DFU_ALT_INFO_QSPI #else -#undef CONFIG_CMD_BOOTD #ifdef CONFIG_SPL_DFU #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000 #define DFUARGS \ diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 8ca571b9b7..965259c5e1 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -143,8 +143,6 @@ #undef CONFIG_SYS_MAXARGS #define CONFIG_SYS_MAXARGS 32 -#define CONFIG_CMD_TIME - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 6f03058a78..d5a0625e02 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -82,10 +82,6 @@ #define CONFIG_ENV_OVERWRITE /* Command definition */ -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_FLASH #undef CONFIG_IPADDR #define CONFIG_IPADDR 192.168.10.2 @@ -234,6 +230,4 @@ #define CONFIG_SYS_MMC_ENV_PART 1 #endif -#define CONFIG_CMD_TIME - #endif /* __CONFIG_H */ diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index 717ed53d83..88e1bf1775 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -23,13 +23,6 @@ */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - 0x00200000) -/* - * Commands configuration - */ -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 7eec226173..891240c7e2 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -38,7 +38,6 @@ #error No card type defined! #endif -/* Command line configuration */ /* * CONFIG_RAM defines if u-boot is loaded via BDM (or started from * a different bootloader that has already performed RAM setup) or diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 6e9793ab81..624b05ad08 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -29,10 +29,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #ifdef CONFIG_SD_BOOT #ifdef CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 37b9cc3b6f..378f9dc48b 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -100,10 +100,6 @@ #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID 0/* ignored in arm */ -/* - * Command line configuration. - */ - /* * Network Driver Setting */ diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h index 3bd85ffe28..31fd6ec08b 100644 --- a/include/configs/bcm7260.h +++ b/include/configs/bcm7260.h @@ -33,6 +33,4 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 0 -#define CONFIG_CMD_GPT - #endif /* __CONFIG_H */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index b906c750ed..d1120fbb74 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -127,8 +127,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Command configuration. */ -#define CONFIG_CMD_ASKENV -#define CONFIG_CMD_CACHE /* * Flash configuration. @@ -141,7 +139,6 @@ extern phys_addr_t prior_stage_fdt_address; * Filesystem configuration. */ #define CONFIG_DOS_PARTITION -#define CONFIG_CMD_FS_GENERIC /* * Environment configuration. diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h index 459712190a..35f4b74727 100644 --- a/include/configs/caddy2.h +++ b/include/configs/caddy2.h @@ -208,9 +208,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ #define CONFIG_SYS_RTC_BUS_NUM 0x01 #define CONFIG_SYS_I2C_RTC_ADDR 0x32 diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 2ad54f4907..c671cb50af 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -45,12 +45,7 @@ #define CONFIG_BOARD_EARLY_INIT_F /* Commands */ -#define CONFIG_CMD_READ -#undef CONFIG_CMD_EXPORTENV -#undef CONFIG_CMD_IMPORTENV -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_CRC32 #undef CONFIG_BOOTM_NETBSD /* ENET Config */ diff --git a/include/configs/ci20.h b/include/configs/ci20.h index e6b4e233d6..67f5bbe9d8 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OVERWRITE -/* Command line configuration. */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index b923bae9b2..78f73fc915 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_I2C_EEPROM_BUS SYS_I2C_BUS_SOM #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 459e0d9d5e..74be2f1378 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -19,10 +19,6 @@ */ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ -/* - * Commands configuration - */ - /* * SDIO/MMC Card Configuration */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index fe23c2396c..c859616c68 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -95,10 +95,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #ifdef CONFIG_MCFFEC # define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 3d248ef4ef..6beef25094 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -70,10 +70,6 @@ #define CONFIG_ENV_OVERWRITE /* Command definition */ -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_FLASH #undef CONFIG_IPADDR #define CONFIG_IPADDR 192.168.10.2 @@ -213,6 +209,4 @@ #define CONFIG_SYS_MMC_ENV_PART 1 #endif -#define CONFIG_CMD_TIME - #endif /* __CONFIG_H */ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 34d268e061..823586cc09 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -276,10 +276,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #endif -/* - * Command line configuration. - */ - #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #ifndef CONFIG_TRAILBLAZER diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 0735ab2215..213883ef0f 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -17,10 +17,6 @@ */ #define CONFIG_SYS_TCLK 200000000 /* 200MHz */ -/* - * Commands configuration - */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MVTWSI diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index f06853b74e..fe9a7ab563 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -12,10 +12,6 @@ #define CONFIG_SYS_TCLK 200000000 /* 200MHz */ -/* - * Commands configuration - */ - /* USB/EHCI configuration */ #define CONFIG_EHCI_IS_TDI diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 26c2240dbe..d4207be1d3 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -12,10 +12,6 @@ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ -/* - * Commands configuration - */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MVTWSI diff --git a/include/configs/display5.h b/include/configs/display5.h index 6600b94ac3..2e5dbfedc8 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -10,9 +10,7 @@ #include "mx6_common.h" /* Falcon Mode */ -#define CONFIG_CMD_SPL #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 -#define CONFIG_CMD_SPL_WRITE_SIZE (44 * SZ_1K) /* Falcon Mode - MMC support */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x3F00 diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 41079e8345..62107625e2 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -24,14 +24,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Commands configuration - */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* Remove or override few declarations from mv-common.h */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index fbe431b9c9..14cd82f5a3 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -48,7 +48,6 @@ #endif #ifdef CONFIG_SPL_BUILD -#undef CONFIG_CMD_BOOTD #ifdef CONFIG_SPL_DFU #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000 #define DFUARGS \ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 3e3f4c17f8..09bac01779 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -17,14 +17,6 @@ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG -/* - * Commands configuration - */ - -/* - * mv-plug-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-plug-common.h" /* diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 594cc82234..1f033ababf 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -19,15 +19,6 @@ */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -/* - * Commands configuration - */ -#define CONFIG_CMD_EXT2 - -/* - * mv-plug-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-plug-common.h" /* diff --git a/include/configs/ds414.h b/include/configs/ds414.h index b179b99468..a92e788a38 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -17,10 +17,6 @@ */ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ -/* - * Commands configuration - */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MVTWSI diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index d441f28d4a..3dab93418a 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -43,10 +43,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #define CONFIG_MCFTMR #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index cfee974045..9de054306f 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -104,9 +104,6 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ -/* - * Commands configuration - */ /* * Network diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index e40be93ca7..47c5974b2e 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -168,7 +168,6 @@ #define CONFIG_HIDE_LOGO_VERSION #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_CMD_BMP #define CONFIG_IMX6_PWM_PER_CLK 66000000 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index afd48d5ad0..51325047ec 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -37,14 +37,6 @@ #define MV88E1116_RGMII_TXTM_CTRL (1 << 4) #define MV88E1116_RGMII_RXTM_CTRL (1 << 5) -/* - * Commands configuration - */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 2f66af3447..a0554d7f8e 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -29,10 +29,6 @@ */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - 0x00200000) -/* - * Commands configuration - */ - /* Network configuration */ #ifdef CONFIG_CMD_NET #define CONFIG_ARMADA100_FEC diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index bf4b3b297e..5b8f2420d6 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -102,7 +102,6 @@ #define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c /* Various command support */ -#define CONFIG_CMD_UNZIP /* gzwrite */ /* Ethernet support */ #define CONFIG_FEC_MXC diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 671c3d291d..31e2e78b62 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -20,10 +20,6 @@ */ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ -/* - * Commands configuration - */ - /* * SDIO/MMC Card Configuration */ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 76add4eba8..bdbaa475d2 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -30,10 +30,6 @@ #define CONFIG_CALXEDA_XGMAC -/* - * Command line configuration. - */ - #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_RESET_TO_RETRY diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 2732c019c4..70cd682ca9 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -55,8 +55,6 @@ #define CONFIG_HIKEY_GPIO -/* Command line configuration */ - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 76c4ee9777..ea8d54a307 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -354,10 +354,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index f27dbfbc5f..41483a2f7e 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -15,14 +15,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Commands configuration - */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 3754cd1e65..c99490b85d 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -20,14 +20,6 @@ */ #define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT -/* - * Commands configuration - */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 72ae89c5f6..4c7a0cb0bb 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -159,9 +159,7 @@ #ifdef CONFIG_SPL_OS_BOOT # define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" # define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" -# define CONFIG_CMD_SPL # define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 -# define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) /* MMC support: args@1MB kernel@2MB */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index d4a613d0ad..d70c6dbc23 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -60,9 +60,7 @@ /* Falcon */ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" -#define CONFIG_CMD_SPL #define CONFIG_SYS_SPL_ARGS_ADDR 0x13000000 -#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) /* MMC support: args@1MB kernel@2MB */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 94183269cd..3835eab062 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -61,18 +61,9 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#undef CONFIG_CMD_EXPORTENV -#undef CONFIG_CMD_IMPORTENV -#undef CONFIG_CMD_IMLS - -#undef CONFIG_CMD_CRC32 - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII #define CONFIG_MII #define CONFIG_ETHPRIME "FEC" @@ -209,8 +200,6 @@ #define CONFIG_MXC_GPIO -#define CONFIG_CMD_FUSE - /* I2C Configs */ #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 72edbc74ec..6d038f21b7 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -57,18 +57,9 @@ #define CONFIG_BOARD_EARLY_INIT_F -#undef CONFIG_CMD_EXPORTENV -#undef CONFIG_CMD_IMPORTENV -#undef CONFIG_CMD_IMLS - -#undef CONFIG_CMD_CRC32 - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII #define CONFIG_MII #define CONFIG_ETHPRIME "FEC" @@ -200,8 +191,6 @@ #define CONFIG_MXC_GPIO -#define CONFIG_CMD_FUSE - /* I2C Configs */ #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index d7dd3e21a3..8324767eb5 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -40,12 +40,6 @@ /* Flat Device Tree Definitions */ #define CONFIG_OF_BOARD_SETUP -#undef CONFIG_CMD_EXPORTENV -#undef CONFIG_CMD_IMPORTENV -#undef CONFIG_CMD_IMLS - -#undef CONFIG_CMD_CRC32 - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 #define USDHC2_BASE_ADDR 0x5B020000 diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index eebb8dc011..89d7adabea 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -30,7 +30,6 @@ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* FUSE command */ -#define CONFIG_CMD_FUSE /* Boot M4 */ #define M4_BOOT_ENV \ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index a2046e1beb..a58f68c17e 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -40,12 +40,6 @@ /* Flat Device Tree Definitions */ #define CONFIG_OF_BOARD_SETUP -#undef CONFIG_CMD_EXPORTENV -#undef CONFIG_CMD_IMPORTENV -#undef CONFIG_CMD_IMLS - -#undef CONFIG_CMD_CRC32 - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 #define USDHC2_BASE_ADDR 0x5B020000 @@ -189,8 +183,6 @@ #ifndef CONFIG_DM_PCA953X #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X -#define CONFIG_CMD_PCA953X_INFO #endif /* Networking */ diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index f15e08f397..cc18347ff6 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -24,9 +24,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ #define CONFIG_BOOTCOMMAND "" /* Flash settings */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index d8a474db2e..c4203ce57e 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -27,9 +27,6 @@ #define CONFIG_SMC91111_BASE 0xC8000000 #undef CONFIG_SMC91111_EXT_PHY -/* - * Command line configuration. - */ #define CONFIG_BOOTCOMMAND "tftpboot ; bootm" #define CONFIG_SERVERIP 192.168.1.100 #define CONFIG_IPADDR 192.168.1.104 diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index 869e0ad6b8..86cc4b6d30 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -12,7 +12,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 -#define CONFIG_CMD_MEMINFO /* MMC */ #ifdef CONFIG_MMC @@ -30,7 +29,6 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_CMD_MEMINFO #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 54ea43420f..f8cb97bd12 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -13,7 +13,6 @@ #define CONFIG_CHIP_SELECTS_PER_CTRL 1 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 -#define CONFIG_CMD_MEMINFO #ifndef CONFIG_SPL_BUILD #undef BOOT_TARGET_DEVICES @@ -70,6 +69,4 @@ #define CONFIG_BOOTCOMMAND "pfe stop;run distro_bootcmd;run qspi_bootcmd" #endif -#define CONFIG_CMD_MEMINFO - #endif /* __LS1012ARDB_H__ */ diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index 1ea6548015..2e20e11377 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -21,7 +21,6 @@ #define SYS_SDRAM_SIZE_512 0x20000000 #define SYS_SDRAM_SIZE_1024 0x40000000 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 -#define CONFIG_CMD_MEMINFO /* ENV */ #define CONFIG_SYS_FSL_QSPI_BASE 0x40000000 @@ -114,7 +113,6 @@ #define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run sd_bootcmd; "\ "env exists secureboot && esbc_halt;" #endif -#define CONFIG_CMD_MEMINFO #include diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 99840dcfc4..9498a03f40 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -12,7 +12,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 -#define CONFIG_CMD_MEMINFO /* * QIXIS Definitions @@ -104,7 +103,5 @@ #define CONFIG_PCI_SCAN_SHOW -#define CONFIG_CMD_MEMINFO - #include #endif /* __LS1012AQDS_H__ */ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 8fb75650e2..7eb1ec9366 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -13,7 +13,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 -#define CONFIG_CMD_MEMINFO /* * I2C IO expander @@ -49,8 +48,6 @@ #define CONFIG_PCI_SCAN_SHOW -#define CONFIG_CMD_MEMINFO - #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 6e94a2a4c9..59d65f8891 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -97,7 +97,6 @@ /* * I2C */ -#define CONFIG_CMD_I2C #ifndef CONFIG_DM_I2C #define CONFIG_SYS_I2C @@ -141,7 +140,6 @@ /* DM SPI */ #if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI) -#define CONFIG_CMD_SF #define CONFIG_DM_SPI_FLASH #endif @@ -182,8 +180,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMD_MII - #define CONFIG_CMDLINE_TAG #define CONFIG_PEN_ADDR_BIG_ENDIAN @@ -205,9 +201,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) -#define CONFIG_CMD_GREPENV -#define CONFIG_CMD_MEMINFO - #define CONFIG_SYS_LOAD_ADDR 0x82000000 #define CONFIG_LS102XA_STREAM_ID diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h index b91016987b..7bb740f48e 100644 --- a/include/configs/ls1028aqds.h +++ b/include/configs/ls1028aqds.h @@ -77,9 +77,6 @@ #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 -#ifndef CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT2 -#endif #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 0f289cb078..0745011326 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -59,9 +59,6 @@ #endif /* SATA */ -#ifndef CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT2 -#endif #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 985f40412c..b18eab51ed 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -165,8 +165,6 @@ #endif #endif -/* Command line configuration */ - /* MMC */ #ifndef SPL_NO_MMC #ifdef CONFIG_MMC diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 4ad51f15cb..bfaa574fc9 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -35,7 +35,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043ardb/ls1043ardb_rcw_sd.cfg -#define CONFIG_CMD_SPL #define CONFIG_SYS_SPL_ARGS_ADDR 0x90000000 #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x10000 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x500 @@ -275,9 +274,6 @@ /* SATA */ #ifndef SPL_NO_SATA -#ifndef CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT2 -#endif #define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 #define CONFIG_SYS_SCSI_MAX_LUN 2 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 24db23b3c3..8fe6937dfb 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -160,8 +160,6 @@ CONFIG_SYS_SCSI_MAX_LUN) #endif -/* Command line configuration */ - /* MMC */ #ifndef SPL_NO_MMC #ifdef CONFIG_MMC diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index a7373429ba..596f14bf3e 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -50,10 +50,6 @@ */ #define CPU_RELEASE_ADDR secondary_boot_func -#ifdef CONFIG_PCI -#define CONFIG_CMD_PCI -#endif - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2048 * 1024) @@ -143,8 +139,6 @@ unsigned long long get_qixis_addr(void); #if defined(CONFIG_FSL_MC_ENET) #define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (128UL * 1024 * 1024) #endif -/* Command line configuration */ -#define CONFIG_CMD_CACHE /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 2bc910a3fc..1e9e6a8f96 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -29,7 +29,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_QIXIS_I2C_ACCESS #define SYS_NO_FLASH -#undef CONFIG_CMD_IMLS #define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_DDR_CLK_FREQ 100000000 #else @@ -150,7 +149,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) @@ -367,8 +365,6 @@ unsigned long get_board_ddr_clk(void); #endif #endif -#define CONFIG_CMD_MEMINFO - #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 475207358f..16e0486d40 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -16,7 +16,6 @@ #define CONFIG_QIXIS_I2C_ACCESS #endif #define SYS_NO_FLASH -#undef CONFIG_CMD_IMLS #endif #define CONFIG_SYS_CLK_FREQ 100000000 @@ -121,7 +120,6 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) @@ -259,8 +257,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 -#define CONFIG_CMD_MEMINFO - #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index b58776a788..410872dfd8 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -149,8 +149,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (128UL * 1024 * 1024) #endif -/* Command line configuration */ - /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index faa74c613f..0c0ab2486e 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -32,14 +32,6 @@ #define CONFIG_KIRKWOOD_GPIO -/* - * Commands configuration - */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* loading initramfs images without uimage header */ diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 9cc13052cc..0c2185c529 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -17,10 +17,6 @@ */ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ -/* - * Commands configuration - */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MVTWSI diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index d6b21f11c3..74bfcee9f0 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -236,10 +236,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 683d442e75..a7be85422a 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -81,7 +81,6 @@ /* Fuse API support */ #define CONFIG_FSL_IIM -#define CONFIG_CMD_FUSE /* Ethernet Configs */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index c32f02635b..aac9ec62b2 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -144,7 +144,6 @@ /* FLASH and environment organization */ #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_CMD_FUSE #define CONFIG_FSL_IIM #define CONFIG_BCH diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index f7f9404479..78bdfab5a6 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -88,9 +88,5 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) -#define CONFIG_CMD_CACHE -#endif - #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* __CONFIG_H */ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 9216b0948c..942b7dd414 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -143,8 +143,4 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) -#define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_H */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 5251db9389..b95c7fc3be 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -37,14 +37,6 @@ #define MV88E1116_RGMII_TXTM_CTRL (1 << 4) #define MV88E1116_RGMII_RXTM_CTRL (1 << 5) -/* - * Commands configuration - */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index ce1e3214a6..13812c43a1 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -15,12 +15,6 @@ #define CONFIG_KW88F6702 1 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* commands configuration */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* environment variables configuration */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 5c59cabc08..e9fd0fc749 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -20,14 +20,6 @@ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Commands configuration - */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index f4da38a7db..708e9c7436 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -57,18 +57,9 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#undef CONFIG_CMD_EXPORTENV -#undef CONFIG_CMD_IMPORTENV -#undef CONFIG_CMD_IMLS - -#undef CONFIG_CMD_CRC32 - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII #define CONFIG_MII #define CONFIG_ETHPRIME "FEC" @@ -181,8 +172,6 @@ #define CONFIG_MXC_GPIO -#define CONFIG_CMD_FUSE - /* I2C Configs */ #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 771fd8db97..2747c0cb93 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -57,10 +57,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - /* SDRAM */ #define PHYS_SDRAM_1 ATMEL_BASE_CS1 /* on DDRSDRC1 */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index bb24739a90..cbe5022297 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -24,14 +24,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Commands configuration - */ - -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-common.h" /* diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 81c7f251bc..2c7dc8bab6 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -52,7 +52,6 @@ BOOTENV -/* Command line configuration */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* Monitor Command Prompt */ diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 4227a280c7..e96118a0cf 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -30,10 +30,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #define CONFIG_DRIVER_NE2000 #define CONFIG_DRIVER_NE2000_BASE 0xb4000300 diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 801ba76b3e..676e7c1a15 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -30,10 +30,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #define CONFIG_DRIVER_NE2000 #define CONFIG_DRIVER_NE2000_BASE 0xffffffffb4000300 diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index cfbd472c82..03b08968f6 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -107,10 +107,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 5821d21688..5c6692c199 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -35,7 +35,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* Config CACHE */ -#define CONFIG_CMD_CACHE #define CONFIG_SYS_FULL_VA @@ -68,12 +67,9 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_NUM 1 -/* #define CONFIG_CMD_EXT2 EXT2 Support */ - #if 0 /* Ethernet config */ -#define CONFIG_CMD_MII #define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index 7343201098..8e98254e2d 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ /* NAND flash */ -#undef CONFIG_CMD_NAND /* SPI flash */ diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h index 17028ca145..2d1ba757fe 100644 --- a/include/configs/sama5d2_icp.h +++ b/include/configs/sama5d2_icp.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ /* NAND flash */ -#undef CONFIG_CMD_NAND /* SPI flash */ #define CONFIG_SF_DEFAULT_SPEED 66000000 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 484a15df79..2a81f3a9bc 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -8,7 +8,6 @@ #ifdef FTRACE #define CONFIG_TRACE -#define CONFIG_CMD_TRACE #define CONFIG_TRACE_BUFFER_SIZE (16 << 20) #define CONFIG_TRACE_EARLY_SIZE (16 << 20) #define CONFIG_TRACE_EARLY diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 55b9a3c182..5adf5a8ca4 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -232,10 +232,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 3ee6e684fd..e1f8fb8ac8 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -14,18 +14,6 @@ */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -/* - * Commands configuration - */ - -/* - * Standard filesystems - */ - -/* - * mv-plug-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ #include "mv-plug-common.h" /* diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index be36e9f586..fcd35b715c 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -99,8 +99,4 @@ /* U-Boot memory settings */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) -/* Command line configuration */ -#define CONFIG_CMD_MII -#define CONFIG_CMD_CACHE - #endif /* __CONFIG_H */ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index 85c68cdee6..c3f81ff491 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -29,8 +29,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 1 #endif /* CONFIG_FSL_USDHC */ -#define CONFIG_CMD_READ - #define CONFIG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index f393aa0264..169b9efeec 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -44,7 +44,6 @@ BOOTENV /* Extra Commands */ -#define CONFIG_CMD_ASKENV #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index a8b3a17309..9d029fbcc6 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -44,8 +44,4 @@ "bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \ "bootm 0x08044000 - 0x08042000\0" -/* - * Command line configuration. - */ - #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index a7150312ca..8390535af0 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -51,8 +51,4 @@ "ramdisk_addr_r=0x00438000\0" \ BOOTENV -/* - * Command line configuration. - */ - #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 8212fb63de..57fb6b25af 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -51,8 +51,4 @@ "ramdisk_addr_r=0x00438000\0" \ BOOTENV -/* - * Command line configuration. - */ - #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 529152f60c..c20c8a7478 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -58,9 +58,6 @@ "ramdisk_addr_r=0xC0438000\0" \ BOOTENV -/* - * Command line configuration. - */ #define CONFIG_BOARD_LATE_INIT #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 39c93ee6f9..71d6ab0c4e 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -45,9 +45,6 @@ "ramdisk_addr_r=0xD0438000\0" \ BOOTENV -/* - * Command line configuration. - */ #define CONFIG_BOARD_LATE_INIT #endif /* __CONFIG_H */ diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 8eb94c1ad4..cbbe9252d5 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -45,9 +45,6 @@ "ramdisk_addr_r=0xD0438000\0" \ BOOTENV -/* - * Command line configuration. - */ #define CONFIG_BOARD_LATE_INIT #endif /* __CONFIG_H */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 4ad3401c04..f860865b7c 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -387,10 +387,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 976d527a08..3da7ee7b3a 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -211,10 +211,6 @@ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/tb100.h b/include/configs/tb100.h index ae54520696..f42b0df1cf 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -47,10 +47,6 @@ #define ETH0_BASE_ADDRESS 0xFE100000 #define ETH1_BASE_ADDRESS 0xFE110000 -/* - * Command line configuration - */ - /* * Environment configuration */ diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index 0a1261fa20..141d4d61f8 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -19,7 +19,6 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP /* Environment settings */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 6d42ec1aa1..0e5bd0dbbf 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -17,10 +17,6 @@ */ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ -/* - * Commands configuration - */ - /* * The debugging version enables USB support via defconfig. * This version should also enable all other non-production diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 1d3b2a3922..d16d61e5cd 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -28,8 +28,6 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_CMD_ASKENV - #define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index a2dcd1ae20..6e3953835d 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -22,9 +22,6 @@ #define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -/* sspi command isn't useful */ -#undef CONFIG_CMD_SPI - /* No falcon support */ #undef CONFIG_SPL_OS_BOOT #undef CONFIG_SPL_FPGA_SUPPORT diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index 75e7458067..f25f6dccb5 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -52,6 +52,4 @@ * Diagnostics */ -#define CONFIG_CMD_MII - #endif /* __CONFIG_H */ diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 81b171ea16..91249f2eb4 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -204,10 +204,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index c11507e550..3f578720e5 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -208,9 +208,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ #define CONFIG_SYS_RTC_BUS_NUM 0x01 #define CONFIG_SYS_I2C_RTC_ADDR 0x32 diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index c3521cac41..4d8b4a03e1 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -29,9 +29,7 @@ /* Falcon Mode */ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" -#define CONFIG_CMD_SPL #define CONFIG_SYS_SPL_ARGS_ADDR 0x0ffe5000 -#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) /* Falcon Mode - MMC support: args@16MB kernel@17MB */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x8000 /* 16MB */ diff --git a/include/configs/x530.h b/include/configs/x530.h index 99531ed319..7e0f2c24d9 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -32,11 +32,6 @@ #define CONFIG_CONS_INDEX 1 /*Console on UART0 */ -/* - * Commands configuration - */ -#define CONFIG_CMD_PCI - /* NAND */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 @@ -69,9 +64,6 @@ /* NAND */ #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#define CONFIG_CMD_MTDPARTS #define CONFIG_SYS_MALLOC_LEN (4 << 20) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index ff45714c82..bd62798d26 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -41,10 +41,6 @@ */ #define CONFIG_SYS_NS16550_PORT_MAPPED -/*----------------------------------------------------------------------- - * Command line configuration. - */ - #ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ "ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000" diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h index a1a98f9193..0b201a2b4d 100644 --- a/include/configs/xilinx_versal_mini.h +++ b/include/configs/xilinx_versal_mini.h @@ -17,7 +17,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_CMD_ENV /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 6cde7e83e9..e868c13416 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -244,7 +244,6 @@ #endif #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) -# undef CONFIG_CMD_BOOTD # define CONFIG_SPL_ENV_SUPPORT # define CONFIG_SPL_HASH_SUPPORT # define CONFIG_ENV_MAX_ENTRIES 10 diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index ccc938267d..ae751aa395 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -19,7 +19,6 @@ #undef CONFIG_BOOTCOMMAND #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_SYS_MALLOC_LEN -#undef CONFIG_CMD_ENV #undef CONFIG_SYS_INIT_SP_ADDR /* BOOTP options */ diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index e76c5cbe6b..15bd97f210 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -51,14 +51,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Command line configuration. - */ - -/* - * Additional command - */ - /* * USB */ From 68ff2343311cec25d6cae056445a61964a56f531 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:19 -0400 Subject: [PATCH 10/17] Convert CONFIG_BOARD_LATE_INIT to Kconfig This converts the following to Kconfig: CONFIG_BOARD_LATE_INIT Signed-off-by: Tom Rini --- configs/am335x_pdu001_defconfig | 1 + configs/bcm7260_defconfig | 1 + configs/bcm7445_defconfig | 1 + configs/cl-som-imx7_defconfig | 1 + configs/controlcenterdc_defconfig | 1 + configs/hsdk_4xd_defconfig | 1 + configs/hsdk_defconfig | 1 + configs/imx8mq_evk_defconfig | 1 + configs/mccmon6_nor_defconfig | 1 + configs/mccmon6_sd_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/pico-imx8mq_defconfig | 1 + configs/stm32f746-disco_defconfig | 1 + configs/stm32f769-disco_defconfig | 1 + configs/stm32h743-disco_defconfig | 1 + configs/stm32h743-eval_defconfig | 1 + include/configs/bcmstb.h | 1 - include/configs/cl-som-imx7.h | 2 -- include/configs/controlcenterdc.h | 1 - include/configs/hsdk-4xd.h | 1 - include/configs/hsdk.h | 1 - include/configs/imx8mq_evk.h | 1 - include/configs/mccmon6.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/pdu001.h | 1 - include/configs/pico-imx8mq.h | 1 - include/configs/stm32f746-disco.h | 1 - include/configs/stm32h743-disco.h | 2 -- include/configs/stm32h743-eval.h | 2 -- 29 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig index 792d2165bc..d3a0cb88cb 100644 --- a/configs/am335x_pdu001_defconfig +++ b/configs/am335x_pdu001_defconfig @@ -16,6 +16,7 @@ CONFIG_LOCALVERSION="-EETS-1.0.0" CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOARD_LATE_INIT=y # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index 55e290c766..a2707a0da5 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -11,6 +11,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTDELAY=1 CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};" +CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot>" CONFIG_CMD_ASKENV=y diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 338f525bf5..65c4b33a58 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -12,6 +12,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTDELAY=1 CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};" +CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot>" CONFIG_CMD_ASKENV=y diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index c1eac88fcd..a38c6c2429 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=3 +CONFIG_BOARD_LATE_INIT=y CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_BOARD_INIT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80 diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 4ac46ff759..df609d5036 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -23,6 +23,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_BOARD_LATE_INIT=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_LAST_STAGE_INIT=y CONFIG_SPL_BOARD_INIT=y diff --git a/configs/hsdk_4xd_defconfig b/configs/hsdk_4xd_defconfig index 5fe6f75006..a6c9177372 100644 --- a/configs/hsdk_4xd_defconfig +++ b/configs/hsdk_4xd_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CLK_FREQ=500000000 CONFIG_DEBUG_UART=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" +CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_HUSH_PARSER=y diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index 4b767169fc..30c9402de6 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_CLK_FREQ=500000000 CONFIG_DEBUG_UART=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" +CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_HUSH_PARSER=y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index c13a954b36..871f784b49 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -14,6 +14,7 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" +CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index 2750747ece..9e18fb3de0 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -18,6 +18,7 @@ CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_nor.cfg" # CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOARD_LATE_INIT=y CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_FIT_IMAGE_TINY=y diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig index 6c72a5183f..c7a00e4651 100644 --- a/configs/mccmon6_sd_defconfig +++ b/configs/mccmon6_sd_defconfig @@ -19,6 +19,7 @@ CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_sd.cfg" # CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOARD_LATE_INIT=y CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_ENV_SUPPORT=y diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 2eab6f219a..1dca2455c8 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -17,6 +17,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_MISC_INIT_R=y +CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_DM=y diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index cf1f10ad08..2eeec09f1b 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -14,6 +14,7 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" +CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index be030bfb37..58e854aea0 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -12,6 +12,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig index 09fbcc968f..0cda06e1af 100644 --- a/configs/stm32f769-disco_defconfig +++ b/configs/stm32f769-disco_defconfig @@ -12,6 +12,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig index 21ea90a2c1..1d94032ef0 100644 --- a/configs/stm32h743-disco_defconfig +++ b/configs/stm32h743-disco_defconfig @@ -10,6 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="stm32h743i-disco" +CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="U-Boot > " diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig index 432fce0181..6fd8cd84d4 100644 --- a/configs/stm32h743-eval_defconfig +++ b/configs/stm32h743-eval_defconfig @@ -10,6 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="stm32h743i-eval" +CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="U-Boot > " diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index d1120fbb74..24569f7d94 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -160,6 +160,5 @@ extern phys_addr_t prior_stage_fdt_address; * Set fdtaddr to prior stage-provided DTB in board_late_init, when * writeable environment is available. */ -#define CONFIG_BOARD_LATE_INIT #endif /* __BCMSTB_H */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 78f73fc915..07f1893d11 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -15,8 +15,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) -#define CONFIG_BOARD_LATE_INIT - /* Network */ #define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index a326a1c83d..00e5c8f794 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -13,7 +13,6 @@ #define CONFIG_CUSTOMER_BOARD_SUPPORT #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_BOARD_LATE_INIT /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h index 4628108075..5678f0a77b 100644 --- a/include/configs/hsdk-4xd.h +++ b/include/configs/hsdk-4xd.h @@ -115,6 +115,5 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0" /* * Callback configuration */ -#define CONFIG_BOARD_LATE_INIT #endif /* _CONFIG_HSDK_H_ */ diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 7735cc1720..3cc3b8c0ae 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -114,6 +114,5 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0" /* * Callback configuration */ -#define CONFIG_BOARD_LATE_INIT #endif /* _CONFIG_HSDK_H_ */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 3835eab062..f71efd45ab 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -59,7 +59,6 @@ #define CONFIG_REMAKE_ELF #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOARD_LATE_INIT /* ENET Config */ /* ENET1 */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index ee942a48fc..0c383e94cc 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -28,7 +28,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) -#define CONFIG_BOARD_LATE_INIT #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configuration */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index aac9ec62b2..bb6d82d327 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -20,7 +20,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -#define CONFIG_BOARD_LATE_INIT #define CONFIG_REVISION_TAG /* USB Configs */ diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index 78a1a86431..d524f3cbcf 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -16,7 +16,6 @@ #define MACH_TYPE_PDU001 5075 #define CONFIG_MACH_TYPE MACH_TYPE_PDU001 -#define CONFIG_BOARD_LATE_INIT /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 708e9c7436..2ae13b30ee 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -55,7 +55,6 @@ #define CONFIG_REMAKE_ELF #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOARD_LATE_INIT /* ENET Config */ /* ENET1 */ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index c20c8a7478..f7a713dd22 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -58,7 +58,6 @@ "ramdisk_addr_r=0xC0438000\0" \ BOOTENV -#define CONFIG_BOARD_LATE_INIT #define CONFIG_DISPLAY_BOARDINFO /* For SPL */ diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 71d6ab0c4e..afc98ae791 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -45,6 +45,4 @@ "ramdisk_addr_r=0xD0438000\0" \ BOOTENV -#define CONFIG_BOARD_LATE_INIT - #endif /* __CONFIG_H */ diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index cbbe9252d5..66af8f50d9 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -45,6 +45,4 @@ "ramdisk_addr_r=0xD0438000\0" \ BOOTENV -#define CONFIG_BOARD_LATE_INIT - #endif /* __CONFIG_H */ From 048a648298b19ed1dc5566a408622ccb9eec286c Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2020 16:32:35 -0600 Subject: [PATCH 11/17] checkpatch.pl: Update to v5.7 Keep the U-Boot changes to $logFunctions Signed-off-by: Simon Glass [trini: Resync with v5.7 release which changed the default max line length, update commit to reflect] Signed-off-by: Tom Rini --- scripts/checkpatch.pl | 228 ++++++++++++------------------------------ 1 file changed, 63 insertions(+), 165 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index c2641bc995..bc51fffb77 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -51,7 +51,7 @@ my %ignore_type = (); my @ignore = (); my $help = 0; my $configuration_file = ".checkpatch.conf"; -my $max_line_length = 80; +my $max_line_length = 100; my $ignore_perl_version = 0; my $minimum_perl_version = 5.10.0; my $min_conf_desc_length = 4; @@ -61,9 +61,7 @@ my $codespellfile = "/usr/share/codespell/dictionary.txt"; my $conststructsfile = "$D/const_structs.checkpatch"; my $typedefsfile = ""; my $color = "auto"; -my $allow_c99_comments = 1; # Can be overridden by --ignore C99_COMMENT_TOLERANCE -# git output parsing needs US English output, so first set backtick child process LANGUAGE -my $git_command ='export LANGUAGE=en_US.UTF-8; git'; +my $allow_c99_comments = 1; sub help { my ($exitcode) = @_; @@ -96,7 +94,9 @@ Options: --types TYPE(,TYPE2...) show only these comma separated message types --ignore TYPE(,TYPE2...) ignore various comma separated message types --show-types show the specific message type in the output - --max-line-length=n set the maximum line length, if exceeded, warn + --max-line-length=n set the maximum line length, (default $max_line_length) + if exceeded, warn on patches + requires --strict for use with --file --min-conf-desc-length=n set the min description length, if shorter, warn --root=PATH PATH to the kernel tree root --no-summary suppress the per-file summary @@ -470,19 +470,8 @@ our $logFunctions = qr{(?x: seq_vprintf|seq_printf|seq_puts )}; -our $allocFunctions = qr{(?x: - (?:(?:devm_)? - (?:kv|k|v)[czm]alloc(?:_node|_array)? | - kstrdup(?:_const)? | - kmemdup(?:_nul)?) | - (?:\w+)?alloc_skb(?:ip_align)? | - # dev_alloc_skb/netdev_alloc_skb, et al - dma_alloc_coherent -)}; - our $signature_tags = qr{(?xi: Signed-off-by:| - Co-developed-by:| Acked-by:| Tested-by:| Reviewed-by:| @@ -588,27 +577,6 @@ foreach my $entry (@mode_permission_funcs) { } $mode_perms_search = "(?:${mode_perms_search})"; -our %deprecated_apis = ( - "synchronize_rcu_bh" => "synchronize_rcu", - "synchronize_rcu_bh_expedited" => "synchronize_rcu_expedited", - "call_rcu_bh" => "call_rcu", - "rcu_barrier_bh" => "rcu_barrier", - "synchronize_sched" => "synchronize_rcu", - "synchronize_sched_expedited" => "synchronize_rcu_expedited", - "call_rcu_sched" => "call_rcu", - "rcu_barrier_sched" => "rcu_barrier", - "get_state_synchronize_sched" => "get_state_synchronize_rcu", - "cond_synchronize_sched" => "cond_synchronize_rcu", -); - -#Create a search pattern for all these strings to speed up a loop below -our $deprecated_apis_search = ""; -foreach my $entry (keys %deprecated_apis) { - $deprecated_apis_search .= '|' if ($deprecated_apis_search ne ""); - $deprecated_apis_search .= $entry; -} -$deprecated_apis_search = "(?:${deprecated_apis_search})"; - our $mode_perms_world_writable = qr{ S_IWUGO | S_IWOTH | @@ -908,7 +876,7 @@ sub seed_camelcase_includes { $camelcase_seeded = 1; if (-e ".git") { - my $git_last_include_commit = `${git_command} log --no-merges --pretty=format:"%h%n" -1 -- include`; + my $git_last_include_commit = `git log --no-merges --pretty=format:"%h%n" -1 -- include`; chomp $git_last_include_commit; $camelcase_cache = ".checkpatch-camelcase.git.$git_last_include_commit"; } else { @@ -936,7 +904,7 @@ sub seed_camelcase_includes { } if (-e ".git") { - $files = `${git_command} ls-files "include/*.h"`; + $files = `git ls-files "include/*.h"`; @include_files = split('\n', $files); } @@ -960,13 +928,13 @@ sub git_commit_info { return ($id, $desc) if ((which("git") eq "") || !(-e ".git")); - my $output = `${git_command} log --no-color --format='%H %s' -1 $commit 2>&1`; + my $output = `git log --no-color --format='%H %s' -1 $commit 2>&1`; $output =~ s/^\s*//gm; my @lines = split("\n", $output); return ($id, $desc) if ($#lines < 0); - if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous/) { + if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous\./) { # Maybe one day convert this block of bash into something that returns # all matching commit ids, but it's very slow... # @@ -1010,7 +978,7 @@ if ($git) { } else { $git_range = "-1 $commit_expr"; } - my $lines = `${git_command} log --no-color --no-merges --pretty=format:'%H %s' $git_range`; + my $lines = `git log --no-color --no-merges --pretty=format:'%H %s' $git_range`; foreach my $line (split(/\n/, $lines)) { $line =~ /^([0-9a-fA-F]{40,40}) (.*)$/; next if (!defined($1) || !defined($2)); @@ -1025,7 +993,6 @@ if ($git) { } my $vname; -$allow_c99_comments = !defined $ignore_type{"C99_COMMENT_TOLERANCE"}; for my $filename (@ARGV) { my $FILE; if ($git) { @@ -2691,24 +2658,6 @@ sub process { } else { $signatures{$sig_nospace} = 1; } - -# Check Co-developed-by: immediately followed by Signed-off-by: with same name and email - if ($sign_off =~ /^co-developed-by:$/i) { - if ($email eq $author) { - WARN("BAD_SIGN_OFF", - "Co-developed-by: should not be used to attribute nominal patch author '$author'\n" . "$here\n" . $rawline); - } - if (!defined $lines[$linenr]) { - WARN("BAD_SIGN_OFF", - "Co-developed-by: must be immediately followed by Signed-off-by:\n" . "$here\n" . $rawline); - } elsif ($rawlines[$linenr] !~ /^\s*signed-off-by:\s*(.*)/i) { - WARN("BAD_SIGN_OFF", - "Co-developed-by: must be immediately followed by Signed-off-by:\n" . "$here\n" . $rawline . "\n" .$rawlines[$linenr]); - } elsif ($1 ne $email) { - WARN("BAD_SIGN_OFF", - "Co-developed-by and Signed-off-by: name/email do not match \n" . "$here\n" . $rawline . "\n" .$rawlines[$linenr]); - } - } } # Check email subject for common tools that don't need to be mentioned @@ -2729,10 +2678,8 @@ sub process { ($line =~ /^\s*(?:WARNING:|BUG:)/ || $line =~ /^\s*\[\s*\d+\.\d{6,6}\s*\]/ || # timestamp - $line =~ /^\s*\[\<[0-9a-fA-F]{8,}\>\]/) || - $line =~ /^(?:\s+\w+:\s+[0-9a-fA-F]+){3,3}/ || - $line =~ /^\s*\#\d+\s*\[[0-9a-fA-F]+\]\s*\w+ at [0-9a-fA-F]+/) { - # stack dump address styles + $line =~ /^\s*\[\<[0-9a-fA-F]{8,}\>\]/)) { + # stack dump address $commit_log_possible_stack_dump = 1; } @@ -2904,17 +2851,6 @@ sub process { } } -# check for invalid commit id - if ($in_commit_log && $line =~ /(^fixes:|\bcommit)\s+([0-9a-f]{6,40})\b/i) { - my $id; - my $description; - ($id, $description) = git_commit_info($2, undef, undef); - if (!defined($id)) { - WARN("UNKNOWN_COMMIT_ID", - "Unknown commit id '$2', maybe rebased or not pulled?\n" . $herecurr); - } - } - # ignore non-hunk lines and lines being removed next if (!$hunk_line || $line =~ /^-/); @@ -3044,7 +2980,7 @@ sub process { my @compats = $rawline =~ /\"([a-zA-Z0-9\-\,\.\+_]+)\"/g; my $dt_path = $root . "/Documentation/devicetree/bindings/"; - my $vp_file = $dt_path . "vendor-prefixes.yaml"; + my $vp_file = $dt_path . "vendor-prefixes.txt"; foreach my $compat (@compats) { my $compat2 = $compat; @@ -3059,7 +2995,7 @@ sub process { next if $compat !~ /^([a-zA-Z0-9\-]+)\,/; my $vendor = $1; - `grep -Eq "\\"\\^\Q$vendor\E,\\.\\*\\":" $vp_file`; + `grep -Eq "^$vendor\\b" $vp_file`; if ( $? >> 8 ) { WARN("UNDOCUMENTED_DT_STRING", "DT compatible string vendor \"$vendor\" appears un-documented -- check $vp_file\n" . $herecurr); @@ -3083,24 +3019,16 @@ sub process { $comment = '..'; } -# check SPDX comment style for .[chsS] files - if ($realfile =~ /\.[chsS]$/ && - $rawline =~ /SPDX-License-Identifier:/ && - $rawline !~ m@^\+\s*\Q$comment\E\s*@) { - WARN("SPDX_LICENSE_TAG", - "Improper SPDX comment style for '$realfile', please use '$comment' instead\n" . $herecurr); - } - if ($comment !~ /^$/ && - $rawline !~ m@^\+\Q$comment\E SPDX-License-Identifier: @) { - WARN("SPDX_LICENSE_TAG", - "Missing or malformed SPDX-License-Identifier tag in line $checklicenseline\n" . $herecurr); + $rawline !~ /^\+\Q$comment\E SPDX-License-Identifier: /) { + WARN("SPDX_LICENSE_TAG", + "Missing or malformed SPDX-License-Identifier tag in line $checklicenseline\n" . $herecurr); } elsif ($rawline =~ /(SPDX-License-Identifier: .*)/) { - my $spdx_license = $1; - if (!is_SPDX_License_valid($spdx_license)) { - WARN("SPDX_LICENSE_TAG", - "'$spdx_license' is not supported in LICENSES/...\n" . $herecurr); - } + my $spdx_license = $1; + if (!is_SPDX_License_valid($spdx_license)) { + WARN("SPDX_LICENSE_TAG", + "'$spdx_license' is not supported in LICENSES/...\n" . $herecurr); + } } } } @@ -3108,14 +3036,6 @@ sub process { # check we are in a valid source file if not then ignore this hunk next if ($realfile !~ /\.(h|c|s|S|sh|dtsi|dts)$/); -# check for using SPDX-License-Identifier on the wrong line number - if ($realline != $checklicenseline && - $rawline =~ /\bSPDX-License-Identifier:/ && - substr($line, @-, @+ - @-) eq "$;" x (@+ - @-)) { - WARN("SPDX_LICENSE_TAG", - "Misplaced SPDX-License-Identifier tag - use line $checklicenseline instead\n" . $herecurr); - } - # line length limit (with some exclusions) # # There are a few types of lines that may extend beyond $max_line_length: @@ -3173,8 +3093,10 @@ sub process { if ($msg_type ne "" && (show_type("LONG_LINE") || show_type($msg_type))) { - WARN($msg_type, - "line over $max_line_length characters\n" . $herecurr); + my $msg_level = \&WARN; + $msg_level = \&CHK if ($file); + &{$msg_level}($msg_type, + "line length of $length exceeds $max_line_length columns\n" . $herecurr); } } @@ -3953,23 +3875,14 @@ sub process { WARN("STATIC_CONST_CHAR_ARRAY", "static const char * array should probably be static const char * const\n" . $herecurr); - } - -# check for initialized const char arrays that should be static const - if ($line =~ /^\+\s*const\s+(char|unsigned\s+char|_*u8|(?:[us]_)?int8_t)\s+\w+\s*\[\s*(?:\w+\s*)?\]\s*=\s*"/) { - if (WARN("STATIC_CONST_CHAR_ARRAY", - "const array should probably be static const\n" . $herecurr) && - $fix) { - $fixed[$fixlinenr] =~ s/(^.\s*)const\b/${1}static const/; - } - } + } # check for static char foo[] = "bar" declarations. if ($line =~ /\bstatic\s+char\s+(\w+)\s*\[\s*\]\s*=\s*"/) { WARN("STATIC_CONST_CHAR_ARRAY", "static char array declaration should probably be static const char\n" . $herecurr); - } + } # check for const const where is not a pointer or array type if ($sline =~ /\bconst\s+($BasicType)\s+const\b/) { @@ -4677,7 +4590,7 @@ sub process { # closing brace should have a space following it when it has anything # on the line - if ($line =~ /}(?!(?:,|;|\)|\}))\S/) { + if ($line =~ /}(?!(?:,|;|\)))\S/) { if (ERROR("SPACING", "space required after that close brace '}'\n" . $herecurr) && $fix) { @@ -5027,6 +4940,17 @@ sub process { while ($line =~ m{($Constant|$Lval)}g) { my $var = $1; +#gcc binary extension + if ($var =~ /^$Binary$/) { + if (WARN("GCC_BINARY_CONSTANT", + "Avoid gcc v4.3+ binary constant extension: <$var>\n" . $herecurr) && + $fix) { + my $hexval = sprintf("0x%x", oct($var)); + $fixed[$fixlinenr] =~ + s/\b$var\b/$hexval/; + } + } + #CamelCase if ($var !~ /^$Constant$/ && $var =~ /[A-Z][a-z]|[a-z][A-Z]/ && @@ -5208,7 +5132,7 @@ sub process { next if ($arg =~ /\.\.\./); next if ($arg =~ /^type$/i); my $tmp_stmt = $define_stmt; - $tmp_stmt =~ s/\b(sizeof|typeof|__typeof__|__builtin\w+|typecheck\s*\(\s*$Type\s*,|\#+)\s*\(*\s*$arg\s*\)*\b//g; + $tmp_stmt =~ s/\b(typeof|__typeof__|__builtin\w+|typecheck\s*\(\s*$Type\s*,|\#+)\s*\(*\s*$arg\s*\)*\b//g; $tmp_stmt =~ s/\#+\s*$arg\b//g; $tmp_stmt =~ s/\b$arg\s*\#\#//g; my $use_cnt = () = $tmp_stmt =~ /\b$arg\b/g; @@ -5607,8 +5531,7 @@ sub process { my ($s, $c) = ctx_statement_block($linenr - 3, $realcnt, 0); # print("line: <$line>\nprevline: <$prevline>\ns: <$s>\nc: <$c>\n\n\n"); - if ($s =~ /(?:^|\n)[ \+]\s*(?:$Type\s*)?\Q$testval\E\s*=\s*(?:\([^\)]*\)\s*)?\s*$allocFunctions\s*\(/ && - $s !~ /\b__GFP_NOWARN\b/ ) { + if ($s =~ /(?:^|\n)[ \+]\s*(?:$Type\s*)?\Q$testval\E\s*=\s*(?:\([^\)]*\)\s*)?\s*(?:devm_)?(?:[kv][czm]alloc(?:_node|_array)?\b|kstrdup|kmemdup|(?:dev_)?alloc_skb)/) { WARN("OOM_MESSAGE", "Possible unnecessary 'out of memory' message\n" . $hereprev); } @@ -5729,7 +5652,7 @@ sub process { # ignore udelay's < 10, however if (! ($delay < 10) ) { CHK("USLEEP_RANGE", - "usleep_range is preferred over udelay; see Documentation/timers/timers-howto.rst\n" . $herecurr); + "usleep_range is preferred over udelay; see Documentation/timers/timers-howto.txt\n" . $herecurr); } if ($delay > 2000) { WARN("LONG_UDELAY", @@ -5741,7 +5664,7 @@ sub process { if ($line =~ /\bmsleep\s*\((\d+)\);/) { if ($1 < 20) { WARN("MSLEEP", - "msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.rst\n" . $herecurr); + "msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt\n" . $herecurr); } } @@ -5890,18 +5813,6 @@ sub process { "__aligned(size) is preferred over __attribute__((aligned(size)))\n" . $herecurr); } -# Check for __attribute__ section, prefer __section - if ($realfile !~ m@\binclude/uapi/@ && - $line =~ /\b__attribute__\s*\(\s*\(.*_*section_*\s*\(\s*("[^"]*")/) { - my $old = substr($rawline, $-[1], $+[1] - $-[1]); - my $new = substr($old, 1, -1); - if (WARN("PREFER_SECTION", - "__section($new) is preferred over __attribute__((section($old)))\n" . $herecurr) && - $fix) { - $fixed[$fixlinenr] =~ s/\b__attribute__\s*\(\s*\(\s*_*section_*\s*\(\s*\Q$old\E\s*\)\s*\)\s*\)/__section($new)/; - } - } - # Check for __attribute__ format(printf, prefer __printf if ($realfile !~ m@\binclude/uapi/@ && $line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf/) { @@ -6024,7 +5935,7 @@ sub process { while ($fmt =~ /(\%[\*\d\.]*p(\w))/g) { $specifier = $1; $extension = $2; - if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxt]/) { + if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOx]/) { $bad_specifier = $specifier; last; } @@ -6144,11 +6055,11 @@ sub process { my $max = $7; if ($min eq $max) { WARN("USLEEP_RANGE", - "usleep_range should not use min == max args; see Documentation/timers/timers-howto.rst\n" . "$here\n$stat\n"); + "usleep_range should not use min == max args; see Documentation/timers/timers-howto.txt\n" . "$here\n$stat\n"); } elsif ($min =~ /^\d+$/ && $max =~ /^\d+$/ && $min > $max) { WARN("USLEEP_RANGE", - "usleep_range args reversed, use min then max; see Documentation/timers/timers-howto.rst\n" . "$here\n$stat\n"); + "usleep_range args reversed, use min then max; see Documentation/timers/timers-howto.txt\n" . "$here\n$stat\n"); } } @@ -6271,8 +6182,8 @@ sub process { } } -# check for pointless casting of alloc functions - if ($line =~ /\*\s*\)\s*$allocFunctions\b/) { +# check for pointless casting of kmalloc return + if ($line =~ /\*\s*\)\s*[kv][czm]alloc(_node){0,1}\b/) { WARN("UNNECESSARY_CASTS", "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr); } @@ -6280,7 +6191,7 @@ sub process { # alloc style # p = alloc(sizeof(struct foo), ...) should be p = alloc(sizeof(*p), ...) if ($perl_version_ok && - $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k|v)[mz]alloc(?:_node)?)\s*\(\s*(sizeof\s*\(\s*struct\s+$Lval\s*\))/) { + $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*([kv][mz]alloc(?:_node)?)\s*\(\s*(sizeof\s*\(\s*struct\s+$Lval\s*\))/) { CHK("ALLOC_SIZEOF_STRUCT", "Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr); } @@ -6443,6 +6354,19 @@ sub process { } } +# check for bool bitfields + if ($sline =~ /^.\s+bool\s*$Ident\s*:\s*\d+\s*;/) { + WARN("BOOL_BITFIELD", + "Avoid using bool as bitfield. Prefer bool bitfields as unsigned int or u<8|16|32>\n" . $herecurr); + } + +# check for bool use in .h files + if ($realfile =~ /\.h$/ && + $sline =~ /^.\s+bool\s*$Ident\s*(?::\s*d+\s*)?;/) { + CHK("BOOL_MEMBER", + "Avoid using bool structure members because of possible alignment issues - see: https://lkml.org/lkml/2017/11/21/384\n" . $herecurr); + } + # check for semaphores initialized locked if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) { WARN("CONSIDER_COMPLETION", @@ -6461,20 +6385,6 @@ sub process { "please use device_initcall() or more appropriate function instead of __initcall() (see include/linux/init.h)\n" . $herecurr); } -# check for spin_is_locked(), suggest lockdep instead - if ($line =~ /\bspin_is_locked\(/) { - WARN("USE_LOCKDEP", - "Where possible, use lockdep_assert_held instead of assertions based on spin_is_locked\n" . $herecurr); - } - -# check for deprecated apis - if ($line =~ /\b($deprecated_apis_search)\b\s*\(/) { - my $deprecated_api = $1; - my $new_api = $deprecated_apis{$deprecated_api}; - WARN("DEPRECATED_API", - "Deprecated use of '$deprecated_api', prefer '$new_api' instead\n" . $herecurr); - } - # check for various structs that are normally const (ops, kgdb, device_tree) # and avoid what seem like struct definitions 'struct foo {' if ($line !~ /\bconst\b/ && @@ -6509,12 +6419,6 @@ sub process { "Using $1 should generally have parentheses around the comparison\n" . $herecurr); } -# nested likely/unlikely calls - if ($line =~ /\b(?:(?:un)?likely)\s*\(\s*!?\s*(IS_ERR(?:_OR_NULL|_VALUE)?|WARN)/) { - WARN("LIKELY_MISUSE", - "nested (un)?likely() calls, $1 already uses unlikely() internally\n" . $herecurr); - } - # whine mightly about in_atomic if ($line =~ /\bin_atomic\s*\(/) { if ($realfile =~ m@^drivers/@) { @@ -6674,12 +6578,6 @@ sub process { "unknown module license " . $extracted_string . "\n" . $herecurr); } } - -# check for sysctl duplicate constants - if ($line =~ /\.extra[12]\s*=\s*&(zero|one|int_max)\b/) { - WARN("DUPLICATED_SYSCTL_CONST", - "duplicated sysctl range checking value '$1', consider using the shared one in include/linux/sysctl.h\n" . $herecurr); - } } # If we have no input at all, then there is nothing to report on From b77df5980c3e24e34e0db3a52c5bce396a81c430 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2020 16:32:36 -0600 Subject: [PATCH 12/17] checkpatch.pl: Add a U-Boot option Add an option to indicate that U-Boot-specific checks should be enabled. Add a function to house the code that will be added. Signed-off-by: Simon Glass --- .checkpatch.conf | 3 +++ scripts/checkpatch.pl | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/.checkpatch.conf b/.checkpatch.conf index 95f19635d3..ed0c2150ba 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -28,3 +28,6 @@ # A bit shorter of a description is OK with us. --min-conf-desc-length=2 + +# Extra checks for U-Boot +--u-boot diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index bc51fffb77..b8b057ce56 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -60,6 +60,7 @@ my $codespell = 0; my $codespellfile = "/usr/share/codespell/dictionary.txt"; my $conststructsfile = "$D/const_structs.checkpatch"; my $typedefsfile = ""; +my $u_boot = 0; my $color = "auto"; my $allow_c99_comments = 1; @@ -123,6 +124,7 @@ Options: --typedefsfile Read additional types from this file --color[=WHEN] Use colors 'always', 'never', or only when output is a terminal ('auto'). Default is 'auto'. + --u-boot Run additional checks for U-Boot -h, --help, --version display this help and exit When FILE is - read standard input. @@ -227,6 +229,7 @@ GetOptions( 'codespell!' => \$codespell, 'codespellfile=s' => \$codespellfile, 'typedefsfile=s' => \$typedefsfile, + 'u-boot' => \$u_boot, 'color=s' => \$color, 'no-color' => \$color, #keep old behaviors of -nocolor 'nocolor' => \$color, #keep old behaviors of -nocolor @@ -2237,6 +2240,11 @@ sub pos_last_openparen { return length(expand_tabs(substr($line, 0, $last_openparen))) + 1; } +# Checks specific to U-Boot +sub u_boot_line { + my ($realfile, $line, $herecurr) = @_; +} + sub process { my $filename = shift; @@ -3106,6 +3114,10 @@ sub process { "adding a line without newline at end of file\n" . $herecurr); } + if ($u_boot) { + u_boot_line($realfile, $line, $herecurr); + } + # check we are in a valid source file C or perl if not then ignore this hunk next if ($realfile !~ /\.(h|c|pl|dtsi|dts)$/); From 281236c728be2b26474fe4bfa0e53cc4c5782617 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2020 16:32:37 -0600 Subject: [PATCH 13/17] checkpatch.pl: Add a check for tests needed for uclasses A common problem when submitting a new uclass is to forget to add sandbox tests. Add a warning for this. Of course tests should always be added for new code, but this one seems to be missed by nearly every new contributor. Signed-off-by: Simon Glass --- scripts/checkpatch.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index b8b057ce56..1053d29ce9 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2243,6 +2243,12 @@ sub pos_last_openparen { # Checks specific to U-Boot sub u_boot_line { my ($realfile, $line, $herecurr) = @_; + + # ask for a test if a new uclass ID is added + if ($realfile =~ /uclass-id.h/ && $line =~ /^\+/) { + WARN("NEW_UCLASS", + "Possible new uclass - make sure to add a sandbox driver, plus a test in test/dm/.c\n" . $herecurr); + } } sub process { From 7fc7d241169d26ec79a86bfcab0e966c778defe7 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2020 16:32:38 -0600 Subject: [PATCH 14/17] checkpatch.pl: Warn if the flattree API is used We want people to use the livetree API, so request it. Signed-off-by: Simon Glass --- scripts/checkpatch.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 1053d29ce9..2654f9e5f7 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2249,6 +2249,12 @@ sub u_boot_line { WARN("NEW_UCLASS", "Possible new uclass - make sure to add a sandbox driver, plus a test in test/dm/.c\n" . $herecurr); } + + # try to get people to use the livetree API + if ($line =~ /^\+.*fdtdec_/) { + WARN("LIVETREE", + "Use the livetree API (dev_read_...)\n" . $herecurr); + } } sub process { From 58978114d93d5010d15c8be792f9e444da5fb250 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2020 16:32:39 -0600 Subject: [PATCH 15/17] checkpatch.pl: Request a test when a new command is added This request is made with nearly every new command. Point to some docs on how to do it. Signed-off-by: Simon Glass --- doc/README.commands | 50 +++++++++++++++++++++++++++++++++++++++++++ scripts/checkpatch.pl | 6 ++++++ 2 files changed, 56 insertions(+) diff --git a/doc/README.commands b/doc/README.commands index 716ad227aa..229f86d8fb 100644 --- a/doc/README.commands +++ b/doc/README.commands @@ -134,3 +134,53 @@ by writing in u-boot.lds ($(srctree)/board/boardname/u-boot.lds) these .u_boot_list : { KEEP(*(SORT(.u_boot_list*))); } + +Writing tests +------------- + +All new commands should have tests. Tests for existing commands are very +welcome. + +It is fairly easy to write a test for a command. Enable it in sandbox, and +then add code that runs the command and checks the output. + +Here is an example: + +/* Test 'acpi items' command */ +static int dm_test_acpi_cmd_items(struct unit_test_state *uts) +{ + struct acpi_ctx ctx; + void *buf; + + buf = malloc(BUF_SIZE); + ut_assertnonnull(buf); + + ctx.current = buf; + ut_assertok(acpi_fill_ssdt(&ctx)); + console_record_reset(); + run_command("acpi items", 0); + ut_assert_nextline("dev 'acpi-test', type 1, size 2"); + ut_assert_nextline("dev 'acpi-test2', type 1, size 2"); + ut_assert_console_end(); + + ctx.current = buf; + ut_assertok(acpi_inject_dsdt(&ctx)); + console_record_reset(); + run_command("acpi items", 0); + ut_assert_nextline("dev 'acpi-test', type 2, size 2"); + ut_assert_nextline("dev 'acpi-test2', type 2, size 2"); + ut_assert_console_end(); + + console_record_reset(); + run_command("acpi items -d", 0); + ut_assert_nextline("dev 'acpi-test', type 2, size 2"); + ut_assert_nextlines_are_dump(2); + ut_assert_nextline("%s", ""); + ut_assert_nextline("dev 'acpi-test2', type 2, size 2"); + ut_assert_nextlines_are_dump(2); + ut_assert_nextline("%s", ""); + ut_assert_console_end(); + + return 0; +} +DM_TEST(dm_test_acpi_cmd_items, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 2654f9e5f7..cf620c8614 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2255,6 +2255,12 @@ sub u_boot_line { WARN("LIVETREE", "Use the livetree API (dev_read_...)\n" . $herecurr); } + + # add tests for new commands + if ($line =~ /^\+.*do_($Ident)\(struct cmd_tbl.*/) { + WARN("CMD_TEST", + "Possible new command - make sure you add a test\n" . $herecurr); + } } sub process { From dd5b0fad8f295c6e786f1528d09f03fa546289cd Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2020 16:32:40 -0600 Subject: [PATCH 16/17] checkpatch.pl: Request if() instead #ifdef There is a lot of use of #ifdefs in U-Boot. In an effort reduce this, suggest using the compile-time construct. Signed-off-by: Simon Glass --- scripts/checkpatch.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index cf620c8614..17d41825c5 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2261,6 +2261,12 @@ sub u_boot_line { WARN("CMD_TEST", "Possible new command - make sure you add a test\n" . $herecurr); } + + # use if instead of #if + if ($line =~ /^\+#if.*CONFIG.*/) { + WARN("PREFER_IF", + "Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible\n" . $herecurr); + } } sub process { From f3e2ebede3019740ee90471acc0a29a684b59221 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 14:29:02 -0400 Subject: [PATCH 17/17] checkpatch.pl: Add check for defining CONFIG_CMD_xxx via config files All of our cmds have a Kconfig entry. Making enabling a CMD via the config file an error to checkpatch.pl. Signed-off-by: Tom Rini --- scripts/checkpatch.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 17d41825c5..edba365651 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2267,6 +2267,12 @@ sub u_boot_line { WARN("PREFER_IF", "Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible\n" . $herecurr); } + + # use defconfig to manage CONFIG_CMD options + if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_CMD\w*)\b/) { + ERROR("DEFINE_CONFIG_CMD", + "All commands are managed by Kconfig\n" . $herecurr); + } } sub process {