diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-05 15:38:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-05 15:38:46 -0400 |
| commit | 52207514ba419a69a8105d16997b025f966c8879 (patch) | |
| tree | 910be34154c25de5cb431cecfd87836ff50b2c5d | |
| parent | 2a5ad542e6c238ff5c0b490b49354e780ab46d71 (diff) | |
| parent | ce5bae5ccd3809366a3ffb4d8b2046e8f2f6f0f1 (diff) | |
Merge branch '2021-11-05-Kconfig-syncs'
- An assortment of changes to finish migration of a number of symbols,
and move YAFFS2 related options that we enable to Kconfig as well.
234 files changed, 167 insertions, 295 deletions
@@ -673,13 +673,6 @@ The following options need to be configured: U-Boot needs to get its device tree from somewhere. This can be done using one of the three options below: - CONFIG_OF_EMBED - If this variable is defined, U-Boot will embed a device tree - binary in its image. This device tree file should be in the - board directory and called <soc>-<board>.dts. The binary file - is then picked up in board_init_f() and made available through - the global data structure as gd->fdt_blob. - CONFIG_OF_SEPARATE If this variable is defined, U-Boot will build a device tree binary. It will be called u-boot.dtb. Architecture-specific @@ -1948,9 +1941,6 @@ The following options need to be configured: CONFIG_SPL Enable building of SPL globally. - CONFIG_SPL_LDSCRIPT - LDSCRIPT for linking the SPL binary. - CONFIG_SPL_MAX_FOOTPRINT Maximum size in memory allocated to the SPL, BSS included. When defined, the linker checks that the actual memory @@ -2005,10 +1995,6 @@ The following options need to be configured: CONFIG_SYS_SPL_MALLOC_SIZE The size of the malloc pool used in SPL. - CONFIG_SPL_OS_BOOT - Enable booting directly to an OS from SPL. - See also: doc/README.falcon - CONFIG_SPL_DISPLAY_PRINT For ARM, enable an optional function to print more information about the running system. diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h index f1d5667c32b..5b12d90d585 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h @@ -36,7 +36,6 @@ struct gpt_regs *const gpt1_regs_ptr = #define GPT_FREE_RUNNING 0xFFFF /* Timer, HZ specific defines */ -#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ_CLOCK ((27 * 1000 * 1000) / GPT_PRESCALER_128) #endif diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 4f9b84ba344..b13897495da 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -50,7 +50,7 @@ void __weak board_init_f(ulong dummy) * This function jumps to an image with argument. Normally an FDT or ATAGS * image. */ -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) #ifdef CONFIG_ARM64 void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) { diff --git a/common/spl/spl.c b/common/spl/spl.c index 99cde6609cf..4c101ec5d34 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -87,7 +87,7 @@ __weak int dram_init_banksize(void) * 0 to not start u-boot * positive if u-boot should start */ -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) __weak int spl_start_uboot(void) { puts(SPL_TPL_PROMPT @@ -353,7 +353,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, panic("** no mkimage signature but raw image not supported"); #endif -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) ulong start, end; if (!bootz_setup((ulong)header, &start, &end)) { @@ -797,7 +797,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_invoke_opensbi(&spl_image); break; #endif -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) case IH_OS_LINUX: debug("Jumping to Linux\n"); #if defined(CONFIG_SYS_SPL_ARGS_ADDR) diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index d73f0627621..6a28fe9bdb5 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -64,7 +64,7 @@ end: return err < 0; } -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) int spl_load_image_ext_os(struct spl_image_info *spl_image, struct blk_desc *block_dev, int partition) { diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index c2eb097365f..576c2e876ad 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -112,7 +112,7 @@ end: return (err <= 0); } -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) int spl_load_image_fat_os(struct spl_image_info *spl_image, struct blk_desc *block_dev, int partition) { diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index d52f8a3eefe..e1a7d25bd05 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -218,7 +218,7 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image, } #endif -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) static int mmc_load_image_raw_os(struct spl_image_info *spl_image, struct mmc *mmc) { diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 59f4a84a36a..8ae7d04fa63 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -121,7 +121,7 @@ static int spl_nand_load_image(struct spl_image_info *spl_image, header = spl_get_load_buffer(0, sizeof(*header)); -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (!spl_start_uboot()) { /* * load parameter image diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 5270401db03..68c12413fa6 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -35,7 +35,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, */ spl_image->flags |= SPL_COPY_PAYLOAD_ONLY; -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (!spl_start_uboot()) { /* * Load Linux from its location in NOR flash to its defined diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 535a9219efa..e9f6c5f050b 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -88,7 +88,7 @@ static int spl_sata_load_image(struct spl_image_info *spl_image, return -ENODEV; } -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (spl_start_uboot() || spl_load_image_fat_os(spl_image, stor_dev, CONFIG_SYS_SATA_FAT_BOOT_PARTITION)) diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 46ee4058e76..4e20a23dea0 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -18,7 +18,7 @@ #include <asm/global_data.h> #include <dm/ofnode.h> -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) /* * Load the kernel, check for a valid header we can parse, and if found load * the kernel and then device tree. @@ -107,7 +107,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, payload_offs); } -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) #endif { diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c index de6a63bd2d4..2f2d74a02de 100644 --- a/common/spl/spl_ubi.c +++ b/common/spl/spl_ubi.c @@ -45,7 +45,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image, info.leb_start = CONFIG_SPL_UBI_LEB_START; info.peb_count = CONFIG_SPL_UBI_MAX_PEBS - info.peb_offset; -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (!spl_start_uboot()) { volumes[0].vol_id = CONFIG_SPL_UBI_LOAD_KERNEL_ID; volumes[0].load_addr = (void *)CONFIG_SYS_LOAD_ADDR; diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 3648de34927..67d503026ca 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -47,7 +47,7 @@ int spl_usb_load(struct spl_image_info *spl_image, debug("boot mode - FAT\n"); -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (spl_start_uboot() || spl_load_image_fat_os(spl_image, stor_dev, partition)) #endif diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c index 8ce0a09ef3f..ba4af38a3ec 100644 --- a/common/spl/spl_xip.c +++ b/common/spl/spl_xip.c @@ -12,7 +12,7 @@ static int spl_xip(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (!spl_start_uboot()) { spl_image->arg = (void *)CONFIG_SYS_FDT_BASE; spl_image->name = "Linux"; diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig index 68cfa2bb81a..cc307ce43b2 100644 --- a/configs/M5208EVBE_defconfig +++ b/configs/M5208EVBE_defconfig @@ -31,3 +31,4 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig index a996c28b1f1..abac898723c 100644 --- a/configs/M5235EVB_Flash32_defconfig +++ b/configs/M5235EVB_Flash32_defconfig @@ -36,3 +36,4 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig index de045cb7f84..8a12e4bd207 100644 --- a/configs/M5235EVB_defconfig +++ b/configs/M5235EVB_defconfig @@ -36,3 +36,4 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig index d2ac18eec74..77eedd63ffd 100644 --- a/configs/M5249EVB_defconfig +++ b/configs/M5249EVB_defconfig @@ -23,3 +23,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y +CONFIG_MCFUART=y diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig index e8dca52ce77..423e2f75acf 100644 --- a/configs/M5253DEMO_defconfig +++ b/configs/M5253DEMO_defconfig @@ -26,3 +26,4 @@ CONFIG_SYS_FSL_I2C_OFFSET=0x280 CONFIG_SYS_I2C_SLAVE=0x7F CONFIG_SYS_I2C_SPEED=80000 CONFIG_MTD_NOR_FLASH=y +CONFIG_MCFUART=y diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig index 9d86329abc3..3d32a6f13e9 100644 --- a/configs/M5272C3_defconfig +++ b/configs/M5272C3_defconfig @@ -27,3 +27,4 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig index 3ad22c33fda..aed36ce2a84 100644 --- a/configs/M5275EVB_defconfig +++ b/configs/M5275EVB_defconfig @@ -33,3 +33,4 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig index 444e0a49495..0d17cf566d0 100644 --- a/configs/M5282EVB_defconfig +++ b/configs/M5282EVB_defconfig @@ -27,3 +27,4 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig index d8f78b02f3d..1cd48d6c4ae 100644 --- a/configs/M53017EVB_defconfig +++ b/configs/M53017EVB_defconfig @@ -34,3 +34,4 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig index c992caa07dd..8a7a2d64f54 100644 --- a/configs/M5329AFEE_defconfig +++ b/configs/M5329AFEE_defconfig @@ -36,3 +36,4 @@ CONFIG_MTD_RAW_NAND=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig index ba16ba6b7b4..f40e86ff222 100644 --- a/configs/M5329BFEE_defconfig +++ b/configs/M5329BFEE_defconfig @@ -36,3 +36,4 @@ CONFIG_MTD_RAW_NAND=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig index dbb99a1d207..8e61b72887d 100644 --- a/configs/M5373EVB_defconfig +++ b/configs/M5373EVB_defconfig @@ -36,3 +36,4 @@ CONFIG_MTD_RAW_NAND=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig index 727cceffb64..84e0c64f13b 100644 --- a/configs/P1010RDB-PA_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig @@ -69,7 +69,6 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x4000 CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig index 3d79da4ab93..adf39899564 100644 --- a/configs/P1010RDB-PA_NAND_defconfig +++ b/configs/P1010RDB-PA_NAND_defconfig @@ -68,7 +68,6 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x4000 CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig index a22d14b966d..c8e7847e3f5 100644 --- a/configs/P1010RDB-PB_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig @@ -71,7 +71,6 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig index 2c6cd269f90..56c05c36ace 100644 --- a/configs/P1010RDB-PB_NAND_defconfig +++ b/configs/P1010RDB-PB_NAND_defconfig @@ -70,7 +70,6 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig index 4a9fc5c35c0..f1d7b6ba9d0 100644 --- a/configs/T1024RDB_NAND_defconfig +++ b/configs/T1024RDB_NAND_defconfig @@ -81,7 +81,6 @@ CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig index ce9c6b805b1..962a3f452d0 100644 --- a/configs/T1042D4RDB_NAND_defconfig +++ b/configs/T1042D4RDB_NAND_defconfig @@ -75,7 +75,6 @@ CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig index e4cbcf222bb..695b047a35c 100644 --- a/configs/T2080QDS_NAND_defconfig +++ b/configs/T2080QDS_NAND_defconfig @@ -73,7 +73,6 @@ CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x20000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig index 7ebe8e3b59e..f19df03cd43 100644 --- a/configs/T2080RDB_NAND_defconfig +++ b/configs/T2080RDB_NAND_defconfig @@ -79,7 +79,6 @@ CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig index b56314bd013..ae1b4ed89bb 100644 --- a/configs/T2080RDB_revD_NAND_defconfig +++ b/configs/T2080RDB_revD_NAND_defconfig @@ -80,7 +80,6 @@ CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=10000000 diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig index 21837123d4d..3fa00fb4cc4 100644 --- a/configs/adp-ae3xx_defconfig +++ b/configs/adp-ae3xx_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig index 3b2c5ea3b8a..cc6541b1e3b 100644 --- a/configs/adp-ag101p_defconfig +++ b/configs/adp-ag101p_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x80140000 diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig index ea4032fe1ff..9d9d6283e05 100644 --- a/configs/am335x_guardian_defconfig +++ b/configs/am335x_guardian_defconfig @@ -122,6 +122,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 CONFIG_USB_ETHER=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_AM335X_LCD=y +CONFIG_BMP_16BPP=y CONFIG_SPL_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_SPL_OF_LIBFDT=y diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index 095386f188b..1170dd33cba 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -29,3 +29,4 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y +CONFIG_MCFUART=y diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index 9eecf528f6a..45e0670da1a 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -17,6 +17,7 @@ CONFIG_FIT=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_CPU=y # CONFIG_BOOTM_NETBSD is not set @@ -46,6 +47,7 @@ CONFIG_MXC_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_IMX_LPI2C=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y diff --git a/configs/apalis-imx8x_defconfig b/configs/apalis-imx8x_defconfig index d197ad96a0d..2cd91e14fc8 100644 --- a/configs/apalis-imx8x_defconfig +++ b/configs/apalis-imx8x_defconfig @@ -53,6 +53,7 @@ CONFIG_SYS_I2C_IMX_LPI2C=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index 0878e7d681e..39910c5053f 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -37,3 +37,4 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y +CONFIG_MCFUART=y diff --git a/configs/bcm_ns3_defconfig b/configs/bcm_ns3_defconfig index 6b7f42fe1c2..13054345df7 100644 --- a/configs/bcm_ns3_defconfig +++ b/configs/bcm_ns3_defconfig @@ -36,6 +36,7 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_CLK=y CONFIG_CLK_CCF=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_IPROC=y diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig index 41369394888..3d1c438e8ba 100644 --- a/configs/cgtqmx8_defconfig +++ b/configs/cgtqmx8_defconfig @@ -23,6 +23,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_BOOTDELAY=3 CONFIG_LOG=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SEPARATE_BSS=y CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=0 @@ -58,6 +59,7 @@ CONFIG_SYS_I2C_IMX_LPI2C=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index bb96afc6ff1..faad4870408 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -80,6 +80,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_POWER_LEGACY=y CONFIG_DM_REGULATOR=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index bcab3d68750..b823a150dc0 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -93,6 +93,7 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig index 9ab6de05c17..7ae7ff3432f 100644 --- a/configs/cobra5272_defconfig +++ b/configs/cobra5272_defconfig @@ -23,3 +23,4 @@ CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y CONFIG_BAUDRATE=19200 +CONFIG_MCFUART=y diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 14a892bac5c..22bed95324a 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_FIT=y CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_CPU=y # CONFIG_BOOTM_NETBSD is not set @@ -44,6 +45,7 @@ CONFIG_MXC_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_IMX_LPI2C=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 4c8a5f31fc7..13f093f3eff 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -5,6 +5,8 @@ CONFIG_ARCH_MVEBU=y CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_GPIO=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_CONTROLCENTERDC=y CONFIG_ENV_SIZE=0x10000 @@ -30,6 +32,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_LATE_INIT=y CONFIG_LAST_STAGE_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_I2C=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_ELF is not set # CONFIG_CMD_GO is not set diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig index 9bbfcf284d0..5b372e12b6e 100644 --- a/configs/eb_cpu5282_defconfig +++ b/configs/eb_cpu5282_defconfig @@ -36,5 +36,6 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y CONFIG_SPLASH_SCREEN=y CONFIG_VIDEO_VCXK=y diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig index abc87ecc657..ad0f6f821b9 100644 --- a/configs/eb_cpu5282_internal_defconfig +++ b/configs/eb_cpu5282_internal_defconfig @@ -35,5 +35,6 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y +CONFIG_MCFUART=y CONFIG_SPLASH_SCREEN=y CONFIG_VIDEO_VCXK=y diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index 0b994e0cfa2..3076dced10b 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -23,6 +23,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_BOOTDELAY=3 CONFIG_SPL_DMA=y +CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl> " diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index a86aee2dff8..71759d81a31 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -11,6 +11,7 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6DL_MAMOJ=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj" CONFIG_SPL_TEXT_BASE=0x00908000 +CONFIG_SPL_DRIVERS_MISC=y CONFIG_IMX_HAB=y # CONFIG_CMD_BMODE is not set CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig index 67b1b181284..439917bf243 100644 --- a/configs/imx6q_icore_nand_defconfig +++ b/configs/imx6q_icore_nand_defconfig @@ -24,6 +24,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 CONFIG_SPL_DMA=y +CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl> " diff --git a/configs/imx6qdl_icore_mipi_defconfig b/configs/imx6qdl_icore_mipi_defconfig index 681843ee5b4..42128c515aa 100644 --- a/configs/imx6qdl_icore_mipi_defconfig +++ b/configs/imx6qdl_icore_mipi_defconfig @@ -14,6 +14,7 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-mipi" CONFIG_SPL_TEXT_BASE=0x00908000 +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0x021f0000 @@ -29,6 +30,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 +CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 34bb85f0eac..61d8a7b2e63 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -14,6 +14,7 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_SPL_TEXT_BASE=0x00908000 +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_ADDR=0x020D8024 @@ -32,6 +33,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 +CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index 67b1b181284..439917bf243 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -24,6 +24,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 CONFIG_SPL_DMA=y +CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl> " diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index b0b057c0025..697644b4cb6 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -14,6 +14,7 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs" CONFIG_SPL_TEXT_BASE=0x00908000 +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y @@ -26,6 +27,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 +CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index 21fa8a3791a..27cfa7ff302 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -14,6 +14,7 @@ CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" CONFIG_SPL_TEXT_BASE=0x00908000 +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y @@ -24,6 +25,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 +CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="geam6ul> " diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index 94952c8f041..3863b8a88f6 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -24,6 +24,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 CONFIG_SPL_DMA=y +CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="geam6ul> " diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig index 944ceafd50e..256d7329bb4 100644 --- a/configs/imx6ul_isiot_emmc_defconfig +++ b/configs/imx6ul_isiot_emmc_defconfig @@ -14,6 +14,7 @@ CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-emmc" CONFIG_SPL_TEXT_BASE=0x00908000 +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y @@ -24,6 +25,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 +CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="isiotmx6ul> " diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index 6173e2078b8..f1c97e57bd1 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -24,6 +24,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 CONFIG_SPL_DMA=y +CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="isiotmx6ul> " diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 6f386529462..b0af4122dfe 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -2,6 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x600000 +CONFIG_SPL_GPIO=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x400000 CONFIG_SYS_I2C_MXC_I2C1=y @@ -11,7 +14,9 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-evk" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MQ_EVK=y +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x40480000 @@ -22,6 +27,9 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_I2C=y +CONFIG_SPL_POWER=y +CONFIG_SPL_WATCHDOG=y # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set @@ -48,6 +56,7 @@ CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_PHY=y CONFIG_PHY_IMX8MQ_USB=y CONFIG_PINCTRL=y diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig index e1b60f76877..3de517c0865 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -3,6 +3,9 @@ CONFIG_ARCH_IMX8M=y CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x600000 CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_SPL_GPIO=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x400000 CONFIG_SYS_I2C_MXC_I2C1=y @@ -12,7 +15,9 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-phanbell" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MQ_PHANBELL=y +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x40480000 CONFIG_FIT=y @@ -22,6 +27,8 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_SD_BOOT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_I2C=y +CONFIG_SPL_POWER=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_EXPORTENV is not set @@ -52,6 +59,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_SPL_POWER_LEGACY=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index f5b676088aa..bf330ab22bc 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -62,6 +62,7 @@ CONFIG_SYS_I2C_IMX_LPI2C=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index 95bc8b8adde..e944e69f25f 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -59,6 +59,7 @@ CONFIG_SYS_I2C_IMX_LPI2C=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_ESDHC_IMX=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y diff --git a/configs/imx8ulp_evk_defconfig b/configs/imx8ulp_evk_defconfig index 12c0e5eb6a5..b8f18c0a06d 100644 --- a/configs/imx8ulp_evk_defconfig +++ b/configs/imx8ulp_evk_defconfig @@ -25,6 +25,8 @@ CONFIG_FIT_VERBOSE=y CONFIG_BOOTDELAY=0 CONFIG_BOOTCOMMAND="run distro_bootcmd;run bsp_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx8ulp-evk" +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y CONFIG_SPL_SEPARATE_BSS=y diff --git a/configs/liteboard_defconfig b/configs/liteboard_defconfig index 0381e644d73..ab62c20255b 100644 --- a/configs/liteboard_defconfig +++ b/configs/liteboard_defconfig @@ -50,6 +50,7 @@ CONFIG_MTD=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig index c8dde551ea1..8456e98e8ea 100644 --- a/configs/ls1021aiot_sdcard_defconfig +++ b/configs/ls1021aiot_sdcard_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AIOT=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1002000 +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 @@ -11,6 +13,7 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" CONFIG_SPL_TEXT_BASE=0x10000000 +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_AHCI=y @@ -25,7 +28,10 @@ CONFIG_ID_EEPROM=y 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_SPL_ENV_SUPPORT=y +CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y +CONFIG_SPL_WATCHDOG=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2 diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig index 083c651c8ac..d6b36e61bce 100644 --- a/configs/ls1021aqds_nand_defconfig +++ b/configs/ls1021aqds_nand_defconfig @@ -87,7 +87,6 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x20000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x1c000 diff --git a/configs/ls1043aqds_nand_defconfig b/configs/ls1043aqds_nand_defconfig index 8d0f7025243..54174f32eda 100644 --- a/configs/ls1043aqds_nand_defconfig +++ b/configs/ls1043aqds_nand_defconfig @@ -80,7 +80,6 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x20000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000 diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig index 651eca604d6..8624e7e8744 100644 --- a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig @@ -62,7 +62,6 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x20000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000 diff --git a/configs/ls1043ardb_nand_defconfig b/configs/ls1043ardb_nand_defconfig index 293ecdffc60..3c875fe622e 100644 --- a/configs/ls1043ardb_nand_defconfig +++ b/configs/ls1043ardb_nand_defconfig @@ -70,7 +70,6 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x20000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000 diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig index 0f640de7b97..58a8a91d2b7 100644 --- a/configs/ls1046aqds_nand_defconfig +++ b/configs/ls1046aqds_nand_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046AQDS=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff @@ -17,6 +19,7 @@ CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_FSL_USE_PCA9547_MUX=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y @@ -35,7 +38,11 @@ CONFIG_SPL_FSL_PBL=y CONFIG_SPL_BOARD_INIT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110 +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_WATCHDOG=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_IMLS=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 36e2633b048..b902d3195bb 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -62,7 +62,6 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x20000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x40000 diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index 7799e64e197..1e94c861e15 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -64,7 +64,6 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 CONFIG_SYS_NAND_ONFI_DETECTION=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x100000 diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 4492b91fa87..193c63e5fbd 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -90,6 +90,7 @@ CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_ETH_PHY=y +CONFIG_FEC_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX5=y CONFIG_DM_REGULATOR=y diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index b6b044e020c..179a945fe3b 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig index 51ea533412c..5ff3f237274 100644 --- a/configs/mccmon6_sd_defconfig +++ b/configs/mccmon6_sd_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig index 4615be17931..bb4e58fe811 100644 --- a/configs/mt7622_rfb_defconfig +++ b/configs/mt7622_rfb_defconfig @@ -52,7 +52,5 @@ CONFIG_MTK_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_SNOR=y -CONFIG_SYSRESET_WATCHDOG=y -CONFIG_WDT_MTK=y CONFIG_LZO=y CONFIG_HEXDUMP=y diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig index 7fc7cc66ef6..8a77aa4641b 100644 --- a/configs/mx23_olinuxino_defconfig +++ b/configs/mx23_olinuxino_defconfig @@ -19,6 +19,7 @@ CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_FRAMEWORK is not set +CONFIG_SPL_NO_CPU_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig index 8808f20d45d..ba468adb9f3 100644 --- a/configs/mx23evk_defconfig +++ b/configs/mx23evk_defconfig @@ -19,6 +19,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_FRAMEWORK is not set +CONFIG_SPL_NO_CPU_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_DM=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index 9346efb699e..d57db5f1a7b 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -18,6 +18,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_FRAMEWORK is not set +CONFIG_SPL_NO_CPU_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index fa73fa2a221..4e6426b124e 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_FRAMEWORK is not set +CONFIG_SPL_NO_CPU_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_DM=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index 17f5ba45a45..2f708de5a04 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -18,6 +18,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_FRAMEWORK is not set +CONFIG_SPL_NO_CPU_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index 9ccc30d42ae..424ebcfb25b 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_FRAMEWORK is not set +CONFIG_SPL_NO_CPU_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index e70e9ca249f..141ea3bb8dd 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -63,6 +63,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig index 01d384aa83c..c85a7932be8 100644 --- a/configs/mx6sxsabreauto_defconfig +++ b/configs/mx6sxsabreauto_defconfig @@ -48,6 +48,7 @@ CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index a551b8e3e49..4b22c8e03e0 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -50,6 +50,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PCI=y CONFIG_PINCTRL=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 023fe142072..3c32edc19b5 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -66,6 +66,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_SPI=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index c10c2a1e812..f02f6f80c73 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -66,6 +66,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_SPI=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 5bddd816bac..db71f6a11fe 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -68,6 +68,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_SPI=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 0354b96467c..3e77e6734c4 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -68,6 +68,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_SPI=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 2a5ef823ce5..98413f2b259 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -66,6 +66,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_SPI=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index e320bec2440..66db493876a 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -66,6 +66,7 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_SPI=y diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig index 9a722b084e6..7bbf07b32ef 100644 --- a/configs/octeontx2_95xx_defconfig +++ b/configs/octeontx2_95xx_defconfig @@ -77,6 +77,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_TFTP_TSIZE=y CONFIG_DM_I2C=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_OCTEONTX=y CONFIG_MTD=y diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig index 5ee0c7e75e6..4ab23955131 100644 --- a/configs/octeontx2_96xx_defconfig +++ b/configs/octeontx2_96xx_defconfig @@ -83,6 +83,7 @@ CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_OCTEONTX=y CONFIG_MTD=y diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig index 6e6a8d6b2d5..706cc413b63 100644 --- a/configs/octeontx_81xx_defconfig +++ b/configs/octeontx_81xx_defconfig @@ -82,6 +82,7 @@ CONFIG_SCSI_AHCI=y CONFIG_AHCI_PCI=y CONFIG_DM_I2C=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_OCTEONTX=y CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig index ace1f687537..207337523bc 100644 --- a/configs/octeontx_83xx_defconfig +++ b/configs/octeontx_83xx_defconfig @@ -79,6 +79,7 @@ CONFIG_SCSI_AHCI=y CONFIG_AHCI_PCI=y CONFIG_DM_I2C=y CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_OCTEONTX=y CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/phycore_pcl063_ull_defconfig b/configs/phycore_pcl063_ull_defconfig index 6e9e7d2f515..694beb60fc5 100644 --- a/configs/phycore_pcl063_ull_defconfig +++ b/configs/phycore_pcl063_ull_defconfig @@ -35,6 +35,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_MXC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_PHYLIB=y diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig index 1e52b85f0aa..8d63f16c69e 100644 --- a/configs/pico-dwarf-imx6ul_defconfig +++ b/configs/pico-dwarf-imx6ul_defconfig @@ -54,6 +54,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig index f61f98251a6..1ce17e60383 100644 --- a/configs/pico-hobbit-imx6ul_defconfig +++ b/configs/pico-hobbit-imx6ul_defconfig @@ -57,6 +57,7 @@ CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig index 3f3fa012b15..539074649f7 100644 --- a/configs/pico-imx6_defconfig +++ b/configs/pico-imx6_defconfig @@ -64,10 +64,12 @@ CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_SIZE=0x10000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_RGMII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index 9a336ebed26..215537e8cd4 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -61,6 +61,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index 9ac76560e0e..0e898365b47 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -2,6 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x600000 +CONFIG_SPL_GPIO=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x400000 CONFIG_SYS_I2C_MXC_I2C1=y @@ -11,7 +14,9 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-pico-pi" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_PICO_IMX8MQ=y +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x40480000 CONFIG_FIT=y @@ -21,6 +26,9 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_I2C=y +CONFIG_SPL_POWER=y +CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_EXPORTENV is not set @@ -50,6 +58,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_SPL_POWER_LEGACY=y diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig index 51be1ac01fc..5e18dccc84b 100644 --- a/configs/pico-pi-imx6ul_defconfig +++ b/configs/pico-pi-imx6ul_defconfig @@ -57,6 +57,7 @@ CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index 62f8446bcb7..7d06dea7213 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -11,6 +11,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttySC0,115200" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="pci enum" +CONFIG_DISPLAY_BOARDINFO=y CONFIG_HUSH_PARSER=y CONFIG_CMD_IMLS=y CONFIG_CMD_DM=y diff --git a/configs/somlabs_visionsom_6ull_defconfig b/configs/somlabs_visionsom_6ull_defconfig index 1a02023eb7f..7dad016628f 100644 --- a/configs/somlabs_visionsom_6ull_defconfig +++ b/configs/somlabs_visionsom_6ull_defconfig @@ -42,6 +42,7 @@ CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index 888c56bda02..352a3d430ba 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -19,7 +19,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_USE_BOOTCOMMAND is not set # CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_LATE_INIT=y CONFIG_SYS_PROMPT="U-Boot > " CONFIG_CMD_GPT=y diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig index bf08aa23ce3..07ec261ba6c 100644 --- a/configs/stm32f769-disco_defconfig +++ b/configs/stm32f769-disco_defconfig @@ -19,7 +19,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_USE_BOOTCOMMAND is not set # CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot > " CONFIG_CMD_GPT=y # CONFIG_RANDOM_UUID is not set diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig index eb6d5a71f89..e7b68cdd914 100644 --- a/configs/stmark2_defconfig +++ b/configs/stmark2_defconfig @@ -36,6 +36,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_SPI_FLASH_ISSI=y CONFIG_SPI_FLASH_MTD=y +CONFIG_MCFUART=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CF_SPI=y diff --git a/configs/tqma6dl_mba6_mmc_defconfig b/configs/tqma6dl_mba6_mmc_defconfig index 13052642f3f..ec31e9aa62e 100644 --- a/configs/tqma6dl_mba6_mmc_defconfig +++ b/configs/tqma6dl_mba6_mmc_defconfig @@ -44,6 +44,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_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/tqma6dl_mba6_spi_defconfig b/configs/tqma6dl_mba6_spi_defconfig index b414597f75a..839d6a0b7e2 100644 --- a/configs/tqma6dl_mba6_spi_defconfig +++ b/configs/tqma6dl_mba6_spi_defconfig @@ -48,6 +48,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_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 7d6d1402dd7..c2f66587a8a 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -44,6 +44,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_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index 3de71e8e134..c7faa10eac4 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -48,6 +48,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_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index 414dfba0615..023b3df74a2 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -44,6 +44,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_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 02c06ea1794..6d05d750ee2 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -48,6 +48,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_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/variscite_dart6ul_defconfig b/configs/variscite_dart6ul_defconfig index b53169dea40..53a49cc4867 100644 --- a/configs/variscite_dart6ul_defconfig +++ b/configs/variscite_dart6ul_defconfig @@ -37,6 +37,7 @@ CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_MXC=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_PHYLIB=y diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index c5311344fb9..eafd5b3641f 100644 --- a/configs/vf610twr_defconfig +++ b/configs/vf610twr_defconfig @@ -51,6 +51,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index e3204779185..44a0028f1f3 100644 --- a/configs/vf610twr_nand_defconfig +++ b/configs/vf610twr_nand_defconfig @@ -51,6 +51,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig index 752987f11cb..84d28c7bfcb 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -21,6 +21,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 +CONFIG_SPL_OS_BOOT=y CONFIG_CMD_SPL=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y diff --git a/configs/x530_defconfig b/configs/x530_defconfig index dafe7859a86..b12f4922ece 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -24,6 +24,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_U_BOOT_ONLY=y CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC=y +CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_WATCHDOG=y diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index cb0c0a15818..df9eae1691c 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -480,7 +480,7 @@ comment "Generic NAND options" config SYS_NAND_BLOCK_SIZE hex "NAND chip eraseblock size" depends on ARCH_SUNXI || SPL_NAND_SUPPORT || TPL_NAND_SUPPORT - depends on !NAND_MXS_DT && !NAND_DENALI_DT && !NAND_LPC32XX_MLC + depends on !NAND_MXS && !NAND_DENALI_DT && !NAND_LPC32XX_MLC && !NAND_FSL_IFC help Number of data bytes in one eraseblock for the NAND chip on the board. This is the multiple of NAND_PAGE_SIZE and the number of @@ -505,7 +505,7 @@ config SYS_NAND_PAGE_SIZE depends on ARCH_SUNXI || NAND_OMAP_GPMC || NAND_LPC32XX_SLC || \ SPL_NAND_SIMPLE || (NAND_MXC && SPL_NAND_SUPPORT) || \ (NAND_ATMEL && SPL_NAND_SUPPORT) || SPL_GENERATE_ATMEL_PMECC_HEADER - depends on !NAND_MXS_DT && !NAND_DENALI_DT && !NAND_LPC32XX_MLC + depends on !NAND_MXS && !NAND_DENALI_DT && !NAND_LPC32XX_MLC help Number of data bytes in one page for the NAND chip on the board, not including the OOB area. @@ -515,7 +515,7 @@ config SYS_NAND_OOBSIZE depends on ARCH_SUNXI || NAND_OMAP_GPMC || NAND_LPC32XX_SLC || \ SPL_NAND_SIMPLE || (NAND_MXC && SPL_NAND_SUPPORT) || \ (NAND_ATMEL && SPL_NAND_SUPPORT) || SPL_GENERATE_ATMEL_PMECC_HEADER - depends on !NAND_MXS_DT && !NAND_DENALI_DT && !NAND_LPC32XX_MLC + depends on !NAND_MXS && !NAND_DENALI_DT && !NAND_LPC32XX_MLC help Number of bytes in the Out-Of-Band area for the NAND chip on the board. diff --git a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig index 45ffdf6c26f..c81f4555d60 100644 --- a/fs/yaffs2/Kconfig +++ b/fs/yaffs2/Kconfig @@ -1,5 +1,17 @@ +config YAFFS_DIRECT + bool + +config YAFFS_PROVIDE_DEFS + bool + +config YAFFSFS_PROVIDE_VALUES + bool + config YAFFS2 bool "YAFFS2 filesystem support" + select YAFFS_DIRECT + select YAFFS_PROVIDE_DEFS + select YAFFSFS_PROVIDE_VALUES help This provides access to YAFFS2 filesystems. Yet Another Flash Filesystem 2 is a filesystem designed specifically for NAND flash. diff --git a/fs/yaffs2/Makefile b/fs/yaffs2/Makefile index 3c1bb4492b6..02cae265550 100644 --- a/fs/yaffs2/Makefile +++ b/fs/yaffs2/Makefile @@ -16,7 +16,3 @@ obj-y := \ yaffs_packedtags1.o yaffs_packedtags2.o yaffs_qsort.o \ yaffs_summary.o yaffs_tagscompat.o yaffs_verify.o yaffs_yaffs1.o \ yaffs_yaffs2.o yaffs_mtdif.o yaffs_mtdif2.o - -ccflags-y = -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM \ - -DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE \ - -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index e0c8d361d16..6a69ac45aee 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -13,7 +13,6 @@ * High Level Configuration Options * (easy to change) */ -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_WATCHDOG diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index b37c915538c..7421f3b7605 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -18,7 +18,6 @@ * (easy to change) */ -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_WATCHDOG diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 7015f790dee..7ee0ec6a4a8 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -19,7 +19,6 @@ */ #define CONFIG_MCFTMR -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_WATCHDOG diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index d892cbb5085..e9a79229219 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -10,7 +10,6 @@ #define CONFIG_MCFTMR -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_WATCHDOG /* disable watchdog */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 01c8ac6dd62..1204aa07a9c 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -18,7 +18,6 @@ */ #define CONFIG_MCFTMR -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_WATCHDOG diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 35048613b9f..8e03fc995f8 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -23,7 +23,6 @@ #define CONFIG_MCFTMR -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) /* Configuration for environment diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index fde10840445..800a7319141 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -18,7 +18,6 @@ */ #define CONFIG_MCFTMR -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 2e5b82a5f53..7b33677c551 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -18,7 +18,6 @@ * (easy to change) */ -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_WATCHDOG diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index e3e7d8b7e0e..19d8cfe3217 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -18,7 +18,6 @@ * (easy to change) */ -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_WATCHDOG diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 256a66fb057..e2ddc4893e7 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -20,7 +20,6 @@ * (easy to change) */ -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_WATCHDOG diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 73858c56e51..bfb092ab170 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -60,8 +60,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Definitions for initial stack pointer and data area (in DPRAM) */ #define CONFIG_SYS_INIT_RAM_ADDR (CONFIG_SYS_IMMR + 0x2800) #define CONFIG_SYS_INIT_RAM_SIZE (0x2e00 - 0x2800) diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index b6a78b1370e..973033d6b4d 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -24,7 +24,6 @@ #ifdef CONFIG_SKIP_LOWLEVEL_INIT #ifdef CONFIG_OF_CONTROL #undef CONFIG_OF_SEPARATE -#define CONFIG_OF_EMBED #endif #endif diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 3e78d5ce170..f533ada73f4 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -26,7 +26,6 @@ #ifdef CONFIG_SKIP_LOWLEVEL_INIT #ifdef CONFIG_OF_CONTROL #undef CONFIG_OF_SEPARATE -#define CONFIG_OF_EMBED #endif #endif diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h index 68b4e4f5903..a1f24bb2d11 100644 --- a/include/configs/am335x_guardian.h +++ b/include/configs/am335x_guardian.h @@ -80,7 +80,6 @@ #endif /* ! CONFIG_SPL_BUILD */ -#define CONFIG_BMP_16BPP #define SPLASH_SCREEN_NAND_PART "nand0,10" #define SPLASH_SCREEN_BMP_FILE_SIZE 0x26000 #define SPLASH_SCREEN_BMP_LOAD_ADDR 0x82000000 diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 98ad047bc4c..fd05ea69e3b 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -11,7 +11,6 @@ #define CONFIG_HOSTNAME "AMCORE" #define CONFIG_MCFTMR -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT 0 #define CONFIG_BOOTCOMMAND "bootm ffc20000" @@ -27,8 +26,6 @@ "erase 0xfff00000 0xffffffff; " \ "cp.b 0x20000 0xfff00000 ${filesize}\0" -#define CONFIG_SYS_HZ 1000 - #define CONFIG_SYS_CLK 45000000 #define CONFIG_SYS_CPU_CLK (CONFIG_SYS_CLK * 2) /* Register Base Addrs */ diff --git a/include/configs/ap121.h b/include/configs/ap121.h index f3fc53ba484..e23a7dc4956 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -6,7 +6,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_MHZ 200 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) diff --git a/include/configs/ap143.h b/include/configs/ap143.h index fa13a801b77..80b64da93ff 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -6,7 +6,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_MHZ 325 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) diff --git a/include/configs/ap152.h b/include/configs/ap152.h index 3eaf19283bb..762cc67aa6c 100644 --- a/include/configs/ap152.h +++ b/include/configs/ap152.h @@ -6,7 +6,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_MHZ 375 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index ce5681499c9..27007c57b3c 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -11,12 +11,9 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_DISPLAY_BOARDINFO_LATE - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ /* Networking */ #define CONFIG_IPADDR 192.168.10.2 diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index cd002235ec4..5b00a3c7e0b 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #define CONFIG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 23fca1e447b..dfed1615b9b 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -12,8 +12,6 @@ #include "mx6_common.h" -#undef CONFIG_DISPLAY_BOARDINFO - #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h> diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 077af08c2be..36e351f3583 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -81,7 +81,6 @@ * in u-boot command interface */ -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (2) #define CONFIG_SYS_UART2_ALT3_GPIO diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h index d799ffd066e..1bae49e15f3 100644 --- a/include/configs/bcm7260.h +++ b/include/configs/bcm7260.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_NS16550_COM1 0xf040c000 -#define CONFIG_SYS_TEXT_BASE 0x10100000 #define CONFIG_SYS_INIT_RAM_ADDR 0x10200000 #include "bcmstb.h" diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h index 989482ef35a..81c3d02c6be 100644 --- a/include/configs/bcm7445.h +++ b/include/configs/bcm7445.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_NS16550_COM1 0xf040ab00 -#define CONFIG_SYS_TEXT_BASE 0x80100000 #define CONFIG_SYS_INIT_RAM_ADDR 0x80200000 #include "bcmstb.h" diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h index be60fe78b20..a57edf5238d 100644 --- a/include/configs/bcm_ns3.h +++ b/include/configs/bcm_ns3.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_BOOTM_LEN 0x01800000 /* Access eMMC Boot_1 and Boot_2 partitions */ -#define CONFIG_SUPPORT_EMMC_BOOT /* enable 64-bit PCI resources */ #define CONFIG_SYS_PCI_64BIT 1 diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 59e827e320a..58ab1b7deed 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x800 -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x013E000 #define CONFIG_SPL_BSS_START_ADDR 0x00128000 #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 4012814988d..d9b59b98cdf 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -12,13 +12,11 @@ #include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_TEXT_BASE 0x0 #define CONFIG_SPL_MAX_SIZE (124 * 1024) #define CONFIG_SYS_MONITOR_LEN (1024 * 1024) #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x800 -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x013E000 #define CONFIG_SPL_BSS_START_ADDR 0x00128000 #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ @@ -30,14 +28,10 @@ #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE #define CONFIG_SPL_ABORT_ON_RAW_IMAGE - -#define CONFIG_OF_EMBED #endif #define CONFIG_REMAKE_ELF -#define CONFIG_BOARD_EARLY_INIT_F - /* Flat Device Tree Definitions */ #define CONFIG_OF_BOARD_SETUP @@ -46,7 +40,6 @@ #define USDHC1_BASE_ADDR 0x5B010000 #define USDHC2_BASE_ADDR 0x5B020000 #define USDHC3_BASE_ADDR 0x5B030000 -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 1d4503ba531..cefc8157216 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -10,7 +10,6 @@ #define __CONFIG_CI20_H__ /* Ingenic JZ4780 clock configuration. */ -#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_MHZ 1200 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index ebfe356eee0..fdc84297c62 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -13,7 +13,6 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* Network */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 @@ -92,8 +91,6 @@ "echo eMMC boot attempt ...; run emmcbootscript; run emmcboot; " \ "echo USB boot attempt ...; run usbbootscript; " -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 7545979defa..d61d759092c 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -147,7 +147,6 @@ #endif /* Ethernet */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_FEC_XCV_TYPE RGMII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index efc6b5bd1be..dbb47ccb2a7 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -43,7 +43,6 @@ * --- */ -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) /* --- diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index e823497cb39..82926afbdf6 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -12,12 +12,9 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_DISPLAY_BOARDINFO_LATE - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #define CONFIG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 44135b2f214..b103186bf46 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -12,8 +12,6 @@ #include "mx6_common.h" -#undef CONFIG_DISPLAY_BOARDINFO - #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h> diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 344b266db9e..ac188ee3ac6 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -170,8 +170,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 25a772914a2..71fe768d679 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -110,8 +110,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_HZ 1000 - /* Physical memory map */ #define PHYS_SDRAM (0x80000000) #define PHYS_SDRAM_SIZE (256 * SZ_1M) diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 21e61e5e8f5..5120c7b3777 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -72,13 +72,8 @@ #define CONFIG_SPL_STACK (0x40000000 + ((212 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_I2C - #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD /* SPL related MMC defines */ -#define CONFIG_SPL_MMC #ifdef CONFIG_SPL_BUILD #define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */ #endif diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 6f861a09986..dd1ba49788a 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -41,14 +41,11 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_SUPPORT_EMMC_BOOT /* I2C configs */ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE SZ_512M diff --git a/include/configs/display5.h b/include/configs/display5.h index 27854dfdf1e..329a60f1d20 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -312,7 +312,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_STANDALONE_LOAD_ADDR 0x10001000 -#define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 6a5e1d3a753..1949c3f558f 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -14,7 +14,6 @@ * High Level Configuration Options (easy to change) * *----------------------------------------------------------------------*/ -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) #undef CONFIG_MONITOR_IS_IN_RAM /* starts uboot direct */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 12d108d6d6d..ec5fc156965 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -59,7 +59,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 27aab38926d..c289d694e9b 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -91,7 +91,6 @@ /* * Ethernet */ -#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x1f /* diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 9af0a040403..fed6545fdf9 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -100,8 +100,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - #ifdef CONFIG_MX6UL # define DRAM_OFFSET(x) 0x87##x # define FDT_ADDR __stringify(DRAM_OFFSET(800000)) @@ -164,12 +162,6 @@ /* SPL */ #ifdef CONFIG_SPL -# ifdef CONFIG_ENV_IS_IN_NAND -# define CONFIG_SPL_NAND_SUPPORT -# else -# define CONFIG_SPL_MMC -# endif - # include "imx6_spl.h" #endif diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 367f78d125d..24f9ccc0de3 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -62,8 +62,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 4d4c94b74ea..553c7fe2ea9 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -72,8 +72,6 @@ #define CONFIG_BOOTCOMMAND "run boot${boot-mode}" -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 2427603d008..1c636d94f6f 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -20,7 +20,6 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x960000 #define CONFIG_SPL_BSS_START_ADDR 0x0098FC00 #define CONFIG_SPL_BSS_MAX_SIZE 0x400 /* 1 KB */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index f2eb7774767..53fbeffb453 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -19,16 +19,7 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_WATCHDOG -#define CONFIG_SPL_DRIVERS_MISC -#define CONFIG_SPL_POWER -#define CONFIG_SPL_I2C -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x187FF0 -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_GPIO -#define CONFIG_SPL_MMC #define CONFIG_SPL_BSS_START_ADDR 0x00180000 #define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x42200000 @@ -54,7 +45,6 @@ #define CONFIG_MII #define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 0 #define FEC_QUIRK_ENET_MAC diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 0ec1f69fdbc..d17f70fc4b2 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -16,16 +16,7 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_WATCHDOG -#define CONFIG_SPL_DRIVERS_MISC -#define CONFIG_SPL_POWER -#define CONFIG_SPL_I2C -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x187FF0 -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_GPIO -#define CONFIG_SPL_MMC #define CONFIG_SPL_BSS_START_ADDR 0x00180000 #define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x42200000 @@ -48,7 +39,6 @@ #define CONFIG_MII #define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 0 #define FEC_QUIRK_ENET_MAC diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 803daa45c80..11b5c16e37e 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x800 -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x013E000 #define CONFIG_SPL_BSS_START_ADDR 0x00128000 #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ @@ -30,8 +29,6 @@ #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE #define CONFIG_SPL_ABORT_ON_RAW_IMAGE - -#define CONFIG_OF_EMBED #endif #define CONFIG_REMAKE_ELF @@ -42,7 +39,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 #define USDHC2_BASE_ADDR 0x5B020000 -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #ifdef CONFIG_AHAB_BOOT #define AHAB_ENV "sec_boot=yes\0" diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 89b45546adc..b524ce30707 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -22,8 +22,6 @@ #define USDHC2_BASE_ADDR 0x5B020000 #define USDHC3_BASE_ADDR 0x5B030000 -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ - /* FUSE command */ /* Boot M4 */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index a7ca48f1f6b..f59a9ef5e2c 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x800 -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x013E000 #define CONFIG_SPL_BSS_START_ADDR 0x00128000 #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ @@ -28,8 +27,6 @@ #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE #define CONFIG_SPL_ABORT_ON_RAW_IMAGE - -#define CONFIG_OF_EMBED #endif #define CONFIG_REMAKE_ELF diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 8e9a159e9b3..3d506ba37f3 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x22050000 #define CONFIG_SPL_BSS_START_ADDR 0x22048000 #define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ @@ -27,17 +26,12 @@ #define CONFIG_MALLOC_F_ADDR 0x22040000 -#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x95000000 /* SPL_RAM needed */ - #define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */ #endif #define CONFIG_REMAKE_ELF -#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOARD_LATE_INIT - /* ENET Config */ #if defined(CONFIG_FEC_MXC) #define CONFIG_ETHPRIME "FEC" diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 65aa2508942..34304f91028 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE -#define CONFIG_SYS_HZ 1000 - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 0d9ab3b7558..52aa4473a2f 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 -#define CONFIG_SYS_HZ 1000 - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index dc6f15a2a22..d74b2bb9606 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -101,7 +101,6 @@ "else run netboot; fi" /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR @@ -127,7 +126,6 @@ #endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define CONFIG_FEC_ENET_DEV 0 #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 8a49f2d0075..d072eaab871 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -59,8 +59,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) -#define CONFIG_SYS_HZ 1000 - #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 7a7640a49c7..f73dafef053 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -48,12 +48,6 @@ #define SDRAM_CFG_BI 0x00000001 #ifdef CONFIG_SD_BOOT -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_I2C -#define CONFIG_SPL_WATCHDOG -#define CONFIG_SPL_MMC #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 #define CONFIG_SPL_MAX_SIZE 0x1a000 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 1d15f2fc585..ee5660571e5 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -344,8 +344,6 @@ unsigned long get_board_sys_clk(void); * Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index f199c94ed10..7822e9d9faf 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -95,14 +95,7 @@ /* NAND SPL */ #ifdef CONFIG_NAND_BOOT #define CONFIG_SPL_PBL_PAD -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_WATCHDOG -#define CONFIG_SPL_I2C - -#define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_DRIVERS_MISC + #define CONFIG_SPL_MAX_SIZE 0x17000 /* 90 KiB */ #define CONFIG_SPL_STACK 0x1001f000 #define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 2e3824041c9..987df5f6e5c 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -360,8 +360,6 @@ unsigned long get_board_sys_clk(void); * Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 9ae0b8e0ae4..c816ee16f2a 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -204,7 +204,6 @@ unsigned long long get_qixis_addr(void); #ifdef CONFIG_SPL #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00100000 -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_MAX_SIZE 0x16000 #define CONFIG_SPL_STACK (CONFIG_SYS_FSL_OCRAM_BASE + 0x9ff0) #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 375a7588dc5..32f8e633c12 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -73,7 +73,6 @@ * Ethernet on SOC (FEC) */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define IMX_FEC_BASE FEC_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x0 #define CONFIG_MII diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index a0803227c88..11b9ceb5475 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -9,7 +9,6 @@ #include "mx6_common.h" -#define CONFIG_SPL_LIBCOMMON_SUPPORT #include "imx6_spl.h" #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000) diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h index ac9a75bf2de..ab8fa85f25e 100644 --- a/include/configs/meerkat96.h +++ b/include/configs/meerkat96.h @@ -14,8 +14,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mt7620.h b/include/configs/mt7620.h index a2de0342921..5a8862775bd 100644 --- a/include/configs/mt7620.h +++ b/include/configs/mt7620.h @@ -8,7 +8,6 @@ #ifndef __CONFIG_MT7620_H #define __CONFIG_MT7620_H -#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_MIPS_TIMER_FREQ 290000000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h index e53e6a0d0a0..8c4455b9fe1 100644 --- a/include/configs/mt7628.h +++ b/include/configs/mt7628.h @@ -8,7 +8,6 @@ #ifndef __CONFIG_MT7628_H #define __CONFIG_MT7628_H -#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_MIPS_TIMER_FREQ 290000000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 5c0b729ccd9..983402f7df8 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -39,8 +39,4 @@ /* MMC */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_DRIVERS_MISC -#endif - #endif diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index df02c523084..12b17839189 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -111,8 +111,6 @@ /* Network */ -#define CONFIG_FEC_MXC - #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x0 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index df2bd97438a..a554011d75d 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -138,7 +138,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR /* Network */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 9ddb47910f3..0b777fbbdc0 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -124,8 +124,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 247d5e1bcc3..e384d2a2696 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -121,8 +121,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index eeb535efa1b..32b44fe9241 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -38,10 +38,6 @@ #define CONFIG_ARMV7_SECURE_BASE 0x00900000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_DRIVERS_MISC -#endif - /* * If we have defined the OPTEE ram size and not OPTEE it means that we were * launched by OPTEE, because of that we shall skip all the low level diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 92ce741768d..f11e2e3f807 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -87,8 +87,6 @@ #include <config_distro_bootcmd.h> -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 567a037089d..6d7f09e2885 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -112,8 +112,6 @@ "fi; " \ "fi" -#define CONFIG_SYS_HZ 1000 - #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE SZ_256K diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 51624a27c46..591c5721840 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -45,7 +45,6 @@ /* SPL */ #ifndef CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NO_CPU_SUPPORT #define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs" #endif diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index 04c9879ccca..6801fc109ea 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -21,8 +21,6 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE SZ_256M diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index cd53c498975..603299687f6 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -32,7 +32,6 @@ #define CONFIG_LBA48 #endif -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 70e2898c145..a10607ff66f 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -23,8 +23,6 @@ #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index 5e1c0073b0b..6608b341028 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -56,7 +56,6 @@ #if defined(CONFIG_MMC_OCTEONTX) #define MMC_SUPPORTS_TUNING /** EMMC specific defines */ -#define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SUPPORT_EMMC_RPMB #endif diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index 83dccf7d8ea..3a0f081046d 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -88,7 +88,6 @@ /** EMMC specific defines */ #if defined(CONFIG_MMC_OCTEONTX) -#define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SUPPORT_EMMC_RPMB #endif diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 4227610566d..f2352d82161 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) -#define CONFIG_SYS_HZ 1000 /* * Memory Info diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index f29f6dc5857..31b7d07a24c 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -33,8 +33,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE SZ_256M diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index c1da1a01194..0e047dfa43a 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -30,14 +30,11 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_SUPPORT_EMMC_BOOT /* I2C configs */ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE SZ_256M diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 874c94e01f9..356544a6727 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -20,7 +20,6 @@ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x960000 #define CONFIG_SPL_BSS_START_ADDR 0x98FC00 #define CONFIG_SPL_BSS_MAX_SIZE SZ_1K diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 4e72caa45d7..817e7140d85 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -28,7 +28,6 @@ /* MMC Configuration */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR -#define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE /* USB Configs */ @@ -131,7 +130,6 @@ #define CONFIG_BOARD_SIZE_LIMIT 715776 /* Ethernet Configuration */ -#define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 6fed7522bdd..3fe178316f7 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -28,7 +28,6 @@ /* Network support */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_FEC_XCV_TYPE RMII @@ -108,8 +107,6 @@ #include <config_distro_bootcmd.h> #include <linux/stringify.h> -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index c0464278b98..cbac9505492 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -107,8 +107,6 @@ #include <config_distro_bootcmd.h> #include <linux/stringify.h> -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index d858a7edf8d..2afcf0059d5 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -16,16 +16,7 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_WATCHDOG -#define CONFIG_SPL_DRIVERS_MISC -#define CONFIG_SPL_POWER -#define CONFIG_SPL_I2C -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_STACK 0x187FF0 -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_GPIO -#define CONFIG_SPL_MMC #define CONFIG_SPL_BSS_START_ADDR 0x00180000 #define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x42200000 @@ -48,7 +39,6 @@ #define CONFIG_MII #define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 1 #define FEC_QUIRK_ENET_MAC diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index bb4240a1284..1287fd16715 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M /* For timer, QEMU emulates an ARMv7/ARMv8 architected timer */ -#define CONFIG_SYS_HZ 1000 /* Environment options */ diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 36930fa3f1a..58ca6c28b53 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -4,8 +4,6 @@ #define CONFIG_CPU_SH7751 1 #define __LITTLE_ENDIAN__ 1 -#define CONFIG_DISPLAY_BOARDINFO - /* SCIF */ #define CONFIG_CONS_SCIF1 1 diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index 21feba0569e..f49f5faa7f1 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -72,7 +72,6 @@ /* Not used: not need IRQ/FIQ stuff */ #undef CONFIG_USE_IRQ /* decrementer freq: 1ms ticks */ -#define CONFIG_SYS_HZ 1000 /*----------------------------------------------------------------------- * System initialize options (board_init_f) diff --git a/include/configs/sama5d27_wlsom1_ek.h b/include/configs/sama5d27_wlsom1_ek.h index 09ebf488601..e611e7b5104 100644 --- a/include/configs/sama5d27_wlsom1_ek.h +++ b/include/configs/sama5d27_wlsom1_ek.h @@ -27,7 +27,6 @@ #endif /* SPL */ -#define CONFIG_SPL_TEXT_BASE 0x200000 #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 2538287e4cf..f43304d8448 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -137,8 +137,6 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_INIT_SP_ADDR 0x301000 -#define CONFIG_SPL_STACK_R -#define CONFIG_SPL_STACK_R_ADDR CONFIG_SYS_TEXT_BASE #else /* * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM, diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 55ca8019851..bbdd42b1afb 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -41,8 +41,6 @@ "run mmcboot; " \ "fi; " \ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index 6af908afe6a..a2fe54709da 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -68,8 +68,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR @@ -93,7 +91,6 @@ #endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_FEC_XCV_TYPE RMII diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 493699e9507..2f2a349dcdc 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -42,8 +42,6 @@ "ramdisk_addr_r=0xC0438000\0" \ BOOTENV -#define CONFIG_DISPLAY_BOARDINFO - /* For SPL */ #ifdef CONFIG_SUPPORT_SPL #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index a71de054589..4573093d4ca 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -10,7 +10,6 @@ #define CONFIG_HOSTNAME "stmark2" -#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT 0 #define LDS_BOARD_TEXT \ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index c576d65efaf..7260eb72a40 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -48,7 +48,6 @@ /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here * since it needs to fit in with the other values. By also #defining it * we get warnings if the Kconfig value mismatches. */ -#define CONFIG_SPL_STACK_R_ADDR 0x2fe00000 #define CONFIG_SPL_BSS_START_ADDR 0x2ff80000 #else #define SDRAM_OFFSET(x) 0x4##x @@ -57,7 +56,6 @@ /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here * since it needs to fit in with the other values. By also #defining it * we get warnings if the Kconfig value mismatches. */ -#define CONFIG_SPL_STACK_R_ADDR 0x4fe00000 #define CONFIG_SPL_BSS_START_ADDR 0x4ff80000 #endif diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 13e9c64387e..aac7b5dc387 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -6,7 +6,6 @@ #define __CONFIG_H /* Timers for fasp(TIMCLK) */ -#define CONFIG_SYS_HZ 1000 /* 1 msec */ #define CONFIG_SYS_TIMERBASE 0x31080000 /* AP Timer 1 (ARM-SP804) */ /* diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 0438b5ae0c6..58ccafc385a 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -12,8 +12,6 @@ /* General configuration */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 18179e9b7e9..88bb4a8fd5e 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" -/* No falcon support */ -#undef CONFIG_SPL_OS_BOOT - /* FPGA commands that we don't use */ /* Extras */ @@ -101,6 +98,5 @@ #define CONFIG_BOOTCOMMAND "if mmcinfo; then " \ "if fatload mmc 0 0x1900000 ${bootscript}; then source 0x1900000; " \ "fi; fi; run $modeboot" -#undef CONFIG_DISPLAY_BOARDINFO #endif /* __CONFIG_TOPIC_MIAMI_H */ diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index 3e76d638c99..e6dc9f17fed 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -6,7 +6,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_MHZ 280 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 1efe9d57a84..374a65aef4a 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -55,7 +55,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_ARP_TIMEOUT 200UL diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 29d6c3576b8..6ec39a063d7 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_MXC_PHYADDR 0 diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index 3dc10b29c3f..87259258f77 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -21,9 +21,6 @@ func(MMC, mmc, 1) \ #ifndef CONFIG_TPL_BUILD - -#define CONFIG_SPL_OS_BOOT - /* Falcon Mode */ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 74fb988b765..00031d87c12 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -96,8 +96,6 @@ "fi; " \ "fi" -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/x530.h b/include/configs/x530.h index f4d64495ffa..e78e249e41a 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -10,8 +10,6 @@ * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE - /* * NS16550 Configuration */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index f8607b76172..e2148057875 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -251,7 +251,6 @@ #endif #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) -# define CONFIG_SPL_ENV_SUPPORT # define CONFIG_SPL_HASH # define CONFIG_ENV_MAX_ENTRIES 10 #endif diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 1e2b6c09543..f6645a72940 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -20,8 +20,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HZ 1000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE (128 << 20) @@ -44,7 +42,6 @@ #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_FEC_MXC #define CONFIG_FEC_ENET_DEV 0 #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2f4e5a0ccdb..6792e284a14 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3084,12 +3084,9 @@ CONFIG_X86_REFCODE_RUN_ADDR CONFIG_XGI_XG22_BASE CONFIG_XSENGINE CONFIG_XTFPGA -CONFIG_YAFFSFS_PROVIDE_VALUES CONFIG_YAFFS_AUTO_UNICODE CONFIG_YAFFS_CASE_INSENSITIVE CONFIG_YAFFS_DEFINES_TYPES -CONFIG_YAFFS_DIRECT -CONFIG_YAFFS_PROVIDE_DEFS CONFIG_YAFFS_UNICODE CONFIG_YAFFS_UTIL CONFIG_YAFFS_WINCE |