* [PATCH 1/7] am33xx: musb: Remove unused configuration logic
@ 2022-03-22 1:33 Tom Rini
2022-03-22 1:33 ` [PATCH 2/7] CI: Update unmigrated symbol check Tom Rini
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-22 1:33 UTC (permalink / raw)
To: u-boot
At this point DM and OF_CONTROL are used to configure how the USB ports
are enabled, with the exception of in SPL and no SPL_OF_CONTROL. Remove
a bunch of now unused logic to simplify the code.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-omap2/am33xx/board.c | 82 +++---------------------------
1 file changed, 6 insertions(+), 76 deletions(-)
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 5175eb01cbe9..7f1b84e466da 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -207,10 +207,8 @@ int cpu_mmc_init(struct bd_info *bis)
#define RTC_BOARD_TYPE_SHIFT 16
/* AM33XX has two MUSB controllers which can be host or gadget */
-#if (defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST)) && \
- (defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1)) && \
- (!CONFIG_IS_ENABLED(DM_USB) || !CONFIG_IS_ENABLED(OF_CONTROL)) && \
- (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_MUSB_NEW))
+#if (defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1)) && \
+ defined(CONFIG_SPL_BUILD)
static struct musb_hdrc_config musb_config = {
.multipoint = 1,
@@ -219,7 +217,7 @@ static struct musb_hdrc_config musb_config = {
.ram_bits = 12,
};
-#if CONFIG_IS_ENABLED(DM_USB) && !CONFIG_IS_ENABLED(OF_CONTROL)
+#ifdef CONFIG_AM335X_USB0
static struct ti_musb_plat usb0 = {
.base = (void *)USB0_OTG_BASE,
.ctrl_mod_base = &((struct ctrl_dev *)CTRL_DEVICE_BASE)->usb_ctrl0,
@@ -229,7 +227,9 @@ static struct ti_musb_plat usb0 = {
.platform_ops = &musb_dsps_ops,
},
};
+#endif
+#ifdef CONFIG_AM335X_USB1
static struct ti_musb_plat usb1 = {
.base = (void *)USB1_OTG_BASE,
.ctrl_mod_base = &((struct ctrl_dev *)CTRL_DEVICE_BASE)->usb_ctrl1,
@@ -239,6 +239,7 @@ static struct ti_musb_plat usb1 = {
.platform_ops = &musb_dsps_ops,
},
};
+#endif
U_BOOT_DRVINFOS(am33xx_usbs) = {
#ifdef CONFIG_AM335X_USB0_PERIPHERAL
@@ -257,77 +258,6 @@ int arch_misc_init(void)
{
return 0;
}
-#else
-static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
-
-/* USB 2.0 PHY Control */
-#define CM_PHY_PWRDN (1 << 0)
-#define CM_PHY_OTG_PWRDN (1 << 1)
-#define OTGVDET_EN (1 << 19)
-#define OTGSESSENDEN (1 << 20)
-
-static void am33xx_usb_set_phy_power(u8 on, u32 *reg_addr)
-{
- if (on) {
- clrsetbits_le32(reg_addr, CM_PHY_PWRDN | CM_PHY_OTG_PWRDN,
- OTGVDET_EN | OTGSESSENDEN);
- } else {
- clrsetbits_le32(reg_addr, 0, CM_PHY_PWRDN | CM_PHY_OTG_PWRDN);
- }
-}
-
-#ifdef CONFIG_AM335X_USB0
-static void am33xx_otg0_set_phy_power(struct udevice *dev, u8 on)
-{
- am33xx_usb_set_phy_power(on, &cdev->usb_ctrl0);
-}
-
-struct omap_musb_board_data otg0_board_data = {
- .set_phy_power = am33xx_otg0_set_phy_power,
-};
-
-static struct musb_hdrc_platform_data otg0_plat = {
- .mode = CONFIG_AM335X_USB0_MODE,
- .config = &musb_config,
- .power = 50,
- .platform_ops = &musb_dsps_ops,
- .board_data = &otg0_board_data,
-};
-#endif
-
-#ifdef CONFIG_AM335X_USB1
-static void am33xx_otg1_set_phy_power(struct udevice *dev, u8 on)
-{
- am33xx_usb_set_phy_power(on, &cdev->usb_ctrl1);
-}
-
-struct omap_musb_board_data otg1_board_data = {
- .set_phy_power = am33xx_otg1_set_phy_power,
-};
-
-static struct musb_hdrc_platform_data otg1_plat = {
- .mode = CONFIG_AM335X_USB1_MODE,
- .config = &musb_config,
- .power = 50,
- .platform_ops = &musb_dsps_ops,
- .board_data = &otg1_board_data,
-};
-#endif
-
-int arch_misc_init(void)
-{
-#ifdef CONFIG_AM335X_USB0
- musb_register(&otg0_plat, &otg0_board_data,
- (void *)USB0_OTG_BASE);
-#endif
-#ifdef CONFIG_AM335X_USB1
- musb_register(&otg1_plat, &otg1_board_data,
- (void *)USB1_OTG_BASE);
-#endif
- return 0;
-}
-#endif
-
#else /* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */
int arch_misc_init(void)
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/7] CI: Update unmigrated symbol check
2022-03-22 1:33 [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
@ 2022-03-22 1:33 ` Tom Rini
2022-03-22 1:33 ` [PATCH 3/7] Finish converting CONFIG_BOOTM_NETBSD et al to Kconfig Tom Rini
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-22 1:33 UTC (permalink / raw)
To: u-boot
We need to check for config header files that #undef migrated symbols as
well.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
.azure-pipelines.yml | 6 ++++--
.gitlab-ci.yml | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 0f1a1bd86326..cf6d28cf050f 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -68,8 +68,10 @@ stages:
-e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
| sort -u > $KSYMLST
for CFG in `find include/configs -name "*.h"`; do
- grep '#define[[:blank:]]CONFIG_' $CFG | \
- sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' | \
+ (grep '#define[[:blank:]]CONFIG_' $CFG | \
+ sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ; \
+ grep '#undef[[:blank:]]CONFIG_' $CFG | \
+ sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') | \
sort -u > ${KUSEDLST} || true
NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \
cut -d , -f 3`
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 388e666ec9e3..a5a5d78a86fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,8 +129,10 @@ check for migrated symbols in board header:
-e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p'
| sort -u > $KSYMLST;
for CFG in `find include/configs -name "*.h"`; do
- grep '#define[[:blank:]]CONFIG_' $CFG |
- sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |
+ (grep '#define[[:blank:]]CONFIG_' $CFG |
+ sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ;
+ grep '#undef[[:blank:]]CONFIG_' $CFG |
+ sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') |
sort -u > ${KUSEDLST} || true;
NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} |
cut -d , -f 3`;
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/7] Finish converting CONFIG_BOOTM_NETBSD et al to Kconfig
2022-03-22 1:33 [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
2022-03-22 1:33 ` [PATCH 2/7] CI: Update unmigrated symbol check Tom Rini
@ 2022-03-22 1:33 ` Tom Rini
2022-03-22 1:33 ` [PATCH 4/7] Convert CONFIG_BCM2835_GPIO " Tom Rini
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-22 1:33 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_BOOTM_NETBSD
CONFIG_BOOTM_RTEMS
CONFIG_DESIGNWARE_WATCHDOG
CONFIG_DISPLAY_CPUINFO
CONFIG_DM_ETH
CONFIG_DM_MMC
CONFIG_DM_REGULATOR
CONFIG_DM_SPI
CONFIG_DM_SPI_FLASH
CONFIG_ISO_PARTITION
CONFIG_OF_SEPARATE
CONFIG_SPI_FLASH_WINBOND
CONFIG_SPL_ETH
CONFIG_TIMER
CONFIG_USB_DWC3
CONFIG_USB_DWC3_GADGET
CONFIG_USB_DWC3_OMAP
CONFIG_USB_DWC3_PHY_OMAP
CONFIG_USB_EHCI_TEGRA
CONFIG_USB_GADGET_DOWNLOAD
CONFIG_USB_GADGET_DUALSPEED
CONFIG_USB_GADGET_MANUFACTURER
CONFIG_USB_GADGET_PRODUCT_NUM
CONFIG_USB_GADGET_VBUS_DRAW
CONFIG_USB_GADGET_VENDOR_NUM
This catches a number of cases where board config files were #undef
various CONFIG options when building SPL, and that doesn't work. Clean
up the related comments as well.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/s5p4418_nanopi2_defconfig | 2 ++
include/config_uncmd_spl.h | 1 -
include/configs/adp-ae3xx.h | 6 ------
include/configs/adp-ag101p.h | 6 ------
include/configs/am335x_evm.h | 20 --------------------
include/configs/am335x_shc.h | 10 ----------
include/configs/am43xx_evm.h | 22 ----------------------
include/configs/chiliboard.h | 10 ----------
include/configs/display5.h | 6 ------
include/configs/imx8mm_icore_mx8mm.h | 1 -
include/configs/imx8mm_venice.h | 1 -
include/configs/imx8mn_venice.h | 1 -
include/configs/imx8mp_evk.h | 2 --
include/configs/imx8mq_evk.h | 2 --
include/configs/imx8mq_phanbell.h | 2 --
include/configs/ls1088a_common.h | 3 ---
include/configs/novena.h | 5 -----
include/configs/opos6uldev.h | 4 ----
include/configs/pico-imx8mq.h | 2 --
include/configs/rcar-gen2-common.h | 10 ----------
include/configs/s5p4418_nanopi2.h | 6 ------
include/configs/socfpga_soc64_common.h | 3 ---
include/configs/tegra-common-post.h | 10 ----------
include/configs/ti816x_evm.h | 12 ------------
include/configs/ti_omap5_common.h | 3 ---
include/configs/topic_miami.h | 8 --------
include/configs/verdin-imx8mm.h | 1 -
include/configs/verdin-imx8mp.h | 1 -
28 files changed, 2 insertions(+), 158 deletions(-)
diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig
index 0e17e759b587..02c17d010810 100644
--- a/configs/s5p4418_nanopi2_defconfig
+++ b/configs/s5p4418_nanopi2_defconfig
@@ -27,6 +27,8 @@ CONFIG_BOARD_LATE_INIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="nanopi2# "
CONFIG_CMD_BOOTZ=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_RTEMS is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h
index af7e3e49fddf..a59b9bbafbdf 100644
--- a/include/config_uncmd_spl.h
+++ b/include/config_uncmd_spl.h
@@ -13,7 +13,6 @@
#ifndef CONFIG_SPL_DM
#undef CONFIG_DM_SERIAL
#undef CONFIG_DM_I2C
-#undef CONFIG_DM_SPI
#endif
#undef CONFIG_DM_STDIO
diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index cac78479db08..e54a2b67f8e7 100644
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -17,12 +17,6 @@
#define CONFIG_SKIP_TRUNOFF_WATCHDOG
-#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-#ifdef CONFIG_OF_CONTROL
-#undef CONFIG_OF_SEPARATE
-#endif
-#endif
-
/*
* Timer
*/
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index d05a4d048f3e..bfaa7f90c003 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -19,12 +19,6 @@
#define CONFIG_MEM_REMAP
#endif
-#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-#ifdef CONFIG_OF_CONTROL
-#undef CONFIG_OF_SEPARATE
-#endif
-#endif
-
/*
* Timer
*/
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 4db04ff54e7e..e786672b83da 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -196,26 +196,6 @@
#endif
#endif /* !CONFIG_MTD_RAW_NAND */
-/*
- * For NOR boot, we must set this to the start of where NOR is mapped
- * in memory.
- */
-
-/*
- * Disable MMC DM for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_MMC
-#undef CONFIG_TIMER
-#endif
-
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
-/* Remove other SPL modes. */
-/* disable host part of MUSB in SPL */
-/* disable EFI partitions and partition UUID support */
-#endif
-
/* USB Device Firmware Update support */
#ifndef CONFIG_SPL_BUILD
#define DFUARGS \
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 62d64ff52256..4c8df57bdf0d 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -148,14 +148,4 @@
/* PMIC support */
#define CONFIG_POWER_TPS65217
-/* SPL */
-
-/*
- * Disable MMC DM for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_MMC
-#undef CONFIG_TIMER
-#endif
#endif /* ! __CONFIG_AM335X_SHC_H */
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index e4bd13b47dcc..5057441f7506 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -56,28 +56,6 @@
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
#endif
-#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USB_GADGET)
-#undef CONFIG_USB_DWC3_PHY_OMAP
-#undef CONFIG_USB_DWC3_OMAP
-#undef CONFIG_USB_DWC3
-#undef CONFIG_USB_DWC3_GADGET
-
-#undef CONFIG_USB_GADGET_DOWNLOAD
-#undef CONFIG_USB_GADGET_VBUS_DRAW
-#undef CONFIG_USB_GADGET_MANUFACTURER
-#undef CONFIG_USB_GADGET_VENDOR_NUM
-#undef CONFIG_USB_GADGET_PRODUCT_NUM
-#undef CONFIG_USB_GADGET_DUALSPEED
-#endif
-
-/*
- * Disable MMC DM for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_TIMER
-#endif
-
#ifndef CONFIG_SPL_BUILD
/* USB Device Firmware Update support */
#define DFUARGS \
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index aa2a07e910f8..ad1cd864c858 100644
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -125,16 +125,6 @@
#define CONFIG_SYS_NAND_ECCSIZE 512
#define CONFIG_SYS_NAND_ECCBYTES 14
-/* NAND: SPL related configs */
-
-/*
- * Disable MMC DM for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_MMC
-#undef CONFIG_TIMER
-#endif
#if defined(CONFIG_ENV_IS_IN_NAND)
#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 72526d9bb82d..7bd653364d33 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -33,12 +33,6 @@
* 0x1F00000 - 0x2000000 : SPI.factory (1MiB)
*/
-/* SPI Flash Configs */
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_DM_SPI
-#undef CONFIG_DM_SPI_FLASH
-#endif
-
/* Below values are "dummy" - only to avoid build break */
#define CONFIG_SYS_SPI_KERNEL_OFFS 0x150000
#define CONFIG_SYS_SPI_ARGS_OFFS 0x140000
diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index d75fcf747e41..f521add5b046 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -33,7 +33,6 @@
func(MMC, mmc, 2) \
func(MMC, mmc, 0)
#include <config_distro_bootcmd.h>
-#undef CONFIG_ISO_PARTITION
#else
#define BOOTENV
#endif
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 1ec27f40f2b5..a4abf1f52819 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -41,7 +41,6 @@
func(MMC, mmc, 2) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
-#undef CONFIG_ISO_PARTITION
#else
#define BOOTENV
#endif
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index c01a590c8af6..81f9574340c3 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -38,7 +38,6 @@
func(MMC, mmc, 2) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
-#undef CONFIG_ISO_PARTITION
#else
#define BOOTENV
#endif
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index fe07a3cde626..5b185cf1de23 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -26,8 +26,6 @@
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-#undef CONFIG_DM_MMC
-
#define CONFIG_POWER_PCA9450
#endif
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 8fff3bf632e8..7389d75dceb3 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -29,8 +29,6 @@
/* For RAW image gives a error info not panic */
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-#undef CONFIG_DM_MMC
-
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
#endif
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 6919f6d660ec..f40cacaed43f 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -25,8 +25,6 @@
#define CONFIG_MALLOC_F_ADDR 0x182000
/* For RAW image gives a error info not panic */
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
-#undef CONFIG_DM_MMC
#endif
/* ENET Config */
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 121fd3cf1822..0c73a9e0dce4 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -17,7 +17,6 @@
#define SPL_NO_SATA
#define SPL_NO_QSPI
#define SPL_NO_IFC
-#undef CONFIG_DISPLAY_CPUINFO
#endif
#include <asm/arch/stream_id_lsch3.h>
@@ -131,8 +130,6 @@ unsigned long long get_qixis_addr(void);
#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128
-/* #define CONFIG_DISPLAY_CPUINFO */
-
#ifndef SPL_NO_ENV
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/novena.h b/include/configs/novena.h
index c11d13a3483a..dbde7a0ade5a 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -42,11 +42,6 @@
/* SPL */
#include "imx6_spl.h" /* common IMX6 SPL configuration */
-/* Ethernet Configuration */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_ETH
-#endif
-
/* I2C */
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_SYS_SPD_BUS_NUM 0
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index ac8eb0527569..54b1a78affb6 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -12,10 +12,6 @@
#ifdef CONFIG_SPL
#include "imx6_spl.h"
-
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_REGULATOR
-#endif
#endif
/* Miscellaneous configurable options */
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 26946cd65ac6..a7ad4f35285d 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -25,8 +25,6 @@
#define CONFIG_MALLOC_F_ADDR 0x182000
/* For RAW image gives a error info not panic */
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
-#undef CONFIG_DM_MMC
#endif
/* ENET Config */
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index f1f5d07bf81a..380156be4379 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -28,16 +28,6 @@
#define CONFIG_SYS_MONITOR_BASE 0x00000000
#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
-/* ENV setting */
-
-/* Common ENV setting */
-
-/* SF MTD */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_SPI
-#undef CONFIG_DM_SPI_FLASH
-#endif
-
/* Timer */
#define CONFIG_TMU_TIMER
#define CONFIG_SYS_TIMER_COUNTS_DOWN
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index 632fc0cc9eef..f0c72cab8346 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -88,12 +88,6 @@
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/*-----------------------------------------------------------------------
- * Etc Command definition
- */
-#undef CONFIG_BOOTM_NETBSD
-#undef CONFIG_BOOTM_RTEMS
-
/*-----------------------------------------------------------------------
* serial console configuration
*/
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index a06ac6b59687..601826d44ac8 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -137,9 +137,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
/*
* L4 Watchdog
*/
-#ifndef CONFIG_SPL_BUILD
-#undef CONFIG_DESIGNWARE_WATCHDOG
-#endif
#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS
#ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
#ifndef __ASSEMBLY__
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 7cb8d64e4400..d9d89b6d7581 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -95,14 +95,4 @@
#define CONFIG_TEGRA_SPI
#endif
-/* overrides for SPL build here */
-#ifdef CONFIG_SPL_BUILD
-
-/* remove USB */
-#ifdef CONFIG_USB_EHCI_TEGRA
-#undef CONFIG_USB_EHCI_TEGRA
-#endif
-
-#endif /* CONFIG_SPL_BUILD */
-
#endif /* __TEGRA_COMMON_POST_H */
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 05f787473a5c..c2dfdebcd5b6 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -68,16 +68,4 @@
#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \
CONFIG_SPL_TEXT_BASE)
-/* Since SPL did pll and ddr initialization for us,
- * we don't need to do it twice.
- */
-
-/*
- * Disable MMC DM for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_MMC
-#undef CONFIG_TIMER
-#endif
#endif
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 270ef9598d2d..714a1c55c7fb 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -307,8 +307,5 @@
#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \
(128 << 20))
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_TIMER
-#endif
#endif /* __CONFIG_TI_OMAP5_COMMON_H */
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index ba6c3f0cec34..f859656b396c 100644
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -17,18 +17,10 @@
/* Fixup settings */
/* SPL settings */
-#undef CONFIG_SPL_ETH
#undef CONFIG_SPL_MAX_FOOTPRINT
#define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
-/* FPGA commands that we don't use */
-
-/* Extras */
-
-/* Faster flash, ours may run at 108 MHz */
-#undef CONFIG_SPI_FLASH_WINBOND
-
/* Setup proper boot sequences for Miami boards */
#if defined(CONFIG_USB_HOST)
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index de84e3b66350..9fe6231e8d25 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -42,7 +42,6 @@
func(MMC, mmc, 0) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
-#undef CONFIG_ISO_PARTITION
#else
#define BOOTENV
#endif
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 9a7dedf1ea57..9e29dc19033f 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -54,7 +54,6 @@
func(MMC, mmc, 2) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
-#undef CONFIG_ISO_PARTITION
#else
#define BOOTENV
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/7] Convert CONFIG_BCM2835_GPIO to Kconfig
2022-03-22 1:33 [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
2022-03-22 1:33 ` [PATCH 2/7] CI: Update unmigrated symbol check Tom Rini
2022-03-22 1:33 ` [PATCH 3/7] Finish converting CONFIG_BOOTM_NETBSD et al to Kconfig Tom Rini
@ 2022-03-22 1:33 ` Tom Rini
2022-03-22 1:33 ` [PATCH 5/7] Convert CONFIG_BITBANGMII_MULTI " Tom Rini
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-22 1:33 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_BCM2835_GPIO
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/rpi_0_w_defconfig | 1 +
configs/rpi_2_defconfig | 1 +
configs/rpi_3_32b_defconfig | 1 +
configs/rpi_3_b_plus_defconfig | 1 +
configs/rpi_3_defconfig | 1 +
configs/rpi_4_32b_defconfig | 1 +
configs/rpi_4_defconfig | 1 +
configs/rpi_arm64_defconfig | 1 +
configs/rpi_defconfig | 1 +
drivers/gpio/Kconfig | 4 ++++
include/configs/rpi.h | 2 --
11 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
index 195541c6e765..cd45d7259176 100644
--- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig
@@ -24,6 +24,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_TFTP_TSIZE=y
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_DM_ETH=y
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index eb63fbdd8d9c..2cbfe29cf193 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -25,6 +25,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_TFTP_TSIZE=y
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_DM_ETH=y
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index 46102899f037..d750445e3947 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -26,6 +26,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_TFTP_TSIZE=y
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_PHYLIB=y
diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
index 91b63b62721c..83e4a12c00d9 100644
--- a/configs/rpi_3_b_plus_defconfig
+++ b/configs/rpi_3_b_plus_defconfig
@@ -25,6 +25,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_TFTP_TSIZE=y
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_PHYLIB=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 528b12ea5b55..21ac2abcada3 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -25,6 +25,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_TFTP_TSIZE=y
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_PHYLIB=y
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
index 8f87a4336d22..9f550cdcde78 100644
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -29,6 +29,7 @@ CONFIG_DM_DMA=y
CONFIG_DFU_MMC=y
CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000
CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_BCM2835=y
diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
index 461a7655ab90..8a831e32a331 100644
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -29,6 +29,7 @@ CONFIG_DM_DMA=y
CONFIG_DFU_MMC=y
CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000
CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_BCM2835=y
diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
index 351d247daeb7..e499870fefd1 100644
--- a/configs/rpi_arm64_defconfig
+++ b/configs/rpi_arm64_defconfig
@@ -24,6 +24,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_TFTP_TSIZE=y
CONFIG_DM_DMA=y
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_BCM2835=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 0baef3b6abfa..53d31ab771ae 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -24,6 +24,7 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_TFTP_TSIZE=y
+CONFIG_BCM2835_GPIO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_DM_ETH=y
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index c3f110933a04..a55e36869348 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -84,6 +84,10 @@ config ALTERA_PIO
Select this to enable PIO for Altera devices. Please find
details on the "Embedded Peripherals IP User Guide" of Altera.
+config BCM2835_GPIO
+ bool "BCM2835 GPIO driver"
+ depends on DM_GPIO
+
config BCM6345_GPIO
bool "BCM6345 GPIO driver"
depends on DM_GPIO && (ARCH_BMIPS || ARCH_BCM68360 || \
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index d5e064fb3796..cc508efaf5b9 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -41,8 +41,6 @@
#endif
/* Devices */
-/* GPIO */
-#define CONFIG_BCM2835_GPIO
/* LCD */
#define CONFIG_VIDEO_BCM2835
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/7] Convert CONFIG_BITBANGMII_MULTI to Kconfig
2022-03-22 1:33 [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
` (2 preceding siblings ...)
2022-03-22 1:33 ` [PATCH 4/7] Convert CONFIG_BCM2835_GPIO " Tom Rini
@ 2022-03-22 1:33 ` Tom Rini
2022-03-22 1:33 ` [PATCH 6/7] Remove CONFIG_BOARDNAME and CONFIG_BOARD_NAME Tom Rini
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-22 1:33 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_BITBANGMII_MULTI
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/alt_defconfig | 1 +
configs/armadillo-800eva_defconfig | 1 +
configs/controlcenterdc_defconfig | 1 +
configs/gose_defconfig | 1 +
configs/grpeach_defconfig | 1 +
configs/hihope_rzg2_defconfig | 1 +
configs/koelsch_defconfig | 1 +
configs/lager_defconfig | 1 +
configs/porter_defconfig | 1 +
configs/r8a77970_eagle_defconfig | 1 +
configs/r8a77980_condor_defconfig | 1 +
configs/r8a77990_ebisu_defconfig | 1 +
configs/r8a77995_draak_defconfig | 1 +
configs/r8a779a0_falcon_defconfig | 1 +
configs/rcar3_salvator-x_defconfig | 1 +
configs/rcar3_ulcb_defconfig | 1 +
configs/rzg2_beacon_defconfig | 1 +
configs/silinux_ek874_defconfig | 1 +
configs/silk_defconfig | 1 +
configs/stout_defconfig | 1 +
drivers/net/phy/Kconfig | 4 ++++
include/configs/alt.h | 1 -
include/configs/armadillo-800eva.h | 1 -
include/configs/beacon-rzg2m.h | 3 ---
include/configs/condor.h | 4 ----
include/configs/controlcenterdc.h | 5 -----
include/configs/draak.h | 3 ---
include/configs/eagle.h | 3 ---
include/configs/ebisu.h | 3 ---
include/configs/falcon.h | 3 ---
include/configs/gose.h | 1 -
include/configs/grpeach.h | 1 -
include/configs/hihope-rzg2.h | 3 ---
include/configs/koelsch.h | 1 -
include/configs/lager.h | 1 -
include/configs/porter.h | 1 -
include/configs/salvator-x.h | 3 ---
include/configs/silinux-ek874.h | 3 ---
include/configs/silk.h | 1 -
include/configs/stout.h | 1 -
include/configs/ulcb.h | 3 ---
41 files changed, 24 insertions(+), 45 deletions(-)
diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 0930645c92bb..432f29cacae5 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -76,6 +76,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
CONFIG_DM_ETH=y
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 2f5c115d84f4..4f00b203ea12 100644
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -41,6 +41,7 @@ CONFIG_ENV_ADDR=0x40000
CONFIG_VERSION_VARIABLE=y
# CONFIG_MMC is not set
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_SMSC=y
CONFIG_SH_ETHER=y
CONFIG_SCIF_CONSOLE=y
diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index abbb5cc3d934..953364f7416e 100644
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -73,6 +73,7 @@ CONFIG_MMC_SDHCI_MV=y
CONFIG_SF_DEFAULT_BUS=1
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MARVELL=y
CONFIG_PHY_GIGE=y
CONFIG_MVNETA=y
diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index a24a8acdd9d8..1200f728e4cb 100644
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -74,6 +74,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
CONFIG_DM_ETH=y
diff --git a/configs/grpeach_defconfig b/configs/grpeach_defconfig
index 678dbd31d5cd..d37b48d9aaef 100644
--- a/configs/grpeach_defconfig
+++ b/configs/grpeach_defconfig
@@ -44,6 +44,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_MACRONIX=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_DM_ETH=y
CONFIG_SH_ETHER=y
CONFIG_PINCTRL=y
diff --git a/configs/hihope_rzg2_defconfig b/configs/hihope_rzg2_defconfig
index 109c1d66fd67..03534a078d3d 100644
--- a/configs/hihope_rzg2_defconfig
+++ b/configs/hihope_rzg2_defconfig
@@ -62,6 +62,7 @@ CONFIG_RENESAS_SDHI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_REALTEK=y
CONFIG_DM_ETH=y
CONFIG_RENESAS_RAVB=y
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index 9f9e4687eb2a..145e7bbd523f 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -74,6 +74,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
CONFIG_DM_ETH=y
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index 4cff6e834f6e..5185169a9af6 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -76,6 +76,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
CONFIG_DM_ETH=y
diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index ccf2b3f7b9fa..b54b48e83105 100644
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -74,6 +74,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig
index 70b23da174ed..4784eecb6341 100644
--- a/configs/r8a77970_eagle_defconfig
+++ b/configs/r8a77970_eagle_defconfig
@@ -58,6 +58,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig
index 194fdde812b9..34ea598a9fc4 100644
--- a/configs/r8a77980_condor_defconfig
+++ b/configs/r8a77980_condor_defconfig
@@ -59,6 +59,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig
index 0d8c9d545779..fc5fc5758771 100644
--- a/configs/r8a77990_ebisu_defconfig
+++ b/configs/r8a77990_ebisu_defconfig
@@ -77,6 +77,7 @@ CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig
index de9cfd9bab1e..e24dfeadfee1 100644
--- a/configs/r8a77995_draak_defconfig
+++ b/configs/r8a77995_draak_defconfig
@@ -70,6 +70,7 @@ CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig
index 32e218bbda2d..7a080d2a400c 100644
--- a/configs/r8a779a0_falcon_defconfig
+++ b/configs/r8a779a0_falcon_defconfig
@@ -57,6 +57,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig
index 5fb27d257af3..120b02c411c8 100644
--- a/configs/rcar3_salvator-x_defconfig
+++ b/configs/rcar3_salvator-x_defconfig
@@ -78,6 +78,7 @@ CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig
index ade9286e25d0..9c3596e5c844 100644
--- a/configs/rcar3_ulcb_defconfig
+++ b/configs/rcar3_ulcb_defconfig
@@ -79,6 +79,7 @@ CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig
index 91b3fa294816..5babd4898ab4 100644
--- a/configs/rzg2_beacon_defconfig
+++ b/configs/rzg2_beacon_defconfig
@@ -62,6 +62,7 @@ CONFIG_DM_MTD=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_ATHEROS=y
CONFIG_DM_ETH=y
CONFIG_RENESAS_RAVB=y
diff --git a/configs/silinux_ek874_defconfig b/configs/silinux_ek874_defconfig
index 5b01f1e51187..0dafb7067571 100644
--- a/configs/silinux_ek874_defconfig
+++ b/configs/silinux_ek874_defconfig
@@ -57,6 +57,7 @@ CONFIG_RENESAS_SDHI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_REALTEK=y
CONFIG_DM_ETH=y
CONFIG_RENESAS_RAVB=y
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 6ad3252005fb..fe28514dc07c 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -76,6 +76,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
CONFIG_DM_ETH=y
diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index f6982913872c..0502ae5d3067 100644
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -74,6 +74,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_BITBANGMII=y
+CONFIG_BITBANGMII_MULTI=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
CONFIG_DM_ETH=y
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index eed6eb186692..014a4de223ec 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -2,6 +2,10 @@
config BITBANGMII
bool "Bit-banged ethernet MII management channel support"
+config BITBANGMII_MULTI
+ bool "Enable the multi bus support"
+ depends on BITBANGMII
+
config MV88E6352_SWITCH
bool "Marvell 88E6352 switch support"
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 37b5800d6ef5..acc416de06bd 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -31,7 +31,6 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index d24ba2f0d62c..b7d6bf213be5 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -68,7 +68,6 @@
#define CONFIG_SH_ETHER_BASE_ADDR 0xe9a00000
#define CONFIG_SH_ETHER_SH7734_MII (0x01)
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
#define CONFIG_SH_SCIF_CLK_FREQ get_board_sys_clk()
diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h
index 7eaafb0d451a..2713b158438e 100644
--- a/include/configs/beacon-rzg2m.h
+++ b/include/configs/beacon-rzg2m.h
@@ -8,9 +8,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
#undef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 822ef7118e17..213e68f15874 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -11,9 +11,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Environment compatibility */
/* SH Ether */
@@ -23,7 +20,6 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
/* XTAL_CLK : 33.33MHz */
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index cad5796cbce6..a7d922c3a237 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -27,11 +27,6 @@
#define CONFIG_PCI_SCAN_SHOW
#endif
-/*
- * Software (bit-bang) MII driver configuration
- */
-#define CONFIG_BITBANGMII_MULTI
-
/* SPL */
/*
* Select the boot device here
diff --git a/include/configs/draak.h b/include/configs/draak.h
index c66a481dadba..5bd8740c6f84 100644
--- a/include/configs/draak.h
+++ b/include/configs/draak.h
@@ -11,9 +11,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Generic Timer Definitions (use in assembler source) */
#define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */
diff --git a/include/configs/eagle.h b/include/configs/eagle.h
index b8a7b5a91693..42fe05771676 100644
--- a/include/configs/eagle.h
+++ b/include/configs/eagle.h
@@ -11,9 +11,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Environment compatibility */
/* Board Clock */
diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h
index cbd1445636ff..ce31a462fcf2 100644
--- a/include/configs/ebisu.h
+++ b/include/configs/ebisu.h
@@ -13,9 +13,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Generic Timer Definitions (use in assembler source) */
#define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */
diff --git a/include/configs/falcon.h b/include/configs/falcon.h
index 1d6a9b9b7344..52dcf19ccad2 100644
--- a/include/configs/falcon.h
+++ b/include/configs/falcon.h
@@ -21,9 +21,6 @@
#define GICD_BASE 0xF1000000
#define GICR_BASE 0xF1060000
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Board Clock */
/* XTAL_CLK : 16.66MHz */
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 01657d7a669e..dfa139dc7dc1 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -27,7 +27,6 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index fb01c5614b6c..347845f1d501 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -28,6 +28,5 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
#endif /* __GRPEACH_H */
diff --git a/include/configs/hihope-rzg2.h b/include/configs/hihope-rzg2.h
index 68a51176e386..e46eb07a5e9d 100644
--- a/include/configs/hihope-rzg2.h
+++ b/include/configs/hihope-rzg2.h
@@ -11,9 +11,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Generic Timer Definitions (use in assembler source) */
#define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index eca8998a515b..84603e354020 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -27,7 +27,6 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 4c291aa89bef..8cabad2853c9 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -28,7 +28,6 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 867dadaedd03..661b7ea0cd2a 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -32,7 +32,6 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 1b3aa304d690..764bc1bbf292 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -11,9 +11,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Generic Timer Definitions (use in assembler source) */
#define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */
diff --git a/include/configs/silinux-ek874.h b/include/configs/silinux-ek874.h
index 25c0cd2335c6..a99babb48b0a 100644
--- a/include/configs/silinux-ek874.h
+++ b/include/configs/silinux-ek874.h
@@ -11,9 +11,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Generic Timer Definitions (use in assembler source) */
#define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 29350a635b27..fa195c62d56c 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -32,7 +32,6 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
diff --git a/include/configs/stout.h b/include/configs/stout.h
index df2d9676b5e9..f9574be3f776 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -36,7 +36,6 @@
#define CONFIG_SH_ETHER_CACHE_WRITEBACK
#define CONFIG_SH_ETHER_CACHE_INVALIDATE
#define CONFIG_SH_ETHER_ALIGNE_SIZE 64
-#define CONFIG_BITBANGMII_MULTI
/* Board Clock */
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 57e6863cc43e..c991bff0e889 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -11,9 +11,6 @@
#include "rcar-gen3-common.h"
-/* Ethernet RAVB */
-#define CONFIG_BITBANGMII_MULTI
-
/* Generic Timer Definitions (use in assembler source) */
#define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/7] Remove CONFIG_BOARDNAME and CONFIG_BOARD_NAME
2022-03-22 1:33 [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
` (3 preceding siblings ...)
2022-03-22 1:33 ` [PATCH 5/7] Convert CONFIG_BITBANGMII_MULTI " Tom Rini
@ 2022-03-22 1:33 ` Tom Rini
2022-03-22 1:33 ` [PATCH 7/7] atmel: Remove CONFIG_SPL_ATMEL_SIZE Tom Rini
2022-04-01 18:45 ` [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
6 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-22 1:33 UTC (permalink / raw)
To: u-boot
Both of these variables are used in a few hard-coded ways to set some
string values or print something to the user. In almost all cases, it's
just as useful to hard-code the value used. The exception here is
printing something closer to correct board name for p1_p2_rdb machines.
This can be done using something from the device tree, but for now
hard-code a non-CONFIG based value instead.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 11 ++++++++++-
board/ge/bx50v3/bx50v3.c | 2 +-
include/configs/T102xRDB.h | 17 +++++++++--------
include/configs/el6x_common.h | 6 +-----
include/configs/ge_bx50v3.h | 2 --
include/configs/opos6uldev.h | 9 ++++-----
include/configs/p1_p2_rdb_pc.h | 3 ---
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 19ece1229631..b6f0d2042677 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -160,6 +160,14 @@ int board_early_init_f(void)
return 0;
}
+#if defined(CONFIG_TARGET_P1020RDB_PC)
+#define BOARD_NAME "P1020RDB-PC"
+#elif defined(CONFIG_TARGET_P1020RDB_PD)
+#define BOARD_NAME "P1020RDB-PD"
+#elif defined(CONFIG_TARGET_P2020RDB)
+#define BOARD_NAME "P2020RDB-PC"
+#endif
+
int checkboard(void)
{
struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
@@ -167,7 +175,8 @@ int checkboard(void)
u8 in, out, io_config, val;
int bus_num = CONFIG_SYS_SPD_BUS_NUM;
- printf("Board: %s CPLD: V%d.%d PCBA: V%d.0\n", CONFIG_BOARDNAME,
+ /* FIXME: This should just use the model from the device tree or similar */
+ printf("Board: %s CPLD: V%d.%d PCBA: V%d.0\n", BOARD_NAME,
in_8(&cpld_data->cpld_rev_major) & 0x0F,
in_8(&cpld_data->cpld_rev_minor) & 0x0F,
in_8(&cpld_data->pcba_rev) & 0x0F);
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index ed700f4e1da5..4e9d841fe291 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -547,7 +547,7 @@ int last_stage_init(void)
int checkboard(void)
{
- printf("BOARD: %s\n", CONFIG_BOARD_NAME);
+ printf("BOARD: General Electric Bx50v3\n");
return 0;
}
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index dfb9e9120aea..a244daf0ae72 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -531,20 +531,21 @@
#define __USB_PHY_TYPE utmi
#ifdef CONFIG_ARCH_T1024
-#define CONFIG_BOARDNAME t1024rdb
-#define BANK_INTLV cs0_cs1
+#define ARCH_EXTRA_ENV_SETTINGS \
+ "bank_intlv=cs0_cs1\0" \
+ "ramdiskfile=t1024rdb/ramdisk.uboot\0" \
+ "fdtfile=t1024rdb/t1024rdb.dtb\0"
#else
-#define CONFIG_BOARDNAME t1023rdb
-#define BANK_INTLV null
+#define ARCH_EXTRA_ENV_SETTINGS \
+ "bank_intlv=null\0" \
+ "ramdiskfile=t1023rdb/ramdisk.uboot\0" \
+ "fdtfile=t1023rdb/t1023rdb.dtb\0"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
+ ARCH_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:ctlr_intlv=cacheline," \
- "bank_intlv=" __stringify(BANK_INTLV) "\0" \
"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \
- "ramdiskfile=" __stringify(CONFIG_BOARDNAME) "/ramdisk.uboot\0" \
- "fdtfile=" __stringify(CONFIG_BOARDNAME) "/" \
- __stringify(CONFIG_BOARDNAME) ".dtb\0" \
"uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \
"ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \
"bootargs=root=/dev/ram rw console=ttyS0,115200\0" \
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 4764d22520ac..bcd7b84cf382 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -10,8 +10,6 @@
#include <linux/stringify.h>
-#define CONFIG_BOARD_NAME EL6Q
-
#include "mx6_common.h"
#ifdef CONFIG_SPL
@@ -30,10 +28,8 @@
#define CONFIG_MXC_UART_BASE UART2_BASE
-#define CONFIG_BOARD_NAME EL6Q
-
#define CONFIG_EXTRA_ENV_SETTINGS \
- "board="__stringify(CONFIG_BOARD_NAME)"\0" \
+ "board=EL6Q\0" \
"cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \
"chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0" \
"console=" CONSOLE_DEV "\0" \
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 402c5bfacbe3..8d467e420f1c 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -14,8 +14,6 @@
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/gpio.h>
-#define CONFIG_BOARD_NAME "General Electric Bx50v3"
-
#include "mx6_common.h"
#include <linux/sizes.h>
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 54b1a78affb6..bb2408c1e218 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -45,18 +45,17 @@
/* Environment is stored in the eMMC boot partition */
#define CONFIG_ENV_VERSION 100
-#define CONFIG_BOARD_NAME opos6ul
#define ACFG_CONSOLE_DEV ttymxc0
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_ROOTPATH "/tftpboot/opos6ul-root"
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" __stringify(CONFIG_ENV_VERSION) "\0" \
"consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
- "board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
+ "board_name=opos6ul\0" \
"fdt_addr=0x88000000\0" \
"fdt_high=0xffffffff\0" \
- "fdt_name=" __stringify(CONFIG_BOARD_NAME) "dev\0" \
+ "fdt_name=opos6uldev\0" \
"initrd_high=0xffffffff\0" \
"ip_dyn=yes\0" \
"stdin=serial\0" \
@@ -66,7 +65,7 @@
"mmcpart=2\0" \
"mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcrootfstype=ext4 rootwait\0" \
- "kernelimg=" __stringify(CONFIG_BOARD_NAME) "-linux.bin\0" \
+ "kernelimg=opos6ul-linux.bin\0" \
"splashpos=0,0\0" \
"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 64a5269076af..a6523753d5ca 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -13,7 +13,6 @@
#include <linux/stringify.h>
#if defined(CONFIG_TARGET_P1020RDB_PC)
-#define CONFIG_BOARDNAME "P1020RDB-PC"
#define CONFIG_VSC7385_ENET
#define CONFIG_SLIC
#define __SW_BOOT_MASK 0x03
@@ -39,7 +38,6 @@
* 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off
*/
#if defined(CONFIG_TARGET_P1020RDB_PD)
-#define CONFIG_BOARDNAME "P1020RDB-PD"
#define CONFIG_VSC7385_ENET
#define CONFIG_SLIC
#define __SW_BOOT_MASK 0x03
@@ -55,7 +53,6 @@
#endif
#if defined(CONFIG_TARGET_P2020RDB)
-#define CONFIG_BOARDNAME "P2020RDB-PC"
#define CONFIG_VSC7385_ENET
#define __SW_BOOT_MASK 0x03
#define __SW_BOOT_NOR 0xc8
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 7/7] atmel: Remove CONFIG_SPL_ATMEL_SIZE
2022-03-22 1:33 [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
` (4 preceding siblings ...)
2022-03-22 1:33 ` [PATCH 6/7] Remove CONFIG_BOARDNAME and CONFIG_BOARD_NAME Tom Rini
@ 2022-03-22 1:33 ` Tom Rini
2022-04-01 18:45 ` [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
6 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-22 1:33 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
This seems to be unused in the code, remove it.
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
include/configs/at91sam9m10g45ek.h | 1 -
include/configs/corvus.h | 1 -
include/configs/pm9g45.h | 1 -
include/configs/smartweb.h | 1 -
include/configs/taurus.h | 1 -
5 files changed, 5 deletions(-)
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 1a408f835a5c..014a7c98fcc0 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -72,7 +72,6 @@
56, 57, 58, 59, 60, 61, 62, 63, }
#endif
-#define CONFIG_SPL_ATMEL_SIZE
#define CONFIG_SYS_MASTER_CLOCK 132096000
#define CONFIG_SYS_AT91_PLLA 0x20c73f03
#define CONFIG_SYS_MCKR 0x1301
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 18bb5547fa95..bb73201b54fe 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -79,7 +79,6 @@
48, 49, 50, 51, 52, 53, 54, 55, \
56, 57, 58, 59, 60, 61, 62, 63, }
-#define CONFIG_SPL_ATMEL_SIZE
#define CONFIG_SYS_MASTER_CLOCK 132096000
#define AT91_PLL_LOCK_TIMEOUT 1000000
#define CONFIG_SYS_AT91_PLLA 0x20c73f03
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 3a59045df7fe..b858aaa1ccd9 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -71,7 +71,6 @@
56, 57, 58, 59, 60, 61, 62, 63, }
#endif
-#define CONFIG_SPL_ATMEL_SIZE
#define CONFIG_SYS_MASTER_CLOCK 132096000
#define CONFIG_SYS_AT91_PLLA 0x20c73f03
#define CONFIG_SYS_MCKR 0x1301
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index a0b353902e76..7c6cc480f0ea 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -148,7 +148,6 @@
48, 49, 50, 51, 52, 53, 54, 55, \
56, 57, 58, 59, 60, 61, 62, 63, }
-#define CONFIG_SPL_ATMEL_SIZE
#define CONFIG_SYS_MASTER_CLOCK (198656000/2)
#define AT91_PLL_LOCK_TIMEOUT 1000000
#define CONFIG_SYS_AT91_PLLA 0x2060bf09
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index b0d06e7b5528..3752fefc5549 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -166,7 +166,6 @@
48, 49, 50, 51, 52, 53, 54, 55, \
56, 57, 58, 59, 60, 61, 62, 63, }
-#define CONFIG_SPL_ATMEL_SIZE
#define CONFIG_SYS_MASTER_CLOCK 132096000
#define AT91_PLL_LOCK_TIMEOUT 1000000
#define CONFIG_SYS_AT91_PLLA 0x202A3F01
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/7] am33xx: musb: Remove unused configuration logic
2022-03-22 1:33 [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
` (5 preceding siblings ...)
2022-03-22 1:33 ` [PATCH 7/7] atmel: Remove CONFIG_SPL_ATMEL_SIZE Tom Rini
@ 2022-04-01 18:45 ` Tom Rini
6 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-04-01 18:45 UTC (permalink / raw)
To: u-boot
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
On Mon, Mar 21, 2022 at 09:33:27PM -0400, Tom Rini wrote:
> At this point DM and OF_CONTROL are used to configure how the USB ports
> are enabled, with the exception of in SPL and no SPL_OF_CONTROL. Remove
> a bunch of now unused logic to simplify the code.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
For the whole of the series, applied to u-boot/next, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-04-01 18:45 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-22 1:33 [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
2022-03-22 1:33 ` [PATCH 2/7] CI: Update unmigrated symbol check Tom Rini
2022-03-22 1:33 ` [PATCH 3/7] Finish converting CONFIG_BOOTM_NETBSD et al to Kconfig Tom Rini
2022-03-22 1:33 ` [PATCH 4/7] Convert CONFIG_BCM2835_GPIO " Tom Rini
2022-03-22 1:33 ` [PATCH 5/7] Convert CONFIG_BITBANGMII_MULTI " Tom Rini
2022-03-22 1:33 ` [PATCH 6/7] Remove CONFIG_BOARDNAME and CONFIG_BOARD_NAME Tom Rini
2022-03-22 1:33 ` [PATCH 7/7] atmel: Remove CONFIG_SPL_ATMEL_SIZE Tom Rini
2022-04-01 18:45 ` [PATCH 1/7] am33xx: musb: Remove unused configuration logic Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).