[PATCH 01/20] Convert CONFIG_ARCH_CPU_INIT to Kconfig
This converts the following to Kconfig: CONFIG_ARCH_CPU_INIT
Signed-off-by: Tom Rini trini@konsulko.com --- configs/s5p4418_nanopi2_defconfig | 1 + include/configs/s5p4418_nanopi2.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig index 06017437cccf..eaf319e58a2a 100644 --- a/configs/s5p4418_nanopi2_defconfig +++ b/configs/s5p4418_nanopi2_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_SYS_DCACHE_OFF=y +CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_NEXELL=y CONFIG_SYS_TEXT_BASE=0x74C00000 CONFIG_SYS_MALLOC_LEN=0x2000000 diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index f49f5faa7f12..d22a84a50352 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -77,7 +77,6 @@ * System initialize options (board_init_f) */ /* board_init_f->init_sequence, call arch_cpu_init */ -#define CONFIG_ARCH_CPU_INIT
/*----------------------------------------------------------------------- * Miscellaneous configurable options
This converts the following to Kconfig: CONFIG_E1000
Signed-off-by: Tom Rini trini@konsulko.com --- README | 7 ------- configs/clearfog_gt_8k_defconfig | 1 + configs/mvebu_crb_cn9130_defconfig | 1 + configs/mvebu_db_armada8k_defconfig | 1 + configs/mvebu_db_cn9130_defconfig | 1 + configs/mvebu_mcbin-88f8040_defconfig | 1 + configs/mvebu_puzzle-m801-88f8040_defconfig | 1 + include/configs/mvebu_armada-8k.h | 3 --- 8 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/README b/README index 0f5288817155..7e91e34f5f3a 100644 --- a/README +++ b/README @@ -824,18 +824,11 @@ The following options need to be configured: SCSI devices found during the last scan.
- NETWORK Support (PCI): - CONFIG_E1000 - Support for Intel 8254x/8257x gigabit chips. - CONFIG_E1000_SPI Utility code for direct access to the SPI bus on Intel 8257x. This does not do anything useful unless you set at least one of CONFIG_CMD_E1000 or CONFIG_E1000_SPI_GENERIC.
- CONFIG_E1000_SPI_GENERIC - Allow generic access to the SPI bus on the Intel 8257x, for - example with the "sspi" command. - CONFIG_NATSEMI Support for National dp83815 chips.
diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig index 082ced93d201..6e344c9ce338 100644 --- a/configs/clearfog_gt_8k_defconfig +++ b/configs/clearfog_gt_8k_defconfig @@ -54,6 +54,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y +CONFIG_E1000=y CONFIG_MVPP2=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/mvebu_crb_cn9130_defconfig b/configs/mvebu_crb_cn9130_defconfig index 334d7f218329..039fd8b3dc3f 100644 --- a/configs/mvebu_crb_cn9130_defconfig +++ b/configs/mvebu_crb_cn9130_defconfig @@ -60,6 +60,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_MTD=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y +CONFIG_E1000=y CONFIG_MVPP2=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig index d9a5759d4415..e6168a76a62d 100644 --- a/configs/mvebu_db_armada8k_defconfig +++ b/configs/mvebu_db_armada8k_defconfig @@ -49,6 +49,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y +CONFIG_E1000=y CONFIG_MVPP2=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/mvebu_db_cn9130_defconfig b/configs/mvebu_db_cn9130_defconfig index c8dffe0117c9..42d7038c5a17 100644 --- a/configs/mvebu_db_cn9130_defconfig +++ b/configs/mvebu_db_cn9130_defconfig @@ -65,6 +65,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_MTD=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y +CONFIG_E1000=y CONFIG_MVPP2=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig index 61cc2602031d..2aa06f80a0ec 100644 --- a/configs/mvebu_mcbin-88f8040_defconfig +++ b/configs/mvebu_mcbin-88f8040_defconfig @@ -54,6 +54,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y +CONFIG_E1000=y CONFIG_MVPP2=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/mvebu_puzzle-m801-88f8040_defconfig b/configs/mvebu_puzzle-m801-88f8040_defconfig index da73dd1cbd5b..053b2f4c9644 100644 --- a/configs/mvebu_puzzle-m801-88f8040_defconfig +++ b/configs/mvebu_puzzle-m801-88f8040_defconfig @@ -58,6 +58,7 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y +CONFIG_E1000=y CONFIG_MVPP2=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 886f44c90303..ac0fdddbd94d 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -58,9 +58,6 @@ /* * PCI configuration */ -#ifdef CONFIG_PCIE_DW_MVEBU -#define CONFIG_E1000 -#endif
#define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \
On Sun, Nov 07, 2021 at 10:59:33PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_E1000
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_DOS_PARTITION
Signed-off-by: Tom Rini trini@konsulko.com --- configs/SBx81LIFKW_defconfig | 1 + configs/SBx81LIFXCAT_defconfig | 1 + configs/bcm7260_defconfig | 1 + configs/bcm7445_defconfig | 1 + include/configs/SBx81LIFKW.h | 1 - include/configs/SBx81LIFXCAT.h | 1 - include/configs/bcmstb.h | 1 - 7 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index b0903d63a641..16690164175e 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -26,6 +26,7 @@ CONFIG_BOOTP_NTPSERVER=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y +CONFIG_DOS_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig index c6629bc37758..3858143435a9 100644 --- a/configs/SBx81LIFXCAT_defconfig +++ b/configs/SBx81LIFXCAT_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y # CONFIG_CMD_LED is not set +CONFIG_DOS_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index 39a83fa50b67..257d81052a8f 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FS_GENERIC=y +CONFIG_DOS_PARTITION=y CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 9e2400523a3d..9ffa436e4548 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FS_GENERIC=y +CONFIG_DOS_PARTITION=y CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index 462619ff6980..4ecff1606c43 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -39,7 +39,6 @@
#define MTDPARTS_DEFAULT "mtdparts=spi0.0:768K(boot)ro,256K(boot-env),14M(user),1M(errlog)" #define MTDPARTS_MTDOOPS "errlog" -#define CONFIG_DOS_PARTITION
/* * Environment variables configurations diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index a271567f8550..4e9f0395ab92 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -39,7 +39,6 @@
#define MTDPARTS_DEFAULT "mtdparts=spi0.0:768K(boot)ro,256K(boot-env),14M(user),1M(errlog)" #define MTDPARTS_MTDOOPS "errlog" -#define CONFIG_DOS_PARTITION
/* * Environment variables configurations diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index c3c28eadcb45..e7f380b5155a 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -132,7 +132,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Filesystem configuration. */ -#define CONFIG_DOS_PARTITION
/* * Environment configuration.
On Sun, Nov 07, 2021 at 10:59:34PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_DOS_PARTITION
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_BITBANGMII
Signed-off-by: Tom Rini trini@konsulko.com --- configs/r8a779a0_falcon_defconfig | 1 + include/configs/falcon.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig index cb21d3a5d307..bad558542231 100644 --- a/configs/r8a779a0_falcon_defconfig +++ b/configs/r8a779a0_falcon_defconfig @@ -52,6 +52,7 @@ CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_BITBANGMII=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y diff --git a/include/configs/falcon.h b/include/configs/falcon.h index 67931febf84f..d783faf180e5 100644 --- a/include/configs/falcon.h +++ b/include/configs/falcon.h @@ -22,7 +22,6 @@ #define GICR_BASE 0xF1060000
/* Ethernet RAVB */ -#define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI
/* Board Clock */
On Sun, Nov 07, 2021 at 10:59:35PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_BITBANGMII
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_FSL_LAYERSCAPE
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 2 ++ include/configs/lx2160a_common.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 1e166c73e40a..9d6cf69c3035 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -233,6 +233,7 @@ config ARCH_LS2080A config ARCH_LX2162A bool select ARMV8_SET_SMPEN + select FSL_LAYERSCAPE select FSL_LSCH3 select GICV3 select NXP_LSCH3_2 @@ -266,6 +267,7 @@ config ARCH_LX2162A config ARCH_LX2160A bool select ARMV8_SET_SMPEN + select FSL_LAYERSCAPE select FSL_LSCH3 select GICV3 select HAS_FSL_XHCI_USB if USB_HOST diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index dddac7b05c35..a9d826b87ae1 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -11,7 +11,6 @@ #include <asm/arch/soc.h>
#define CONFIG_REMAKE_ELF -#define CONFIG_FSL_LAYERSCAPE #define CONFIG_FSL_TZPC_BP147 #define CONFIG_FSL_MEMAC
On Sun, Nov 07, 2021 at 10:59:36PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_FSL_LAYERSCAPE
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_FSL_USDHC
Signed-off-by: Tom Rini trini@konsulko.com --- configs/imx8mm-cl-iot-gate-optee_defconfig | 2 +- configs/imx8mm-cl-iot-gate_defconfig | 2 +- configs/imx8mm_evk_defconfig | 2 +- configs/imx8mn_ddr4_evk_defconfig | 2 +- configs/imx8mn_evk_defconfig | 2 +- configs/imx8mp_evk_defconfig | 2 +- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +- configs/kontron-sl-mx8mm_defconfig | 2 +- configs/phycore-imx8mm_defconfig | 2 +- configs/phycore-imx8mp_defconfig | 2 +- configs/verdin-imx8mm_defconfig | 2 +- include/configs/brppt2.h | 1 - include/configs/imx8mm-cl-iot-gate.h | 1 - include/configs/imx8mm_evk.h | 1 - include/configs/imx8mn_evk.h | 1 - include/configs/imx8mp_evk.h | 2 -- include/configs/imx8qm_rom7720.h | 1 - include/configs/kontron-sl-mx8mm.h | 1 - include/configs/phycore_imx8mm.h | 1 - include/configs/phycore_imx8mp.h | 1 - include/configs/verdin-imx8mm.h | 1 - 21 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/configs/imx8mm-cl-iot-gate-optee_defconfig b/configs/imx8mm-cl-iot-gate-optee_defconfig index 79d482141af9..29d060166b0b 100644 --- a/configs/imx8mm-cl-iot-gate-optee_defconfig +++ b/configs/imx8mm-cl-iot-gate-optee_defconfig @@ -81,7 +81,7 @@ CONFIG_DM_I2C=y CONFIG_DM_KEYBOARD=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y diff --git a/configs/imx8mm-cl-iot-gate_defconfig b/configs/imx8mm-cl-iot-gate_defconfig index f6c647b825b5..72848914b574 100644 --- a/configs/imx8mm-cl-iot-gate_defconfig +++ b/configs/imx8mm-cl-iot-gate_defconfig @@ -84,7 +84,7 @@ CONFIG_DM_I2C=y CONFIG_DM_KEYBOARD=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig index d23d3d564806..d03bba797b71 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -60,7 +60,7 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index 740d4e8d83b4..8a0b85a5c270 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -63,7 +63,7 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_DM_ETH=y CONFIG_PINCTRL=y diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index 37ce46eac853..3ee15d3edfa5 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -65,7 +65,7 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_DM_ETH=y CONFIG_PINCTRL=y diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index 3bbadc353244..a448734a9298 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -71,7 +71,7 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_PHY_REALTEK=y CONFIG_DM_ETH=y CONFIG_DM_ETH_PHY=y diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index e944e69f25fa..fb43fa1962eb 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -60,7 +60,7 @@ CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig index 5baf5bbdefc9..d8567031a44f 100644 --- a/configs/kontron-sl-mx8mm_defconfig +++ b/configs/kontron-sl-mx8mm_defconfig @@ -79,7 +79,7 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig index e54b2d1ef421..89a4f28bba4f 100644 --- a/configs/phycore-imx8mm_defconfig +++ b/configs/phycore-imx8mm_defconfig @@ -80,7 +80,7 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index fdc136cc7580..758c2881cb82 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -81,7 +81,7 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_TI_DP83867=y CONFIG_DM_ETH=y diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig index 791bdf4235c8..6312d8a0b058 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -76,7 +76,7 @@ CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_MICREL=y diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 3f54bafdb88a..76a28dc76180 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -21,7 +21,6 @@ #define CONFIG_MXC_GPT_HCLK
/* MMC */ -#define CONFIG_FSL_USDHC
/* Boot */
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 9b86e0a9a077..caab69ab2ae4 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -165,7 +165,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16)
/* USDHC */ -#define CONFIG_FSL_USDHC
#define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 4c8f56273750..167ca19f2108 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -81,7 +81,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16)
/* USDHC */ -#define CONFIG_FSL_USDHC
#define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 1e18a8798777..ab8932149213 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -80,7 +80,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16)
/* USDHC */ -#define CONFIG_FSL_USDHC
#define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 1c636d94f6f7..30cce1a49e2f 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -97,8 +97,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_FSL_USDHC - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index b524ce307076..2c80f268a41e 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -15,7 +15,6 @@ #define CONFIG_SPL_BSS_START_ADDR 0x00128000 #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */
-#define CONFIG_FSL_USDHC #define CONFIG_SYS_BOOTMAPSZ (256 << 20) #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 52aa4473a2fd..d1e87f97d6da 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -54,7 +54,6 @@
#define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_SPL_MAX_SIZE (148 * SZ_1K) -#define CONFIG_FSL_USDHC
#ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_STACK 0x91fff0 diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index e74f2b27954f..38c8a836170f 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -103,7 +103,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* USDHC */ -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 356544a67274..fcd5896a97bd 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -103,7 +103,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* USDHC */ -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 693fd6907ebf..7fbec270bff5 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -101,7 +101,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) /* USDHC */ -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
On Sun, Nov 07, 2021 at 10:59:37PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_FSL_USDHC
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_ENV_IS_IN_SPI_FLASH CONFIG_ENV_IS_NOWHERE CONFIG_ENV_OFFSET CONFIG_ENV_OVERWRITE CONFIG_ENV_SECT_SIZE CONFIG_SYS_MMC_ENV_DEV CONFIG_SYS_MMC_ENV_PART
Signed-off-by: Tom Rini trini@konsulko.com --- configs/cgtqmx8_defconfig | 1 + configs/imx8mn_beacon_2g_defconfig | 1 + configs/imx8mn_beacon_defconfig | 1 + configs/imx8ulp_evk_defconfig | 1 + configs/octeontx2_95xx_defconfig | 1 + configs/octeontx2_96xx_defconfig | 1 + configs/octeontx_81xx_defconfig | 1 + configs/octeontx_83xx_defconfig | 1 + configs/synquacer_developerbox_defconfig | 1 + include/configs/cgtqmx8.h | 2 -- include/configs/chromebook_coral.h | 3 --- include/configs/imx7-cm.h | 2 -- include/configs/imx8mn_beacon.h | 2 -- include/configs/imx8ulp_evk.h | 1 - include/configs/npi_imx6ull.h | 9 --------- include/configs/octeontx2_common.h | 8 -------- include/configs/octeontx_common.h | 8 -------- include/configs/openpiton-riscv64.h | 6 ------ include/configs/socfpga_soc64_common.h | 2 -- include/configs/stmark2.h | 4 ---- include/configs/synquacer.h | 2 -- include/env_internal.h | 1 - 22 files changed, 9 insertions(+), 50 deletions(-)
diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig index 3d1c438e8ba3..f69b5662fd06 100644 --- a/configs/cgtqmx8_defconfig +++ b/configs/cgtqmx8_defconfig @@ -45,6 +45,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_SPL_OF_CONTROL=y +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig index 61ab07ec937d..5f116b772148 100644 --- a/configs/imx8mn_beacon_2g_defconfig +++ b/configs/imx8mn_beacon_2g_defconfig @@ -61,6 +61,7 @@ CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts" +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=2 diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig index 3f5e23ff3b80..52c7a7e97176 100644 --- a/configs/imx8mn_beacon_defconfig +++ b/configs/imx8mn_beacon_defconfig @@ -61,6 +61,7 @@ CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts" +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=2 diff --git a/configs/imx8ulp_evk_defconfig b/configs/imx8ulp_evk_defconfig index b8f18c0a06d6..129931f4c353 100644 --- a/configs/imx8ulp_evk_defconfig +++ b/configs/imx8ulp_evk_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SPL_OF_CONTROL=y +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig index 7bbf07b32ef4..de5ce1cb28b1 100644 --- a/configs/octeontx2_95xx_defconfig +++ b/configs/octeontx2_95xx_defconfig @@ -63,6 +63,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_OF_BOARD=y +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USE_ENV_SPI_BUS=y CONFIG_ENV_SPI_BUS=0 diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig index 4ab239551315..011bc796ab43 100644 --- a/configs/octeontx2_96xx_defconfig +++ b/configs/octeontx2_96xx_defconfig @@ -64,6 +64,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_OF_BOARD=y +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USE_ENV_SPI_BUS=y CONFIG_ENV_SPI_BUS=0 diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig index 706cc413b633..d0728ac3c670 100644 --- a/configs/octeontx_81xx_defconfig +++ b/configs/octeontx_81xx_defconfig @@ -66,6 +66,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_OF_BOARD=y +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USE_ENV_SPI_BUS=y CONFIG_ENV_SPI_BUS=0 diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig index 207337523bc2..6c9609b0cd30 100644 --- a/configs/octeontx_83xx_defconfig +++ b/configs/octeontx_83xx_defconfig @@ -63,6 +63,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_OF_BOARD=y +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USE_ENV_SPI_BUS=y CONFIG_ENV_SPI_BUS=0 diff --git a/configs/synquacer_developerbox_defconfig b/configs/synquacer_developerbox_defconfig index c458bdddc1ad..4fb0fba4416d 100644 --- a/configs/synquacer_developerbox_defconfig +++ b/configs/synquacer_developerbox_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_LOG=y CONFIG_PARTITION_TYPE_GUID=y +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USE_ENV_SPI_BUS=y CONFIG_ENV_SPI_BUS=0 diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index d9b59b98cdf8..45235957b4d7 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -41,8 +41,6 @@ #define USDHC2_BASE_ADDR 0x5B020000 #define USDHC3_BASE_ADDR 0x5B030000
-#define CONFIG_ENV_OVERWRITE - /* Boot M4 */ #define M4_BOOT_ENV \ "m4_0_image=m4_0.bin\0" \ diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h index 00760b8a3076..4d44b3b80137 100644 --- a/include/configs/chromebook_coral.h +++ b/include/configs/chromebook_coral.h @@ -31,9 +31,6 @@ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0"
-#define CONFIG_ENV_SECT_SIZE 0x1000 -#define CONFIG_ENV_OFFSET 0x003f8000 - #define CONFIG_TPL_TEXT_BASE 0xffff8000
#define CONFIG_SYS_NS16550_MEM32 diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 553c7fe2ea95..01f873292922 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -88,8 +88,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR #define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 */ -#define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index cb85c35e54b7..b027bea5b544 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -116,8 +116,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_ENV_OVERWRITE - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #if CONFIG_IS_ENABLED(IMX8MN_BEACON_2GB_LPDDR) diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 3d506ba37f3d..90a8fa72f1f5 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -74,7 +74,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_ENV_OVERWRITE #define CONFIG_MMCROOT "/dev/mmcblk2p2"
#define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index a10607ff66fc..31452497a4d6 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -35,15 +35,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-/* environment settings */ -#if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#elif defined(CONFIG_ENV_IS_IN_NAND) -#undef CONFIG_ENV_SIZE -#define CONFIG_ENV_SECT_SIZE (128 << 10) -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#endif - /* NAND */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index 6608b3410280..c64134792df1 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -20,9 +20,6 @@
#define CONFIG_LAST_STAGE_INIT
-/* Allow environment variable to be overwritten */ -#define CONFIG_ENV_OVERWRITE - /* Autoboot options */ #define CONFIG_RESET_TO_RETRY #define CONFIG_BOOT_RETRY_TIME -1 @@ -37,11 +34,6 @@ "ethrotate=yes\0" \ "autoload=0\0"
-/** Environment defines */ -#if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 1024 /** Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index 3a0f081046d1..26b3add722b7 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -45,9 +45,6 @@
/** Heap size for U-Boot */
-/* Allow environment variable to be overwritten */ -#define CONFIG_ENV_OVERWRITE - /* Autoboot options */ #define CONFIG_RESET_TO_RETRY #define CONFIG_BOOT_RETRY_TIME -1 @@ -70,11 +67,6 @@ # define CONFIG_SF_DEFAULT_CS 0 #endif
-/** Environment defines */ -#if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 1024 /** Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h index a24b13497516..c9d966fff676 100644 --- a/include/configs/openpiton-riscv64.h +++ b/include/configs/openpiton-riscv64.h @@ -32,12 +32,6 @@ #define CONFIG_SPL_GD_ADDR 0x85000000 #endif
-/* ------------------------------------------------- - * Environment - */ -//Disable persistent environment variable storage -#define CONFIG_ENV_IS_NOWHERE 1 - /* --------------------------------------------------------------------- * Board boot configuration */ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 4a0235de8f59..4d7072c4dbf8 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -59,8 +59,6 @@
/* Flash device info */
-/*#define CONFIG_ENV_IS_IN_SPI_FLASH*/ - #ifndef CONFIG_SPL_BUILD #define CONFIG_MTD_PARTITIONS #define MTDIDS_DEFAULT "nor0=ff705000.spi.0" diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 4573093d4ca4..0a4cd84c15d9 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -122,10 +122,6 @@ * Environment is embedded in u-boot in the second sector of the flash */
-#if defined(CONFIG_CF_SBF) -#define CONFIG_ENV_IS_IN_SPI_FLASH 1 -#endif - /* Cache Configuration */ #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index aac7b5dc3877..43379cc03e5d 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -38,8 +38,6 @@ #define CONFIG_PL011_CLOCK UART_CLK #define CONFIG_PL01x_PORTS {(void *)(0x2a400000)}
-#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ - /* Support MTD */ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BASE (0x08000000) diff --git a/include/env_internal.h b/include/env_internal.h index f74927cd6419..174c3b1a79fc 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -54,7 +54,6 @@ # error "is set" # endif extern unsigned long nand_env_oob_offset; -# define CONFIG_ENV_OFFSET nand_env_oob_offset # endif /* CONFIG_ENV_OFFSET_OOB */ #endif /* CONFIG_ENV_IS_IN_NAND */
On Sun, Nov 07, 2021 at 10:59:38PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_ENV_IS_IN_SPI_FLASH CONFIG_ENV_IS_NOWHERE CONFIG_ENV_OFFSET CONFIG_ENV_OVERWRITE CONFIG_ENV_SECT_SIZE CONFIG_SYS_MMC_ENV_DEV CONFIG_SYS_MMC_ENV_PART
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_SYS_CONSOLE_IS_IN_ENV
Signed-off-by: Tom Rini trini@konsulko.com --- README | 4 ---- configs/ci20_mmc_defconfig | 1 + include/configs/ci20.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/README b/README index 7e91e34f5f3a..6442b12e3bb8 100644 --- a/README +++ b/README @@ -977,10 +977,6 @@ The following options need to be configured: whether the enumeration has succeded at high speed or full speed.
- CONFIG_SYS_CONSOLE_IS_IN_ENV - Define this if you want stdin, stdout &/or stderr to - be set to usbtty. - If you have a USB-IF assigned VendorID then you may wish to define your own vendor specific values either in BoardName.h or directly in usbd_vendor_info.h. If you don't define diff --git a/configs/ci20_mmc_defconfig b/configs/ci20_mmc_defconfig index aa2d08705d57..3c455208f5c0 100644 --- a/configs/ci20_mmc_defconfig +++ b/configs/ci20_mmc_defconfig @@ -19,6 +19,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS4,115200 rw rootwait root=/dev/mmcblk0p1" CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000" +CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y diff --git a/include/configs/ci20.h b/include/configs/ci20.h index cefc8157216d..0a7043a80c5b 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -24,7 +24,6 @@
/* NS16550-ish UARTs */ #define CONFIG_SYS_NS16550_CLK 48000000 -#define CONFIG_SYS_CONSOLE_IS_IN_ENV
/* Ethernet: davicom DM9000 */ #define CONFIG_DRIVER_DM9000 1
On Sun, Nov 07, 2021 at 10:59:39PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_SYS_CONSOLE_IS_IN_ENV
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_TRACE CONFIG_TRACE_BUFFER_SIZE CONFIG_TRACE_EARLY CONFIG_TRACE_EARLY_ADDR CONFIG_TRACE_EARLY_SIZE
Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/exynos5-common.h | 8 -------- include/configs/sandbox.h | 8 -------- 2 files changed, 16 deletions(-)
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index e4923964169f..90d095d535b0 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -14,14 +14,6 @@
#define CONFIG_EXYNOS_SPL
-#ifdef FTRACE -#define CONFIG_TRACE -#define CONFIG_TRACE_BUFFER_SIZE (16 << 20) -#define CONFIG_TRACE_EARLY_SIZE (8 << 20) -#define CONFIG_TRACE_EARLY -#define CONFIG_TRACE_EARLY_ADDR 0x50000000 -#endif - /* Enable ACE acceleration for SHA1 and SHA256 */ #define CONFIG_EXYNOS_ACE_SHA
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 24c9a84fa358..1f04b8868908 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -6,14 +6,6 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#ifdef FTRACE -#define CONFIG_TRACE -#define CONFIG_TRACE_BUFFER_SIZE (16 << 20) -#define CONFIG_TRACE_EARLY_SIZE (16 << 20) -#define CONFIG_TRACE_EARLY -#define CONFIG_TRACE_EARLY_ADDR 0x00100000 -#endif - #ifndef CONFIG_SPL_BUILD #define CONFIG_IO_TRACE #endif
On Sun, Nov 07, 2021 at 10:59:40PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_TRACE CONFIG_TRACE_BUFFER_SIZE CONFIG_TRACE_EARLY CONFIG_TRACE_EARLY_ADDR CONFIG_TRACE_EARLY_SIZE
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_MISC_INIT_F CONFIG_MISC_INIT_R
Signed-off-by: Tom Rini trini@konsulko.com --- configs/kmcent2_defconfig | 1 + configs/ls1088aqds_tfa_defconfig | 1 + configs/sama5d2_icp_mmc_defconfig | 1 + configs/sama5d2_icp_qspiflash_defconfig | 1 + configs/socfpga_secu1_defconfig | 1 + include/configs/kmcent2.h | 1 - include/configs/ls1088aqds.h | 4 ---- include/configs/sama5d2_icp.h | 2 -- include/configs/socfpga_arria5_secu1.h | 3 --- 9 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig index 66262d5e5f53..213a03e7323b 100644 --- a/configs/kmcent2_defconfig +++ b/configs/kmcent2_defconfig @@ -17,6 +17,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_LAST_STAGE_INIT=y +CONFIG_MISC_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_DM=y CONFIG_CMD_I2C=y diff --git a/configs/ls1088aqds_tfa_defconfig b/configs/ls1088aqds_tfa_defconfig index 4f0bfa6c48c1..42c29f279d79 100644 --- a/configs/ls1088aqds_tfa_defconfig +++ b/configs/ls1088aqds_tfa_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_USE_BOOTCOMMAND is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_MISC_INIT_R=y CONFIG_CMD_GREPENV=y CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5 CONFIG_CMD_MEMINFO=y diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig index f821dcd26273..2e699a71807f 100644 --- a/configs/sama5d2_icp_mmc_defconfig +++ b/configs/sama5d2_icp_mmc_defconfig @@ -30,6 +30,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_MISC_INIT_R=y CONFIG_SPL_DISPLAY_PRINT=y # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set CONFIG_SPL_RAM_SUPPORT=y diff --git a/configs/sama5d2_icp_qspiflash_defconfig b/configs/sama5d2_icp_qspiflash_defconfig index 153c9e468263..7722a5e89376 100644 --- a/configs/sama5d2_icp_qspiflash_defconfig +++ b/configs/sama5d2_icp_qspiflash_defconfig @@ -25,6 +25,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlycon earlyprintk=serial,ttyS0, ignore_loglevel root=/dev/mmcblk0p2 memtest=0 rootfstype=ext4 rw rootwait" CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CONFIG=y CONFIG_CMD_BOOTZ=y diff --git a/configs/socfpga_secu1_defconfig b/configs/socfpga_secu1_defconfig index 7bcc8899914d..db4800684211 100644 --- a/configs/socfpga_secu1_defconfig +++ b/configs/socfpga_secu1_defconfig @@ -26,6 +26,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_MISC_INIT_R=y CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK=y # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 91b50cb29af5..6aa26bcb032b 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -335,7 +335,6 @@ #define CONFIG_SYS_CS2_FTIM2 SYS_QRIO_FTIM2 #define CONFIG_SYS_CS2_FTIM3 SYS_QRIO_FTIM3
-#define CONFIG_MISC_INIT_F #define CONFIG_HWCONFIG
/* define to use L1 as initial stack */ diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 8923e3295770..9b26fbc354e4 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -13,10 +13,6 @@ unsigned long get_board_sys_clk(void); #endif
-#ifdef CONFIG_TFABOOT -#define CONFIG_MISC_INIT_R -#endif - #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_QIXIS_I2C_ACCESS #define SYS_NO_FLASH diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h index e7ccfeaef74c..53113f037993 100644 --- a/include/configs/sama5d2_icp.h +++ b/include/configs/sama5d2_icp.h @@ -14,8 +14,6 @@ #undef CONFIG_SYS_AT91_MAIN_CLOCK #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
-#define CONFIG_MISC_INIT_R - /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index fc1d451b8f8e..21e70c282a7e 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -9,9 +9,6 @@ #include <asm/arch/base_addr_ac5.h> #include <linux/stringify.h>
-/* Call misc_init_r */ -#define CONFIG_MISC_INIT_R - #define CONFIG_HUSH_INIT_VAR /* Eternal oscillator */ #define CONFIG_SYS_TIMER_RATE 40000000
On Sun, Nov 07, 2021 at 10:59:41PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_MISC_INIT_F CONFIG_MISC_INIT_R
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_PHYLIB CONFIG_PHY_ATHEROS CONFIG_PHY_GIGE CONFIG_MII
Signed-off-by: Tom Rini trini@konsulko.com --- configs/brppt2_defconfig | 1 + configs/imx8mq_evk_defconfig | 2 ++ configs/imx8mq_phanbell_defconfig | 3 +++ configs/ls1088aqds_defconfig | 1 + configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088aqds_qspi_defconfig | 1 + configs/ls1088aqds_sdcard_ifc_defconfig | 1 + configs/ls1088aqds_sdcard_qspi_defconfig | 1 + configs/ls1088aqds_tfa_defconfig | 1 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_qspi_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_defconfig | 1 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_tfa_defconfig | 1 + configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2162aqds_tfa_defconfig | 1 + configs/lx2162aqds_tfa_verified_boot_defconfig | 1 + configs/m53menlo_defconfig | 1 + configs/pico-imx6_defconfig | 1 + configs/pico-imx8mq_defconfig | 4 ++++ include/configs/brppt2.h | 1 - include/configs/imx8mq_evk.h | 2 -- include/configs/imx8mq_phanbell.h | 4 ---- include/configs/ls1088aqds.h | 1 - include/configs/ls1088ardb.h | 1 - include/configs/lx2160aqds.h | 1 - include/configs/lx2160ardb.h | 1 - include/configs/lx2162aqds.h | 1 - include/configs/m53menlo.h | 1 - include/configs/pico-imx6.h | 1 - include/configs/pico-imx8mq.h | 5 ----- 37 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig index 3f5467c81430..ddcf8ee7f0cc 100644 --- a/configs/brppt2_defconfig +++ b/configs/brppt2_defconfig @@ -85,6 +85,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y CONFIG_PHY_FIXED=y CONFIG_FEC_MXC=y +CONFIG_MII=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index b0af4122dfef..b02d9c1d758a 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -56,7 +56,9 @@ CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y +CONFIG_PHY_GIGE=y CONFIG_FEC_MXC=y +CONFIG_MII=y CONFIG_PHY=y CONFIG_PHY_IMX8MQ_USB=y CONFIG_PINCTRL=y diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig index 3de517c0865e..4b7fafe788d5 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -58,8 +58,11 @@ CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y +CONFIG_PHYLIB=y CONFIG_DM_ETH=y +CONFIG_PHY_GIGE=y CONFIG_FEC_MXC=y +CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_SPL_POWER_LEGACY=y diff --git a/configs/ls1088aqds_defconfig b/configs/ls1088aqds_defconfig index c389888417da..51e5622226bd 100644 --- a/configs/ls1088aqds_defconfig +++ b/configs/ls1088aqds_defconfig @@ -66,6 +66,7 @@ CONFIG_PHYLIB_10G=y CONFIG_PHY_REALTEK=y CONFIG_PHY_TERANETICS=y CONFIG_PHY_VITESSE=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_NVME=y diff --git a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig index 99e6032296b8..f108c3866985 100644 --- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig @@ -62,6 +62,7 @@ CONFIG_PHYLIB_10G=y CONFIG_PHY_REALTEK=y CONFIG_PHY_TERANETICS=y CONFIG_PHY_VITESSE=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_NVME=y diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig index db454fcbb504..37d42f35b7e2 100644 --- a/configs/ls1088aqds_qspi_defconfig +++ b/configs/ls1088aqds_qspi_defconfig @@ -65,6 +65,7 @@ CONFIG_PHYLIB_10G=y CONFIG_PHY_REALTEK=y CONFIG_PHY_TERANETICS=y CONFIG_PHY_VITESSE=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_NVME=y diff --git a/configs/ls1088aqds_sdcard_ifc_defconfig b/configs/ls1088aqds_sdcard_ifc_defconfig index dac7a5d6bacd..5a85ac40e4e1 100644 --- a/configs/ls1088aqds_sdcard_ifc_defconfig +++ b/configs/ls1088aqds_sdcard_ifc_defconfig @@ -76,6 +76,7 @@ CONFIG_PHYLIB_10G=y CONFIG_PHY_REALTEK=y CONFIG_PHY_TERANETICS=y CONFIG_PHY_VITESSE=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_NVME=y diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig index d24a02c775ae..bd43c859b2cd 100644 --- a/configs/ls1088aqds_sdcard_qspi_defconfig +++ b/configs/ls1088aqds_sdcard_qspi_defconfig @@ -75,6 +75,7 @@ CONFIG_PHYLIB_10G=y CONFIG_PHY_REALTEK=y CONFIG_PHY_TERANETICS=y CONFIG_PHY_VITESSE=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_NVME=y diff --git a/configs/ls1088aqds_tfa_defconfig b/configs/ls1088aqds_tfa_defconfig index 42c29f279d79..eeb43134204d 100644 --- a/configs/ls1088aqds_tfa_defconfig +++ b/configs/ls1088aqds_tfa_defconfig @@ -85,6 +85,7 @@ CONFIG_PHY_VITESSE=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_MDIO_MUX_I2CREG=y diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig index 62dbed8ec90e..668ec3d80fea 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig @@ -65,6 +65,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_VITESSE=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_FSL_LS_MDIO=y diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig index d06901d11adc..7953d9bb8022 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_qspi_defconfig @@ -68,6 +68,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_VITESSE=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_FSL_LS_MDIO=y diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig index b9b3f4e0a7c8..8dea9787c327 100644 --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig @@ -78,6 +78,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_VITESSE=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_FSL_LS_MDIO=y diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig index 866c6256502e..580f6a2e94ed 100644 --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_defconfig @@ -78,6 +78,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_VITESSE=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_FSL_LS_MDIO=y diff --git a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig index 99afe966eee4..1f9a15bd06a3 100644 --- a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig @@ -66,6 +66,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_VITESSE=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_FSL_LS_MDIO=y diff --git a/configs/ls1088ardb_tfa_defconfig b/configs/ls1088ardb_tfa_defconfig index 1df850a88cf1..c3542257afe9 100644 --- a/configs/ls1088ardb_tfa_defconfig +++ b/configs/ls1088ardb_tfa_defconfig @@ -72,6 +72,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_VITESSE=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y +CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y CONFIG_FSL_LS_MDIO=y diff --git a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig index aebeaffb5b11..e502f61f4d75 100644 --- a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig @@ -71,6 +71,7 @@ CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y CONFIG_E1000=y +CONFIG_MII=y CONFIG_MDIO_MUX_I2CREG=y CONFIG_FSL_LS_MDIO=y CONFIG_NVME=y diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index 0f721e566f48..98ad60abc7d1 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -78,6 +78,7 @@ CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y CONFIG_E1000=y +CONFIG_MII=y CONFIG_MDIO_MUX_I2CREG=y CONFIG_FSL_LS_MDIO=y CONFIG_NVME=y diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig index 0c00c39213d5..153b020a8791 100644 --- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -64,6 +64,7 @@ CONFIG_SYS_CORTINA_NO_FW_UPLOAD=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_E1000=y +CONFIG_MII=y CONFIG_FSL_LS_MDIO=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index 5560dcd249ca..a1524244df08 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -73,6 +73,7 @@ CONFIG_SYS_CORTINA_NO_FW_UPLOAD=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_E1000=y +CONFIG_MII=y CONFIG_FSL_LS_MDIO=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/lx2160ardb_tfa_stmm_defconfig b/configs/lx2160ardb_tfa_stmm_defconfig index 4e2ed18bca98..4cdf4112b00c 100644 --- a/configs/lx2160ardb_tfa_stmm_defconfig +++ b/configs/lx2160ardb_tfa_stmm_defconfig @@ -73,6 +73,7 @@ CONFIG_SYS_CORTINA_NO_FW_UPLOAD=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_E1000=y +CONFIG_MII=y CONFIG_FSL_LS_MDIO=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig index 3d5182a84626..b14d69426fb6 100644 --- a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig @@ -74,6 +74,7 @@ CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y CONFIG_E1000=y +CONFIG_MII=y CONFIG_MDIO_MUX_I2CREG=y CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index 377f4f56988b..be33ee0c3399 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -82,6 +82,7 @@ CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y CONFIG_E1000=y +CONFIG_MII=y CONFIG_MDIO_MUX_I2CREG=y CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y diff --git a/configs/lx2162aqds_tfa_verified_boot_defconfig b/configs/lx2162aqds_tfa_verified_boot_defconfig index 7d7a955ec1a7..3aafc74a92c7 100644 --- a/configs/lx2162aqds_tfa_verified_boot_defconfig +++ b/configs/lx2162aqds_tfa_verified_boot_defconfig @@ -83,6 +83,7 @@ CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y CONFIG_E1000=y +CONFIG_MII=y CONFIG_MDIO_MUX_I2CREG=y CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 193c63e5fbd8..48d75669cb5e 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -91,6 +91,7 @@ CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_ETH_PHY=y CONFIG_FEC_MXC=y +CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX5=y CONFIG_DM_REGULATOR=y diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig index 539074649f76..20c7d45a463b 100644 --- a/configs/pico-imx6_defconfig +++ b/configs/pico-imx6_defconfig @@ -71,6 +71,7 @@ CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y CONFIG_FEC_MXC=y CONFIG_RGMII=y +CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index 0e898365b474..c866e0e2f0b5 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -57,8 +57,12 @@ CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y +CONFIG_PHYLIB=y +CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y +CONFIG_PHY_GIGE=y CONFIG_FEC_MXC=y +CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_SPL_POWER_LEGACY=y diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 76a28dc76180..7ab7f559e3ed 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -88,7 +88,6 @@ BUR_COMMON_ENV \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Ethernet */ -#define CONFIG_MII #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_FIXED_SPEED _1000BASET #define CONFIG_ARP_TIMEOUT 1500UL diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 53fbeffb453f..464c0c3db059 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -42,14 +42,12 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_MII #define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 0 #define FEC_QUIRK_ENET_MAC
-#define CONFIG_PHY_GIGE #define IMX_FEC_BASE 0x30BE0000 #endif
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index d17f70fc4b23..c45631a362fb 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -36,17 +36,13 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_MII #define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 0 #define FEC_QUIRK_ENET_MAC
-#define CONFIG_PHY_GIGE #define IMX_FEC_BASE 0x30BE0000 - -#define CONFIG_PHYLIB #endif
#define CONFIG_MFG_ENV_SETTINGS \ diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 9b26fbc354e4..d001acfd68a5 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -535,7 +535,6 @@ unsigned long get_board_sys_clk(void); #define XQSGMII_CARD_PHY4_PORT3_ADDR 0xf
#define CONFIG_ETHPRIME "DPMAC1@xgmii" -#define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */
#endif
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index f82b618e651e..6ad1fea3c832 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -484,7 +484,6 @@ #define QSGMII2_PORT4_PHY_ADDR 0x1f
#define CONFIG_ETHPRIME "DPMAC1@xgmii" -#define CONFIG_PHY_GIGE #endif #endif
diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h index 30b044bd0072..a04bbb6e6eb0 100644 --- a/include/configs/lx2160aqds.h +++ b/include/configs/lx2160aqds.h @@ -29,7 +29,6 @@ u8 qixis_esdhc_detect_quirk(void);
/* MAC/PHY configuration */ #if defined(CONFIG_FSL_MC_ENET) -#define CONFIG_MII #define CONFIG_ETHPRIME "DPMAC17@rgmii-id" #endif
diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h index ebe5004f4409..4fd3e5483093 100644 --- a/include/configs/lx2160ardb.h +++ b/include/configs/lx2160ardb.h @@ -19,7 +19,6 @@
/* MAC/PHY configuration */ #if defined(CONFIG_FSL_MC_ENET) -#define CONFIG_MII #define CONFIG_ETHPRIME "DPMAC1@xgmii" #endif
diff --git a/include/configs/lx2162aqds.h b/include/configs/lx2162aqds.h index 7fa3c2563024..51034c1be460 100644 --- a/include/configs/lx2162aqds.h +++ b/include/configs/lx2162aqds.h @@ -33,7 +33,6 @@ u8 qixis_esdhc_detect_quirk(void);
/* MAC/PHY configuration */ #if defined(CONFIG_FSL_MC_ENET) -#define CONFIG_MII #define CONFIG_ETHPRIME "DPMAC17@rgmii-id" #endif
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 32f8e633c121..f94cf28b1353 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -75,7 +75,6 @@ #ifdef CONFIG_CMD_NET #define IMX_FEC_BASE FEC_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_MII #define CONFIG_DISCOVER_PHY #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 817e7140d854..2528d319d1f5 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -130,7 +130,6 @@ #define CONFIG_BOARD_SIZE_LIMIT 715776
/* Ethernet Configuration */ -#define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 2afcf0059d50..51858ee9343b 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -36,18 +36,13 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_MII #define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_MXC_PHYADDR 1 #define FEC_QUIRK_ENET_MAC
-#define CONFIG_PHY_GIGE #define IMX_FEC_BASE 0x30BE0000 - -#define CONFIG_PHYLIB -#define CONFIG_PHY_ATHEROS #endif
/* Initial environment variables */
On Sun, Nov 07, 2021 at 10:59:42PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_PHYLIB CONFIG_PHY_ATHEROS CONFIG_PHY_GIGE CONFIG_MII
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_I2C_EDID CONFIG_I2C_EEPROM
Signed-off-by: Tom Rini trini@konsulko.com --- README | 5 ----- configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/imx6q_logic_defconfig | 4 ++++ configs/mx6qsabrelite_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_noinst_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + configs/tools-only_defconfig | 1 + include/configs/gw_ventana.h | 1 - include/configs/imx6_logic.h | 7 ------- include/configs/nitrogen6x.h | 3 --- include/configs/sandbox.h | 2 -- 22 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/README b/README index 6442b12e3bb8..d3a47e7d85ec 100644 --- a/README +++ b/README @@ -1188,11 +1188,6 @@ The following options need to be configured:
Support drawing of RLE8-compressed bitmaps on the LCD.
- CONFIG_I2C_EDID - - Enables an 'i2c edid' command which can read EDID - information over I2C from an attached LCD display. - - MII/PHY support: CONFIG_PHY_CLOCK_FREQ (ppc4xx)
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 8d67d3f4d486..3c94c0a59279 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -145,6 +145,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_ANSI is not set CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index b1f8c9e9d567..3309c657f195 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -149,6 +149,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_ANSI is not set CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 9e388b4b4626..b64d4ae15920 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -153,6 +153,7 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_ANSI is not set CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index 91394a5a93d3..96736f91490a 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -74,6 +74,10 @@ CONFIG_BOUNCE_BUFFER=y CONFIG_PCF8575_GPIO=y CONFIG_LED=y CONFIG_LED_GPIO=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x0 +CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0 CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 141ea3bb8dda..8625189294b7 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -84,6 +84,7 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 3c32edc19b59..593a43e5e797 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -85,6 +85,7 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index f02f6f80c73e..4bcc67568015 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -85,6 +85,7 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index db71f6a11fe0..76fc53d5154c 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -87,6 +87,7 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 3e77e6734c4e..fca3e5f53118 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -87,6 +87,7 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 98413f2b2591..8b720b0d6004 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -85,6 +85,7 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 66db493876a8..a9d239e9be95 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -85,6 +85,7 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index f8c021e36df4..d849989cf61c 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -220,6 +220,7 @@ CONFIG_DM_VIDEO=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index c787b54540e5..c390afe9de51 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -278,6 +278,7 @@ CONFIG_VIDEO_COPY=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_VIDEO_DSI_HOST_SANDBOX=y CONFIG_OSD=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index deced182be54..7cc76bf2713a 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -193,6 +193,7 @@ CONFIG_DM_VIDEO=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig index 043c2fb01e37..490368e768f7 100644 --- a/configs/sandbox_noinst_defconfig +++ b/configs/sandbox_noinst_defconfig @@ -213,6 +213,7 @@ CONFIG_DM_VIDEO=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 1e3ccbb98bf7..f1a54ace9bcd 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -215,6 +215,7 @@ CONFIG_DM_VIDEO=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig index 44783fd52dc3..f482c9a1c1b0 100644 --- a/configs/tools-only_defconfig +++ b/configs/tools-only_defconfig @@ -27,6 +27,7 @@ CONFIG_PCI_SANDBOX=y CONFIG_DM_RTC=y CONFIG_SOUND=y CONFIG_SYSRESET=y +CONFIG_I2C_EDID=y # CONFIG_VIRTIO_MMIO is not set # CONFIG_VIRTIO_PCI is not set # CONFIG_VIRTIO_SANDBOX is not set diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 170d6a7bf0a9..abceffb42204 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -34,7 +34,6 @@
/* I2C Configs */ #define CONFIG_I2C_GSC 0 -#define CONFIG_I2C_EDID
/* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index f1b78c6751a8..766562676ccb 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -132,13 +132,6 @@ #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00500000
-/* MTD device */ - -/* DMA stuff, needed for GPMI/MXS NAND support */ - -/* EEPROM contains serial no, MAC addr and other Logic PD info */ -#define CONFIG_I2C_EEPROM - /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 603299687f6b..1a1c08bd3087 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -15,9 +15,6 @@
#define CONFIG_MXC_UART_BASE UART2_BASE
-/* I2C Configs */ -#define CONFIG_I2C_EDID - /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 1f04b8868908..d614b704715f 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -24,8 +24,6 @@
/* SPI - enable all SPI flash types for testing purposes */
-#define CONFIG_I2C_EDID - #define CONFIG_SYS_FDT_LOAD_ADDR 0x100
#define CONFIG_PHYSMEM
On Sun, Nov 07, 2021 at 10:59:43PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_I2C_EDID CONFIG_I2C_EEPROM
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Convert CONFIG_SYS_PROMPT et al to Kconfig
This converts the following to Kconfig: CONFIG_SYS_PROMPT CONFIG_SYS_PROMPT_HUSH_PS2
Signed-off-by: Tom Rini trini@konsulko.com --- configs/imx8mq_evk_defconfig | 1 + configs/s5p4418_nanopi2_defconfig | 1 + include/configs/apalis-imx8x.h | 1 - include/configs/imx8mm-cl-iot-gate.h | 1 - include/configs/imx8mm_venice.h | 1 - include/configs/imx8mn_beacon.h | 1 - include/configs/imx8mq_evk.h | 2 -- include/configs/imx8ulp_evk.h | 1 - include/configs/mx7ulp_evk.h | 1 - include/configs/octeontx2_common.h | 3 --- include/configs/octeontx_common.h | 3 --- include/configs/s5p4418_nanopi2.h | 9 --------- 12 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index b02d9c1d758a..cf6068c0f4d8 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig index eaf319e58a2a..fa59cfd06923 100644 --- a/configs/s5p4418_nanopi2_defconfig +++ b/configs/s5p4418_nanopi2_defconfig @@ -25,6 +25,7 @@ CONFIG_BOOTDELAY=1 CONFIG_ARCH_MISC_INIT=y CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="nanopi2# " CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index 5b00a3c7e0b9..50dae2d8e05a 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -113,7 +113,6 @@ #define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 GB */
/* Monitor Command Prompt */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index caab69ab2ae4..6868b8048499 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -157,7 +157,6 @@ #define CONFIG_MXC_UART_BASE UART3_BASE_ADDR
/* Monitor Command Prompt */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 63f02bfd01e8..f8d41425c6fa 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -96,7 +96,6 @@ #define CONFIG_MXC_UART_BASE UART2_BASE_ADDR
/* Monitor Command Prompt */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index b027bea5b544..f89836cd2a8b 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -127,7 +127,6 @@ #define CONFIG_MXC_UART_BASE UART2_BASE_ADDR
/* Monitor Command Prompt */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 464c0c3db059..fa1f29f27434 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -93,8 +93,6 @@ #define CONFIG_MXC_UART_BASE UART1_BASE_ADDR
/* Monitor Command Prompt */ -#undef CONFIG_SYS_PROMPT -#define CONFIG_SYS_PROMPT "u-boot=> " #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 90a8fa72f1f5..501f465b9e75 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -81,7 +81,6 @@ #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */
/* Monitor Command Prompt */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 6d7f09e2885e..4046c3fbf732 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -26,7 +26,6 @@ #define LPUART_BASE LPUART4_RBASE
/* Miscellaneous configurable options */ -#define CONFIG_SYS_PROMPT "=> " #define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 256 diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index c64134792df1..6f3e2cae937c 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -42,9 +42,6 @@
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 8192
-#undef CONFIG_SYS_PROMPT -#define CONFIG_SYS_PROMPT env_get("prompt") - #if defined(CONFIG_MMC_OCTEONTX) #define MMC_SUPPORTS_TUNING /** EMMC specific defines */ diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index 26b3add722b7..46908be32a39 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -75,9 +75,6 @@
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 8192
-#undef CONFIG_SYS_PROMPT -#define CONFIG_SYS_PROMPT env_get("prompt") - /** EMMC specific defines */ #if defined(CONFIG_MMC_OCTEONTX) #define CONFIG_SUPPORT_EMMC_RPMB diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index d22a84a50352..2e94613c37a4 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -78,15 +78,6 @@ */ /* board_init_f->init_sequence, call arch_cpu_init */
-/*----------------------------------------------------------------------- - * Miscellaneous configurable options - */ -#ifdef CONFIG_SYS_PROMPT -#undef CONFIG_SYS_PROMPT -/* Monitor Command Prompt */ -#define CONFIG_SYS_PROMPT "nanopi2# " -#endif - /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 1024 /* Print Buffer Size */
On Sun, Nov 07, 2021 at 10:59:44PM -0500, Tom Rini wrote:
Convert CONFIG_SYS_PROMPT et al to Kconfig
This converts the following to Kconfig: CONFIG_SYS_PROMPT CONFIG_SYS_PROMPT_HUSH_PS2
Signed-off-by: Tom Rini trini@konsulko.com
I clearly forgot to remove the very first two lines when I merged these two together, and will fix when applying.
On Sun, Nov 07, 2021 at 10:59:44PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_SYS_PROMPT CONFIG_SYS_PROMPT_HUSH_PS2
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_IMX_BOOTAUX CONFIG_IMX_THERMAL
Signed-off-by: Tom Rini trini@konsulko.com --- configs/imx8mq_cm_defconfig | 1 + configs/imx8mq_evk_defconfig | 1 + configs/imx8mq_phanbell_defconfig | 1 + configs/pico-imx8mq_defconfig | 1 + configs/seeed_npi_imx6ull_defconfig | 1 + include/configs/imx8mq_cm.h | 2 -- include/configs/imx8mq_evk.h | 2 -- include/configs/imx8mq_phanbell.h | 2 -- include/configs/npi_imx6ull.h | 2 -- include/configs/pico-imx8mq.h | 2 -- 10 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/configs/imx8mq_cm_defconfig b/configs/imx8mq_cm_defconfig index cf01e8dcd059..907b1d2f1587 100644 --- a/configs/imx8mq_cm_defconfig +++ b/configs/imx8mq_cm_defconfig @@ -17,6 +17,7 @@ CONFIG_TARGET_IMX8MQ_CM=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL=y +CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x40480000 CONFIG_FIT=y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index cf6068c0f4d8..92aae70d4a4c 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -18,6 +18,7 @@ CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y +CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x40480000 CONFIG_FIT=y diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig index 4b7fafe788d5..72ff17f93e46 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -19,6 +19,7 @@ CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y +CONFIG_IMX_BOOTAUX=y CONFIG_SYS_LOAD_ADDR=0x40480000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index c866e0e2f0b5..419537090f50 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -18,6 +18,7 @@ CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y +CONFIG_IMX_BOOTAUX=y CONFIG_SYS_LOAD_ADDR=0x40480000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 diff --git a/configs/seeed_npi_imx6ull_defconfig b/configs/seeed_npi_imx6ull_defconfig index f08542aa2d4f..6489e8bc61aa 100644 --- a/configs/seeed_npi_imx6ull_defconfig +++ b/configs/seeed_npi_imx6ull_defconfig @@ -66,5 +66,6 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_MXC_UART=y +CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 9b786620ce37..7206c08a8c9b 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -88,8 +88,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_IMX_BOOTAUX - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index fa1f29f27434..49a9526d96ee 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -99,8 +99,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_IMX_BOOTAUX - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index c45631a362fb..0366c113e3d3 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -143,8 +143,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_IMX_BOOTAUX - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 31452497a4d6..eb32d83e114b 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -52,8 +52,6 @@ #define CONFIG_ETHPRIME "eth0" #endif
-#define CONFIG_IMX_THERMAL - #define CONFIG_FEC_ENET_DEV 1
#define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 51858ee9343b..5c1b65207e09 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -122,8 +122,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_IMX_BOOTAUX - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
On Sun, Nov 07, 2021 at 10:59:45PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_IMX_BOOTAUX CONFIG_IMX_THERMAL
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_MX6 CONFIG_MX7
Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/mx6_common.h | 4 ---- include/configs/mx7_common.h | 4 ---- 2 files changed, 8 deletions(-)
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 983402f7df8b..0ae8305c592e 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -27,10 +27,6 @@ #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h>
-#ifndef CONFIG_MX6 -#define CONFIG_MX6 -#endif - #define CONFIG_SYS_FSL_CLK
/* Miscellaneous configurable options */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 32b44fe92412..ffe8c758dd26 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -13,10 +13,6 @@ #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h>
-#ifndef CONFIG_MX7 -#define CONFIG_MX7 -#endif - /* Timer settings */ #define CONFIG_MXC_GPT_HCLK #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
On Sun, Nov 07, 2021 at 10:59:46PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_MX6 CONFIG_MX7
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_MD5
Signed-off-by: Tom Rini trini@konsulko.com --- configs/SBx81LIFKW_defconfig | 1 + configs/SBx81LIFXCAT_defconfig | 1 + include/configs/SBx81LIFKW.h | 1 - include/configs/SBx81LIFXCAT.h | 1 - 4 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index 16690164175e..8988ed9e96a1 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -58,3 +58,4 @@ CONFIG_RTC_MV=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y +CONFIG_MD5=y diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig index 3858143435a9..cd491c4fee7f 100644 --- a/configs/SBx81LIFXCAT_defconfig +++ b/configs/SBx81LIFXCAT_defconfig @@ -60,3 +60,4 @@ CONFIG_MII=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y +CONFIG_MD5=y diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index 4ecff1606c43..bf9f26ea9996 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -16,7 +16,6 @@ /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000
-#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ #define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ #define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 */ #define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 4e9f0395ab92..71394aea22c6 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -16,7 +16,6 @@ /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000
-#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ #define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ #define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 */ #define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
On Sun, Nov 07, 2021 at 10:59:47PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_MD5
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_MACB
Signed-off-by: Tom Rini trini@konsulko.com --- configs/axm_defconfig | 2 +- configs/corvus_defconfig | 2 +- configs/ethernut5_defconfig | 2 ++ configs/gurnard_defconfig | 2 +- configs/meesc_dataflash_defconfig | 1 + configs/meesc_defconfig | 1 + configs/smartweb_defconfig | 2 +- configs/snapper9260_defconfig | 2 ++ configs/snapper9g20_defconfig | 2 ++ configs/taurus_defconfig | 2 +- configs/usb_a9263_dataflash_defconfig | 1 + configs/vinco_defconfig | 1 + drivers/net/Kconfig | 1 - include/configs/corvus.h | 1 - include/configs/ethernut5.h | 1 - include/configs/meesc.h | 1 - include/configs/smartweb.h | 1 - include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/taurus.h | 1 - include/configs/usb_a9263.h | 1 - include/configs/vinco.h | 1 - 22 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 78449a59db14..518e6d44c08d 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -81,7 +81,7 @@ CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000 CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHYLIB=y +CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_SPECIFY_CONSOLE_INDEX=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index a3f144da3078..2f3803a05828 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -67,7 +67,7 @@ CONFIG_SYS_NAND_PAGE_SIZE=0x800 CONFIG_SYS_NAND_OOBSIZE=0x40 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000 -CONFIG_PHYLIB=y +CONFIG_MACB=y CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 0faeb63a583a..1cf38b8d77b1 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_DHCP=y CONFIG_CMD_RARP=y CONFIG_CMD_MII=y +# CONFIG_CMD_MDIO is not set CONFIG_CMD_PING=y CONFIG_CMD_CDP=y CONFIG_CMD_SNTP=y @@ -69,6 +70,7 @@ CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_DATAFLASH=y +CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_RTC_PCF8563=y diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index 35a2d2ea6052..7c7974c123c1 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -43,7 +43,7 @@ CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_ATMEL_NAND_HWECC=y -CONFIG_PHYLIB=y +CONFIG_MACB=y CONFIG_ATMEL_USART=y CONFIG_TIMER=y CONFIG_ATMEL_PIT_TIMER=y diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig index e36be6eebbad..6fda013ab12f 100644 --- a/configs/meesc_dataflash_defconfig +++ b/configs/meesc_dataflash_defconfig @@ -40,6 +40,7 @@ CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_DATAFLASH=y +CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig index 887f481c07e3..cc7697bb2dda 100644 --- a/configs/meesc_defconfig +++ b/configs/meesc_defconfig @@ -40,6 +40,7 @@ CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_DATAFLASH=y +CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 712e517a4717..af6e9257acb6 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -69,7 +69,7 @@ CONFIG_SYS_NAND_PAGE_SIZE=0x800 CONFIG_SYS_NAND_OOBSIZE=0x40 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000 -CONFIG_PHYLIB=y +CONFIG_MACB=y CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 4a2527c08e4f..4b3267e504ca 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y +# CONFIG_CMD_MDIO is not set CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_OVERWRITE=y @@ -44,4 +45,5 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y +CONFIG_MACB=y CONFIG_ATMEL_USART=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index a905359eb8ca..3674c8f2c6f7 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y +# CONFIG_CMD_MDIO is not set CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_OVERWRITE=y @@ -43,4 +44,5 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y +CONFIG_MACB=y CONFIG_ATMEL_USART=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 1720e1de4270..eaede092f853 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -87,7 +87,7 @@ CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000 CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHYLIB=y +CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_SPECIFY_CONSOLE_INDEX=y diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index 5bf0e7535380..f1385147ed94 100644 --- a/configs/usb_a9263_dataflash_defconfig +++ b/configs/usb_a9263_dataflash_defconfig @@ -47,6 +47,7 @@ CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_DATAFLASH=y +CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index e90e362a4099..053702b206e8 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -36,6 +36,7 @@ CONFIG_AT91_GPIO=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=50000000 +CONFIG_MACB=y CONFIG_PHY_SMSC=y CONFIG_ETH_DESIGNWARE=y CONFIG_ATMEL_USART=y diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 6c12959f3794..37ff9315afc0 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -440,7 +440,6 @@ config MVPP2
config MACB bool "Cadence MACB/GEM Ethernet Interface" - depends on DM_ETH select PHYLIB help The Cadence MACB ethernet interface is found on many Atmel diff --git a/include/configs/corvus.h b/include/configs/corvus.h index f0e5bcefe39e..882cb48ecaab 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -70,7 +70,6 @@ #endif
/* Ethernet */ -#define CONFIG_MACB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_AT91_WANTS_COMMON_PHY diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 80108fc89957..c0bdfd3f8f14 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -60,7 +60,6 @@
/* Ethernet */ #define CONFIG_NET_RETRY_COUNT 20 -#define CONFIG_MACB #define CONFIG_RMII #define CONFIG_PHY_ID 0 #define CONFIG_MACB_SEARCH_PHY diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 3457c598857d..55f64b559c75 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -72,7 +72,6 @@ #endif
/* Ethernet */ -#define CONFIG_MACB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #undef CONFIG_RESET_PHY_R diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index f43304d8448b..7ce3aeafe3c1 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -85,7 +85,6 @@ * Ethernet configuration * */ -#define CONFIG_MACB #define CONFIG_RMII /* use reduced MII inteface */ #define CONFIG_NET_RETRY_COUNT 20 /* # of DHCP/BOOTP retries */ #define CONFIG_AT91_WANTS_COMMON_PHY diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 32abeb03fb49..10f8fde8d583 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
/* Ethernet */ -#define CONFIG_MACB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_RESET_PHY_R diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index b13584da51c8..de918e768033 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8
/* Ethernet */ -#define CONFIG_MACB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_RESET_PHY_R diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 1dd78238947f..e4609b5c8971 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -68,7 +68,6 @@ #endif
/* Ethernet */ -#define CONFIG_MACB #define CONFIG_RMII #define CONFIG_AT91_WANTS_COMMON_PHY
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index c12e53690d0f..49895e7ab30e 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -48,7 +48,6 @@ #endif
/* Ethernet */ -#define CONFIG_MACB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_AT91_WANTS_COMMON_PHY diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 7397d3e8b3e7..b353c372efe9 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -51,7 +51,6 @@ /* USB device */
/* Ethernet Hardware */ -#define CONFIG_MACB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_MACB_SEARCH_PHY
On Sun, Nov 07, 2021 at 10:59:48PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_MACB
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_PL011_SERIAL CONFIG_PL01X_SERIAL
Signed-off-by: Tom Rini trini@konsulko.com --- README | 4 ---- configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2162aqds_tfa_defconfig | 1 + configs/lx2162aqds_tfa_verified_boot_defconfig | 1 + include/configs/lx2160a_common.h | 1 - include/configs/synquacer.h | 1 - 11 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/README b/README index d3a47e7d85ec..d0f775033920 100644 --- a/README +++ b/README @@ -605,10 +605,6 @@ The following options need to be configured: controller register space
- Serial Ports: - CONFIG_PL011_SERIAL - - Define this if you want support for Amba PrimeCell PL011 UARTs. - CONFIG_PL011_CLOCK
If you have Amba PrimeCell PL011 UARTs, set this variable to diff --git a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig index e502f61f4d75..261154b5e69a 100644 --- a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig @@ -82,6 +82,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y +CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index 98ad60abc7d1..ddcf6812550e 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -89,6 +89,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y +CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig index 153b020a8791..a8af79028693 100644 --- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -74,6 +74,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y +CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_NXP_FSPI=y diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index a1524244df08..d81a4b10b149 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -83,6 +83,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y +CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_NXP_FSPI=y diff --git a/configs/lx2160ardb_tfa_stmm_defconfig b/configs/lx2160ardb_tfa_stmm_defconfig index 4cdf4112b00c..1d6ed4414028 100644 --- a/configs/lx2160ardb_tfa_stmm_defconfig +++ b/configs/lx2160ardb_tfa_stmm_defconfig @@ -83,6 +83,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y +CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_NXP_FSPI=y diff --git a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig index b14d69426fb6..bb96c6ff2f34 100644 --- a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig @@ -83,6 +83,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y +CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index be33ee0c3399..a3448c84561d 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -91,6 +91,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y +CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/lx2162aqds_tfa_verified_boot_defconfig b/configs/lx2162aqds_tfa_verified_boot_defconfig index 3aafc74a92c7..0adaf2642cb0 100644 --- a/configs/lx2162aqds_tfa_verified_boot_defconfig +++ b/configs/lx2162aqds_tfa_verified_boot_defconfig @@ -92,6 +92,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y +CONFIG_PL01X_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index a9d826b87ae1..7173fe6ba656 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -55,7 +55,6 @@ #define COUNTER_FREQUENCY 25000000 /* 25MHz */
/* Serial Port */ -#define CONFIG_PL01X_SERIAL #define CONFIG_PL011_CLOCK (get_bus_freq(0) / 4) #define CONFIG_SYS_SERIAL0 0x21c0000 #define CONFIG_SYS_SERIAL1 0x21d0000 diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 43379cc03e5d..713eda282138 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -34,7 +34,6 @@ /* Serial (pl011) */ #define UART_CLK (62500000) #define CONFIG_SERIAL_MULTI -#define CONFIG_PL011_SERIAL #define CONFIG_PL011_CLOCK UART_CLK #define CONFIG_PL01x_PORTS {(void *)(0x2a400000)}
On Sun, Nov 07, 2021 at 10:59:49PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_PL011_SERIAL CONFIG_PL01X_SERIAL
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This symbol has been functionally dead for a long time. Remove the last and recent re-introductions of setting it, and update the whitelist so it will not be re-introduced again.
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/arch-bcmcygnus/configs.h | 1 - include/configs/p2571.h | 1 - include/configs/synquacer.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 4 deletions(-)
diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h index bf05cb3a72ad..27f30d1d2e20 100644 --- a/arch/arm/include/asm/arch-bcmcygnus/configs.h +++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h @@ -17,7 +17,6 @@
#define CONFIG_SYS_NS16550_CLK 100000000 #define CONFIG_SYS_NS16550_CLK_DIV 54 -#define CONFIG_SERIAL_MULTI #define CONFIG_SYS_NS16550_COM3 0x18023000
/* Ethernet */ diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 0b3183a67ddb..5a89dc8a4a35 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -15,7 +15,6 @@ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2571"
/* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA
/* Environment in eMMC, at the end of 2nd "boot sector" */ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 713eda282138..28f546376372 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -33,7 +33,6 @@
/* Serial (pl011) */ #define UART_CLK (62500000) -#define CONFIG_SERIAL_MULTI #define CONFIG_PL011_CLOCK UART_CLK #define CONFIG_PL01x_PORTS {(void *)(0x2a400000)}
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6792e284a148..b8f7a6162429 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1076,7 +1076,6 @@ CONFIG_SEC_FW_SIZE CONFIG_SERIAL_BOOT CONFIG_SERIAL_FLASH CONFIG_SERIAL_HW_FLOW_CONTROL -CONFIG_SERIAL_MULTI CONFIG_SERIAL_SOFTWARE_FIFO CONFIG_SERIRQ_CONTINUOUS_MODE CONFIG_SERVERIP
On Sun, Nov 07, 2021 at 10:59:50PM -0500, Tom Rini wrote:
This symbol has been functionally dead for a long time. Remove the last and recent re-introductions of setting it, and update the whitelist so it will not be re-introduced again.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_LAST_STAGE_INIT
Signed-off-by: Tom Rini trini@konsulko.com --- configs/cortina_presidio-asic-base_defconfig | 1 + configs/cortina_presidio-asic-emmc_defconfig | 1 + configs/cortina_presidio-asic-pnand_defconfig | 1 + configs/octeontx2_95xx_defconfig | 1 + configs/octeontx2_96xx_defconfig | 1 + include/configs/octeontx2_common.h | 2 -- include/configs/presidio_asic.h | 3 --- 7 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configs/cortina_presidio-asic-base_defconfig b/configs/cortina_presidio-asic-base_defconfig index 947cfa223392..426c3388b3ca 100644 --- a/configs/cortina_presidio-asic-base_defconfig +++ b/configs/cortina_presidio-asic-base_defconfig @@ -14,6 +14,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon=serial,0xf4329148 console=ttyS0,115200 root=/dev/ram0" CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_SYS_PROMPT="G3#" CONFIG_CMD_WDT=y CONFIG_CMD_CACHE=y diff --git a/configs/cortina_presidio-asic-emmc_defconfig b/configs/cortina_presidio-asic-emmc_defconfig index 9d5921a95370..a96e251dc52e 100644 --- a/configs/cortina_presidio-asic-emmc_defconfig +++ b/configs/cortina_presidio-asic-emmc_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_LOAD_ADDR=0x10000000 CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_SYS_PROMPT="G3#" CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y diff --git a/configs/cortina_presidio-asic-pnand_defconfig b/configs/cortina_presidio-asic-pnand_defconfig index eb15b379af73..86947507efd5 100644 --- a/configs/cortina_presidio-asic-pnand_defconfig +++ b/configs/cortina_presidio-asic-pnand_defconfig @@ -14,6 +14,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon=serial,0xf4329148 console=ttyS0,115200 root=/dev/ram0" CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_SYS_PROMPT="G3#" CONFIG_CMD_MTD=y CONFIG_CMD_WDT=y diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig index de5ce1cb28b1..e1b86a5a8b69 100644 --- a/configs/octeontx2_95xx_defconfig +++ b/configs/octeontx2_95xx_defconfig @@ -24,6 +24,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e028000000 maxcpus=6 rootwait rw root=/dev/mmcblk0p2 coherent_pool=16M" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Marvell> " # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig index 011bc796ab43..ec03d959771b 100644 --- a/configs/octeontx2_96xx_defconfig +++ b/configs/octeontx2_96xx_defconfig @@ -24,6 +24,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e028000000 maxcpus=24 rootwait rw root=/dev/mmcblk0p2 coherent_pool=16M" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Marvell> " # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index 6f3e2cae937c..bc21b795cf6b 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -18,8 +18,6 @@ /** Stack starting address */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0xffff0)
-#define CONFIG_LAST_STAGE_INIT - /* Autoboot options */ #define CONFIG_RESET_TO_RETRY #define CONFIG_BOOT_RETRY_TIME -1 diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index 8d689d9e4be1..3df51437ca24 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -43,9 +43,6 @@ /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE
-/* Miscellaneous configurable options */ -#define CONFIG_LAST_STAGE_INIT - /* SDRAM Bank #1 */ #define DDR_BASE 0x00000000 #define PHYS_SDRAM_1 DDR_BASE
On Sun, Nov 07, 2021 at 10:59:51PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_LAST_STAGE_INIT
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
On Sun, Nov 07, 2021 at 10:59:32PM -0500, Tom Rini wrote:
This converts the following to Kconfig: CONFIG_ARCH_CPU_INIT
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (1)
-
Tom Rini