am33xx: musb: Remove unused configuration logic
Subsystems (10)
PATCH 1/7 am33xx: musb: Remove unused configuration logic
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.
--- arch/arm/mach-omap2/am33xx/board.c | 82 +++--------------------------- 1 file changed, 6 insertions(+), 76 deletions(-)
arch/arm/mach-omap2/am33xx/board.c +6 -76
@@ -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 )
Signature · 1 line
2.25.1
PATCH 2/7 CI: Update unmigrated symbol check
We need to check for config header files that #undef migrated symbols as well.
--- .azure-pipelines.yml | 6 ++++-- .gitlab-ci.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
.azure-pipelines.yml +4 -2
@@ -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`
.gitlab-ci.yml +4 -2
@@ -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`;
Signature · 1 line
2.25.1
PATCH 3/7 Finish converting CONFIG_BOOTM_NETBSD et al to Kconfig
In reply to Tom RiniThis 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.
--- 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(-)
configs/s5p4418_nanopi2_defconfig +2 -0
@@ -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
include/config_uncmd_spl.h +0 -1
@@ -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
include/configs/adp-ae3xx.h +0 -6
@@ -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 */
include/configs/adp-ag101p.h +0 -6
@@ -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 */
include/configs/am335x_evm.h +0 -20
@@ -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 \
include/configs/am335x_shc.h +0 -10
@@ -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 */
include/configs/am43xx_evm.h +0 -22
@@ -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 \
include/configs/chiliboard.h +0 -10
@@ -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
include/configs/display5.h +0 -6
@@ -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
include/configs/imx8mm_icore_mx8mm.h +0 -1
@@ -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
include/configs/imx8mm_venice.h +0 -1
@@ -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
include/configs/imx8mn_venice.h +0 -1
@@ -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
include/configs/imx8mp_evk.h +0 -2
@@ -26,8 +26,6 @@#define CONFIG_SPL_ABORT_ON_RAW_IMAGE -#undef CONFIG_DM_MMC -#define CONFIG_POWER_PCA9450 #endif
include/configs/imx8mq_evk.h +0 -2
@@ -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
include/configs/imx8mq_phanbell.h +0 -2
@@ -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 */
include/configs/ls1088a_common.h +0 -3
@@ -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 \
include/configs/novena.h +0 -5
@@ -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
include/configs/opos6uldev.h +0 -4
@@ -12,10 +12,6 @@#ifdef CONFIG_SPL #include "imx6_spl.h" - -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_DM_REGULATOR -#endif #endif /* Miscellaneous configurable options */
include/configs/pico-imx8mq.h +0 -2
@@ -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 */
include/configs/rcar-gen2-common.h +0 -10
@@ -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
include/configs/s5p4418_nanopi2.h +0 -6
@@ -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 */
include/configs/socfpga_soc64_common.h +0 -3
@@ -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__
include/configs/tegra-common-post.h +0 -10
@@ -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 */
include/configs/ti816x_evm.h +0 -12
@@ -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
include/configs/ti_omap5_common.h +0 -3
@@ -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 */
include/configs/topic_miami.h +0 -8
@@ -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 )
include/configs/verdin-imx8mm.h +0 -1
@@ -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
include/configs/verdin-imx8mp.h +0 -1
@@ -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
Signature · 1 line
2.25.1
PATCH 4/7 Convert CONFIG_BCM2835_GPIO to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_BCM2835_GPIO
--- 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(-)
configs/rpi_0_w_defconfig +1 -0
@@ -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
configs/rpi_2_defconfig +1 -0
@@ -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
configs/rpi_3_32b_defconfig +1 -0
@@ -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
configs/rpi_3_b_plus_defconfig +1 -0
@@ -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
configs/rpi_3_defconfig +1 -0
@@ -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
configs/rpi_4_32b_defconfig +1 -0
@@ -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
configs/rpi_4_defconfig +1 -0
@@ -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
configs/rpi_arm64_defconfig +1 -0
@@ -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
configs/rpi_defconfig +1 -0
@@ -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
drivers/gpio/Kconfig +4 -0
@@ -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 || \
include/configs/rpi.h +0 -2
@@ -41,8 +41,6 @@#endif /* Devices */ -/* GPIO */ -#define CONFIG_BCM2835_GPIO /* LCD */ #define CONFIG_VIDEO_BCM2835
Signature · 1 line
2.25.1
PATCH 5/7 Convert CONFIG_BITBANGMII_MULTI to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_BITBANGMII_MULTI
--- 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(-)
configs/alt_defconfig +1 -0
@@ -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
configs/armadillo-800eva_defconfig +1 -0
@@ -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
configs/controlcenterdc_defconfig +1 -0
@@ -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
configs/gose_defconfig +1 -0
@@ -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
configs/grpeach_defconfig +1 -0
@@ -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
configs/hihope_rzg2_defconfig +1 -0
@@ -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
configs/koelsch_defconfig +1 -0
@@ -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
configs/lager_defconfig +1 -0
@@ -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
configs/porter_defconfig +1 -0
@@ -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
configs/r8a77970_eagle_defconfig +1 -0
@@ -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
configs/r8a77980_condor_defconfig +1 -0
@@ -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
configs/r8a77990_ebisu_defconfig +1 -0
@@ -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
configs/r8a77995_draak_defconfig +1 -0
@@ -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
configs/r8a779a0_falcon_defconfig +1 -0
@@ -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
configs/rcar3_salvator-x_defconfig +1 -0
@@ -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
configs/rcar3_ulcb_defconfig +1 -0
@@ -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
configs/rzg2_beacon_defconfig +1 -0
@@ -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
configs/silinux_ek874_defconfig +1 -0
@@ -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
configs/silk_defconfig +1 -0
@@ -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
configs/stout_defconfig +1 -0
@@ -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
drivers/net/phy/Kconfig +4 -0
@@ -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"
include/configs/alt.h +0 -1
@@ -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 */
include/configs/armadillo-800eva.h +0 -1
@@ -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()
include/configs/beacon-rzg2m.h +0 -3
@@ -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 \
include/configs/condor.h +0 -4
@@ -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 */
include/configs/controlcenterdc.h +0 -5
@@ -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
include/configs/draak.h +0 -3
@@ -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 */
include/configs/eagle.h +0 -3
@@ -11,9 +11,6 @@#include "rcar-gen3-common.h" -/* Ethernet RAVB */ -#define CONFIG_BITBANGMII_MULTI -/* Environment compatibility */ /* Board Clock */
include/configs/ebisu.h +0 -3
@@ -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 */
include/configs/falcon.h +0 -3
@@ -21,9 +21,6 @@#define GICD_BASE 0xF1000000#define GICR_BASE 0xF1060000 -/* Ethernet RAVB */ -#define CONFIG_BITBANGMII_MULTI -/* Board Clock */ /* XTAL_CLK : 16.66MHz */
include/configs/gose.h +0 -1
@@ -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 */
include/configs/grpeach.h +0 -1
@@ -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 */
include/configs/hihope-rzg2.h +0 -3
@@ -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 */
include/configs/koelsch.h +0 -1
@@ -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 */
include/configs/lager.h +0 -1
@@ -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 */
include/configs/porter.h +0 -1
@@ -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 */
include/configs/salvator-x.h +0 -3
@@ -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 */
include/configs/silinux-ek874.h +0 -3
@@ -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 */
include/configs/silk.h +0 -1
@@ -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 */
include/configs/stout.h +0 -1
@@ -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 */
include/configs/ulcb.h +0 -3
@@ -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 */
Signature · 1 line
2.25.1
PATCH 6/7 Remove CONFIG_BOARDNAME and CONFIG_BOARD_NAME
In reply to Tom RiniBoth 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.
--- 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(-)
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +10 -1
@@ -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 );
board/ge/bx50v3/bx50v3.c +1 -1
@@ -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 ; }
include/configs/T102xRDB.h +9 -8
@@ -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" \
include/configs/el6x_common.h +1 -5
@@ -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" \
include/configs/ge_bx50v3.h +0 -2
@@ -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>
include/configs/opos6uldev.h +4 -5
@@ -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" \
include/configs/p1_p2_rdb_pc.h +0 -3
@@ -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
Signature · 1 line
2.25.1
PATCH 7/7 atmel: Remove CONFIG_SPL_ATMEL_SIZE
In reply to Tom RiniThis seems to be unused in the code, remove it.
--- 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(-)
include/configs/at91sam9m10g45ek.h +0 -1
@@ -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
include/configs/corvus.h +0 -1
@@ -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
include/configs/pm9g45.h +0 -1
@@ -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
include/configs/smartweb.h +0 -1
@@ -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
include/configs/taurus.h +0 -1
@@ -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
Signature · 1 line
2.25.1
Quoted 5 lines · Tom Rini
At this point DM and
OF_CONTROLare used to configure how the USB ports are enabled, with the exception of in SPL and noSPL_OF_CONTROL. Remove a bunch of now unused logic to simplify the code.Signed-off-by Tom Rini <[email protected]>
For the whole of the series, applied to u-boot/next, thanks!
Signature · 1 line
Tom