Convert CONFIG_ENV_MIN_ENTRIES et al to Kconfig
Subsystems (10)
PATCH 1/8 Convert CONFIG_ENV_MIN_ENTRIES et al to Kconfig
This converts the following to Kconfig:
CONFIG_ENV_MIN_ENTRIES
CONFIG_ENV_MAX_ENTRIES
---
I'm not 100% sure that what was being done in xilinx_zynqmp.h was working before this change. If we _need_ to tweak this value down in SPL we need to introduce CONFIG_SPL_ENV_{MIN,MAX}_ENTRIES and use CONFIG_VAL() in the code.
--- README | 8 -------- configs/clearfog_defconfig | 1 + configs/helios4_defconfig | 1 + env/Kconfig | 16 ++++++++++++++++ include/configs/clearfog.h | 2 -- include/configs/helios4.h | 2 -- include/configs/xilinx_zynqmp.h | 5 ----- lib/hashtable.c | 7 ------- 8 files changed, 18 insertions(+), 24 deletions(-)
README +0 -8
@@ -1877,14 +1877,6 @@ Configuration Settings: while unprotecting/erasing/programming. Please only enable this option if you really know what you are doing. -- CONFIG_ENV_MAX_ENTRIES - - Maximum number of entries in the hash table that is used - internally to store the environment settings. The default - setting is supposed to be generous and should work in most - cases. This setting can be used to tune behaviour; see - lib/hashtable.c for details. - - CONFIG_ENV_FLAGS_LIST_DEFAULT - CONFIG_ENV_FLAGS_LIST_STATIC Enable validation of the values given to environment variables when
configs/clearfog_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_MVEBU_BUBT=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_MIN_ENTRIES=128 CONFIG_ARP_TIMEOUT=200 CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RANDOM_ETHADDR=y
configs/helios4_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_MVEBU_BUBT=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_MIN_ENTRIES=128 CONFIG_ARP_TIMEOUT=200 CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RANDOM_ETHADDR=y
env/Kconfig +16 -0
@@ -30,6 +30,22 @@ config ENV_OVERWRITE Use this to permit overriding of certain environmental variables like Ethernet and Serial +config ENV_MIN_ENTRIES + int "Minimum number of entries in the environment hashtable" + default 64 + help + Minimum number of entries in the hash table that is used internally + to store the environment settings. + +config ENV_MAX_ENTRIES + int "Maximumm number of entries in the environment hashtable" + default 512 + help + Maximum number of entries in the hash table that is used internally + to store the environment settings. The default setting is supposed to + be generous and should work in most cases. This setting can be used + to tune behaviour; see lib/hashtable.c for details. + config ENV_IS_NOWHERE bool "Environment is not stored" default y if !ENV_IS_IN_EEPROM && !ENV_IS_IN_EXT4 && \
include/configs/clearfog.h +0 -2
@@ -18,8 +18,6 @@* U-Boot into it. */ -#define CONFIG_ENV_MIN_ENTRIES 128 -/* Environment in MMC */ /* * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC
include/configs/helios4.h +0 -2
@@ -18,8 +18,6 @@* U-Boot into it. */ -#define CONFIG_ENV_MIN_ENTRIES 128 -/* Environment in MMC */ /* * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC
include/configs/xilinx_zynqmp.h +0 -5
@@ -207,11 +207,6 @@/* ATF is my kernel image */ -#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_DFU ) -# define CONFIG_SPL_HASH -# define CONFIG_ENV_MAX_ENTRIES 10 -#endif -#ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used"#endif
lib/hashtable.c +0 -7
@@ -35,13 +35,6 @@# include <linux/ctype.h> #endif -#ifndef CONFIG_ENV_MIN_ENTRIES /* minimum number of entries */ -#define CONFIG_ENV_MIN_ENTRIES 64 -#endif -#ifndef CONFIG_ENV_MAX_ENTRIES /* maximum number of entries */ -#define CONFIG_ENV_MAX_ENTRIES 512 -#endif -#define USED_FREE 0#define USED_DELETED -1
Signature · 1 line
2.25.1
PATCH 2/8 fpga: Remove CONFIG_FPGA_COUNT
This define is only currently used in a single board, and always set to one. Define this within the board code and remove other references.
--- README | 4 ---- board/astro/mcf5373l/fpga.c | 9 +++++---- include/configs/astro_mcf5373l.h | 1 - include/configs/mx53cx9020.h | 2 -- include/configs/socfpga_common.h | 7 ------- 5 files changed, 5 insertions(+), 18 deletions(-)
README +0 -4
@@ -1350,10 +1350,6 @@ The following options need to be configured: Enables support for FPGA family. (SPARTAN2, SPARTAN3, VIRTEX2, CYCLONE2, ACEX1K, ACEX) - CONFIG_FPGA_COUNT - - Specify the number of FPGA devices to support. - CONFIG_SYS_FPGA_PROG_FEEDBACK Enable printing of hash marks during FPGA configuration.
board/astro/mcf5373l/fpga.c +5 -4
@@ -168,7 +168,8 @@ Altera_CYC2_Passive_Serial_fns altera_fns = {altera_post_fn }; -Altera_desc altera_fpga[CONFIG_FPGA_COUNT ] = { +#define FPGA_COUNT 1 +Altera_desc altera_fpga[FPGA_COUNT ] = { {Altera_CYC2, passive_serial,85903 ,
@@ -182,7 +183,7 @@ int astro5373l_altera_load(void) {int i; -for (i =0 ; i <CONFIG_FPGA_COUNT ; i++) { +for (i =0 ; i <FPGA_COUNT ; i++) {/* * I did not yet manage to get relocation work properly, * so set stuff here instead of static initialisation:
@@ -372,7 +373,7 @@ xilinx_spartan3_slave_serial_fns xilinx_fns = {xilinx_fastwr_config_fn }; -xilinx_desc xilinx_fpga[CONFIG_FPGA_COUNT ] = { +xilinx_desc xilinx_fpga[FPGA_COUNT ] = { {xilinx_spartan3, slave_serial,XILINX_XC3S4000_SIZE ,
@@ -388,7 +389,7 @@ int astro5373l_xilinx_load(void)fpga_init (); -for (i =0 ; i <CONFIG_FPGA_COUNT ; i++) { +for (i =0 ; i <FPGA_COUNT ; i++) {/* * I did not yet manage to get relocation work properly, * so set stuff here instead of static initialisation:
include/configs/astro_mcf5373l.h +0 -1
@@ -133,7 +133,6 @@* it needs non-blocking CFI routines. */ -#define CONFIG_FPGA_COUNT 1#define CONFIG_SYS_FPGA_PROG_FEEDBACK #define CONFIG_SYS_FPGA_WAIT 1000
include/configs/mx53cx9020.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_FPGA_COUNT 1 -/* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_ESDHC_NUM 2
include/configs/socfpga_common.h +0 -7
@@ -58,13 +58,6 @@#define CONFIG_DW_ALTDESCRIPTOR #endif -/* -* FPGA Driver -*/ -#ifdef CONFIG_CMD_FPGA -#define CONFIG_FPGA_COUNT 1 -#endif -/* * L4 OSC1 Timer 0 */
Signature · 1 line
2.25.1
PATCH 3/8 Convert CONFIG_FPGA_STRATIX_V to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_FPGA_STRATIX_V
--- configs/theadorable_debug_defconfig | 1 + drivers/fpga/Kconfig | 6 ++++++ include/configs/theadorable.h | 3 --- 3 files changed, 7 insertions(+), 3 deletions(-)
configs/theadorable_debug_defconfig +1 -0
@@ -71,6 +71,7 @@ CONFIG_LBA48=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_RAM=y CONFIG_FPGA_ALTERA=y +CONFIG_FPGA_STRATIX_V=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set
drivers/fpga/Kconfig +6 -0
@@ -21,6 +21,12 @@ config FPGA_SOCFPGA This provides common functionality for Gen5 and Arria10 devices. +config FPGA_STRATIX_V + bool "Enable Stratix V FPGA drivers" + depends on FPGA_ALTERA + help + Say Y here to enable the Altera Stratix V FPGA specific driver. + config FPGA_CYCLON2 bool "Enable Altera FPGA driver for Cyclone II" depends on FPGA_ALTERA
include/configs/theadorable.h +0 -3
@@ -40,9 +40,6 @@"fdt_high=0x10000000\0" \"initrd_high=0x10000000\0" -/* FPGA programming support */ -#define CONFIG_FPGA_STRATIX_V -/* * Bootcounter */
Signature · 1 line
2.25.1
PATCH 4/8 usb: Remove non-DM code in ehci-fsl and xhci
In reply to Tom RiniThe DM_USB migration deadline has passed and this is not used in SPL. Remove this now unused code.
--- drivers/usb/host/ehci-fsl.c | 4 -- drivers/usb/host/xhci.c | 110 ------------------------------------ 2 files changed, 114 deletions(-)
drivers/usb/host/ehci-fsl.c +0 -4
@@ -25,10 +25,6 @@DECLARE_GLOBAL_DATA_PTR ; -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif -struct ehci_fsl_priv {struct ehci_ctrl ehci;fdt_addr_t hcd_base;
drivers/usb/host/xhci.c +0 -110
145 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 5/8 mx6memcal: Remove SPL_USB_HOST
In reply to Tom RiniAs this particular platform is intended to be loaded and run a specific set of routines in SPL, we do not need the ability to further use the USB as a host device in SPL. Disable this support.
---
Please correct me if I'm wrong here and I'll update the subsequent patch that lead me to discover this.
--- configs/mx6memcal_defconfig | 1 - 1 file changed, 1 deletion(-)
configs/mx6memcal_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SYS_MEMTEST_START=0x10000000 CONFIG_SYS_MEMTEST_END=0x20000000 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SYS_SPL_MALLOC=y -CONFIG_SPL_USB_HOST=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=32
Signature · 1 line
2.25.1
Re: [PATCH 5/8] mx6memcal: Remove SPL_USB_HOST
Thanks Tom.
Quoted 18 lines · Tom Rini
As this particular platform is intended to be loaded and run a specific set of routines in SPL, we do not need the ability to further use the USB as a host device in SPL. Disable this support.
Cc Eric Nelson <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Please correct me if I'm wrong here and I'll update the subsequent patch that lead me to discover this.--- configs/mx6memcal_defconfig | 1 - 1 file changed, 1 deletion(-)configs/mx6memcal_defconfig +0
-0
configs/mx6memcal_defconfig CONFIG_SYS_MEMTEST_START=0x10000000 · line 21
Quoted 7 lines
configs/mx6memcal_defconfig +0
-1@@ -16,7 +16,6 @@ CONFIG_SYS_MEMTEST_START=0x10000000 CONFIG_SYS_MEMTEST_END=0x20000000 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SYS_SPL_MALLOC=y -CONFIG_SPL_USB_HOST=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=32
PATCH 6/8 common: usb: Update logic for usb.o, usb_hub.o and usb_storage.o
In reply to Tom RiniNow that we have consistently named symbols to enable USB host or gadget controller support in SPL or full U-Boot, we do not need to unconditionally build USB files nor depend on non-SPL symbols to know when to build these common files.
--- common/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
common/Makefile +4 -9
@@ -23,10 +23,9 @@ obj-$(CONFIG_MII) += miiphyutil.o obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o -ifdef CONFIG_USB -obj-y += usb.o usb_hub.o +obj-$(CONFIG_USB_HOST) += usb.o usb_hub.o +obj-$(CONFIG_USB_GADGET) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o -endif # others obj-$(CONFIG_CONSOLE_MUX) += iomux.o
@@ -57,13 +56,9 @@ endif obj-$(CONFIG_SPL_NET) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o -ifdef CONFIG_SPL_USB_HOST -obj-y += usb.o -obj-y += usb_hub.o +obj-$(CONFIG_SPL_USB_HOST) += usb.o usb_hub.o obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o -else -obj-$(CONFIG_USB_MUSB_HOST) += usb.o -endif +obj-$(CONFIG_SPL_MUSB_NEW) += usb.o endif # CONFIG_SPL_BUILD #others
Signature · 1 line
2.25.1
PATCH 7/8 Convert CONFIG_USB_MAX_CONTROLLER_COUNT to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_USB_MAX_CONTROLLER_COUNT
--- arch/arm/include/asm/arch-ls102xa/config.h | 1 - arch/powerpc/cpu/mpc8xxx/fdt.c | 4 ---- arch/powerpc/include/asm/config_mpc85xx.h | 24 -------------------- common/usb.c | 4 ---- configs/P1020RDB-PC_36BIT_NAND_defconfig | 1 + configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 + configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 + configs/P1020RDB-PC_36BIT_defconfig | 1 + configs/P1020RDB-PC_NAND_defconfig | 1 + configs/P1020RDB-PC_SDCARD_defconfig | 1 + configs/P1020RDB-PC_SPIFLASH_defconfig | 1 + configs/P1020RDB-PC_defconfig | 1 + configs/P2041RDB_NAND_defconfig | 1 + configs/P2041RDB_SDCARD_defconfig | 1 + configs/P2041RDB_SPIFLASH_defconfig | 1 + configs/P2041RDB_defconfig | 1 + configs/P3041DS_NAND_defconfig | 1 + configs/P3041DS_SDCARD_defconfig | 1 + configs/P3041DS_SPIFLASH_defconfig | 1 + configs/P3041DS_defconfig | 1 + configs/P4080DS_SDCARD_defconfig | 1 + configs/P4080DS_SPIFLASH_defconfig | 1 + configs/P4080DS_defconfig | 1 + configs/P5040DS_NAND_defconfig | 1 + configs/P5040DS_SDCARD_defconfig | 1 + configs/P5040DS_SPIFLASH_defconfig | 1 + configs/P5040DS_defconfig | 1 + configs/T1024RDB_NAND_defconfig | 1 + configs/T1024RDB_SDCARD_defconfig | 1 + configs/T1024RDB_SPIFLASH_defconfig | 1 + configs/T1024RDB_defconfig | 1 + configs/T1042D4RDB_NAND_defconfig | 1 + configs/T1042D4RDB_SDCARD_defconfig | 1 + configs/T1042D4RDB_SPIFLASH_defconfig | 1 + configs/T1042D4RDB_defconfig | 1 + configs/T2080QDS_NAND_defconfig | 1 + configs/T2080QDS_SDCARD_defconfig | 1 + configs/T2080QDS_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 1 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/T2080QDS_defconfig | 1 + configs/T2080RDB_NAND_defconfig | 1 + configs/T2080RDB_SDCARD_defconfig | 1 + configs/T2080RDB_SPIFLASH_defconfig | 1 + configs/T2080RDB_defconfig | 1 + configs/T2080RDB_revD_NAND_defconfig | 1 + configs/T2080RDB_revD_SDCARD_defconfig | 1 + configs/T2080RDB_revD_SPIFLASH_defconfig | 1 + configs/T2080RDB_revD_defconfig | 1 + configs/T4240RDB_SDCARD_defconfig | 1 + configs/T4240RDB_defconfig | 1 + configs/apalis_imx6_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/ge_b1x5v2_defconfig | 1 + configs/imx6dl_mamoj_defconfig | 1 + configs/kontron-sl-mx6ul_defconfig | 1 + configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + configs/mx6sabreauto_defconfig | 1 + configs/mx6ul_14x14_evk_defconfig | 1 + configs/pico-dwarf-imx6ul_defconfig | 1 + configs/pico-dwarf-imx7d_defconfig | 1 + configs/pico-hobbit-imx6ul_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 1 + configs/pico-imx6ul_defconfig | 1 + configs/pico-imx7d_bl33_defconfig | 1 + configs/pico-imx7d_defconfig | 1 + configs/pico-nymph-imx7d_defconfig | 1 + configs/pico-pi-imx6ul_defconfig | 1 + configs/pico-pi-imx7d_defconfig | 1 + configs/variscite_dart6ul_defconfig | 1 + configs/vining_2000_defconfig | 1 + drivers/usb/common/fsl-dt-fixup.c | 4 ---- drivers/usb/host/Kconfig | 6 +++++ drivers/usb/host/ehci-hcd.c | 4 ---- include/configs/apalis_imx6.h | 1 - include/configs/cl-som-imx7.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri-imx6ull.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/dart_6ul.h | 1 - include/configs/db-88f6720.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/ge_b1x5v2.h | 1 - include/configs/imx6_logic.h | 1 - include/configs/imx6dl-mamoj.h | 1 - include/configs/imx6q-bosch-acc.h | 1 - include/configs/imx8mm-cl-iot-gate.h | 1 - include/configs/kontron-sl-mx6ul.h | 1 - include/configs/kontron-sl-mx8mm.h | 1 - include/configs/kp_imx6q_tpc.h | 1 - include/configs/liteboard.h | 1 - include/configs/ls1021atsn.h | 1 - include/configs/lx2160a_common.h | 5 ---- include/configs/lx2162aqds.h | 2 -- include/configs/mvebu_armada-37xx.h | 2 -- include/configs/mvebu_armada-8k.h | 2 -- include/configs/mx23_olinuxino.h | 3 --- include/configs/mx23evk.h | 3 --- include/configs/mx28evk.h | 3 --- include/configs/mx6sabreauto.h | 1 - include/configs/mx6sabresd.h | 1 - include/configs/mx6slevk.h | 1 - include/configs/mx6sxsabreauto.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mys_6ulx.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/npi_imx6ull.h | 1 - include/configs/opos6uldev.h | 1 - include/configs/p1_p2_rdb_pc.h | 4 ---- include/configs/pcl063.h | 1 - include/configs/pcl063_ull.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 1 - include/configs/poplar.h | 1 - include/configs/somlabs_visionsom_6ull.h | 1 - include/configs/theadorable.h | 1 - include/configs/tqma6.h | 1 - include/configs/turris_mox.h | 2 -- include/configs/verdin-imx8mm.h | 1 - include/configs/vining_2000.h | 1 - include/configs/warp.h | 1 - include/configs/xpress.h | 1 - scripts/config_whitelist.txt | 1 - 132 files changed, 77 insertions(+), 112 deletions(-)
arch/arm/include/asm/arch-ls102xa/config.h +0 -1
@@ -95,7 +95,6 @@#define DCU_LAYER_MAX_NUM 16#ifdef CONFIG_ARCH_LS1021A -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1#else #error SoC not defined
arch/powerpc/cpu/mpc8xxx/fdt.c +0 -4
@@ -17,10 +17,6 @@#include <phy.h> #include <hwconfig.h> -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif -#if defined(CONFIG_MP ) && (defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx))static int ft_del_cpuhandle (void *blob,int cpuhandle) {
arch/powerpc/include/asm/config_mpc85xx.h +0 -24
@@ -31,7 +31,6 @@#elif defined(CONFIG_ARCH_P1010 )#define CONFIG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_FSL_IFC_BANK_COUNT 4#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
@@ -41,25 +40,19 @@/* P1011 is single core version of P1020 */ #elif defined(CONFIG_ARCH_P1011 )#define CONFIG_TSECV2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#elif defined(CONFIG_ARCH_P1020 )#define CONFIG_TSECV2 -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#endif #elif defined(CONFIG_ARCH_P1021 )#define CONFIG_TSECV2 #define QE_MURAM_SIZE 0x6000UL#define MAX_QE_RISC 1#define QE_NUM_OF_SNUM 28 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#elif defined(CONFIG_ARCH_P1023 )#define CONFIG_SYS_NUM_FMAN 1#define CONFIG_SYS_NUM_FM1_DTSEC 2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_QMAN_NUM_PORTALS 3#define CONFIG_SYS_BMAN_NUM_PORTALS 3#define CONFIG_SYS_FM_MURAM_SIZE 0x10000
@@ -68,11 +61,9 @@/* P1024 is lower end variant of P1020 */ #elif defined(CONFIG_ARCH_P1024 )#define CONFIG_TSECV2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/* P1025 is lower end variant of P1021 */ #elif defined(CONFIG_ARCH_P1025 ) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_TSECV2 #define QE_MURAM_SIZE 0x6000UL#define MAX_QE_RISC 1
@@ -84,7 +75,6 @@#define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5#define CONFIG_SYS_FSL_RMU #define CONFIG_SYS_FSL_SRIO_MSG_UNIT_NUM 2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#elif defined(CONFIG_ARCH_P2041 )/* also supports P2040 */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
@@ -92,9 +82,6 @@#define CONFIG_SYS_NUM_FMAN 1#define CONFIG_SYS_NUM_FM1_DTSEC 5#define CONFIG_SYS_NUM_FM1_10GEC 1 -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#endif #define CONFIG_SYS_FM_MURAM_SIZE 0x28000#define CONFIG_SYS_FSL_TBCLK_DIV 32#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"
@@ -118,7 +105,6 @@#define CONFIG_SYS_FSL_USB1_PHY_ENABLE #define CONFIG_SYS_FSL_USB2_PHY_ENABLE #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2#define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9#define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5
@@ -132,7 +118,6 @@#define CONFIG_SYS_NUM_FM2_DTSEC 4#define CONFIG_SYS_NUM_FM1_10GEC 1#define CONFIG_SYS_NUM_FM2_10GEC 1 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_SYS_FM_MURAM_SIZE 0x28000#define CONFIG_SYS_FSL_TBCLK_DIV 16#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,p4080-pcie"
@@ -151,7 +136,6 @@#define CONFIG_SYS_NUM_FM1_10GEC 1#define CONFIG_SYS_NUM_FM2_DTSEC 5#define CONFIG_SYS_NUM_FM2_10GEC 1 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_SYS_FM_MURAM_SIZE 0x28000#define CONFIG_SYS_FSL_TBCLK_DIV 16#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.4"
@@ -163,7 +147,6 @@#elif defined(CONFIG_ARCH_BSC9131 )#define CONFIG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_FSL_DSP_M2_RAM_ADDR 0xb0000000#define CONFIG_SYS_FSL_DSP_CCSRBAR_DEFAULT 0xff600000#define CONFIG_SYS_FSL_IFC_BANK_COUNT 3
@@ -172,7 +155,6 @@#elif defined(CONFIG_ARCH_BSC9132 )#define CONFIG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_FSL_DSP_DDR_ADDR 0x40000000#define CONFIG_SYS_FSL_DSP_M2_RAM_ADDR 0xb0000000#define CONFIG_SYS_FSL_DSP_M3_RAM_ADDR 0xc0000000
@@ -204,7 +186,6 @@#define CONFIG_SYS_FSL_SRDS_3 #define CONFIG_SYS_FSL_SRDS_4 #define CONFIG_SYS_NUM_FMAN 2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_SYS_PME_CLK 0#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8#define CONFIG_SYS_FMAN_V3
@@ -234,7 +215,6 @@#define CONFIG_SYS_CPRI #define CONFIG_SYS_FSL_NUM_CC_PLLS 5#define CONFIG_SYS_NUM_FMAN 1 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_FM1_CLK 0#define CONFIG_SYS_CPRI_CLK 3#define CONFIG_SYS_ULB_CLK 4
@@ -255,7 +235,6 @@#define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 }#define CONFIG_SYS_NUM_FM1_DTSEC 6#define CONFIG_SYS_NUM_FM1_10GEC 2 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2#define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9#define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5
@@ -278,7 +257,6 @@#define CONFIG_SYS_FSL_SRDS_1 #define CONFIG_SYS_NUM_FMAN 1#define CONFIG_SYS_NUM_FM1_DTSEC 5 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_PME_PLAT_CLK_DIV 2#define CONFIG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8
@@ -309,7 +287,6 @@#define CONFIG_SYS_NUM_FM1_DTSEC 4#define CONFIG_SYS_NUM_FM1_10GEC 1#define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8#define CONFIG_SYS_FM1_CLK 0#define CONFIG_QBMAN_CLK_DIV 1
@@ -343,7 +320,6 @@#define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9#define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5#endif -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_PME_PLAT_CLK_DIV 1#define CONFIG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV#define CONFIG_SYS_FM1_CLK 0
common/usb.c +0 -4
@@ -49,10 +49,6 @@ char usb_started; /* flag for the started/stopped USB status */static struct usb_device usb_dev[USB_MAX_DEVICE ];static int dev_index; -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif -/*************************************************************************** * Init USB Device */
configs/P1020RDB-PC_36BIT_NAND_defconfig +1 -0
@@ -138,5 +138,6 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +1 -0
@@ -120,5 +120,6 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
@@ -123,5 +123,6 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y
configs/P1020RDB-PC_36BIT_defconfig +1 -0
@@ -100,5 +100,6 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y
configs/P1020RDB-PC_NAND_defconfig +1 -0
@@ -137,4 +137,5 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y
configs/P1020RDB-PC_SDCARD_defconfig +1 -0
@@ -119,4 +119,5 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -0
@@ -122,4 +122,5 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y
configs/P1020RDB-PC_defconfig +1 -0
@@ -99,4 +99,5 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y
configs/P2041RDB_NAND_defconfig +1 -0
@@ -92,6 +92,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P2041RDB_SDCARD_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P2041RDB_SPIFLASH_defconfig +1 -0
@@ -89,6 +89,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P2041RDB_defconfig +1 -0
@@ -84,6 +84,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P3041DS_NAND_defconfig +1 -0
@@ -95,6 +95,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P3041DS_SDCARD_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P3041DS_SPIFLASH_defconfig +1 -0
@@ -92,6 +92,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P3041DS_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P4080DS_SDCARD_defconfig +1 -0
@@ -88,6 +88,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P4080DS_SPIFLASH_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P4080DS_defconfig +1 -0
@@ -85,6 +85,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P5040DS_NAND_defconfig +1 -0
@@ -96,6 +96,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P5040DS_SDCARD_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P5040DS_SPIFLASH_defconfig +1 -0
@@ -92,6 +92,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/P5040DS_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T1024RDB_NAND_defconfig +1 -0
@@ -124,6 +124,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T1024RDB_SDCARD_defconfig +1 -0
@@ -118,6 +118,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T1024RDB_SPIFLASH_defconfig +1 -0
@@ -121,6 +121,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T1024RDB_defconfig +1 -0
@@ -93,6 +93,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T1042D4RDB_NAND_defconfig +1 -0
@@ -122,6 +122,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T1042D4RDB_SDCARD_defconfig +1 -0
@@ -116,6 +116,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
@@ -119,6 +119,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T1042D4RDB_defconfig +1 -0
@@ -91,6 +91,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080QDS_NAND_defconfig +1 -0
@@ -128,6 +128,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080QDS_SDCARD_defconfig +1 -0
@@ -122,6 +122,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080QDS_SECURE_BOOT_defconfig +1 -0
@@ -95,6 +95,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080QDS_SPIFLASH_defconfig +1 -0
@@ -125,6 +125,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -0
@@ -88,6 +88,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080QDS_defconfig +1 -0
@@ -97,6 +97,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080RDB_NAND_defconfig +1 -0
@@ -131,6 +131,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080RDB_SDCARD_defconfig +1 -0
@@ -125,6 +125,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080RDB_SPIFLASH_defconfig +1 -0
@@ -128,6 +128,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080RDB_defconfig +1 -0
@@ -99,6 +99,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080RDB_revD_NAND_defconfig +1 -0
@@ -133,6 +133,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080RDB_revD_SDCARD_defconfig +1 -0
@@ -127,6 +127,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080RDB_revD_SPIFLASH_defconfig +1 -0
@@ -130,6 +130,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T2080RDB_revD_defconfig +1 -0
@@ -101,6 +101,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T4240RDB_SDCARD_defconfig +1 -0
@@ -112,6 +112,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/T4240RDB_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_EHCI_FSL=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64
configs/apalis_imx6_defconfig +1 -0
@@ -105,6 +105,7 @@ CONFIG_DM_SCSI=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_GADGET=y
configs/colibri_imx6_defconfig +1 -0
@@ -102,6 +102,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_GADGET=y
configs/ge_b1x5v2_defconfig +1 -0
@@ -123,6 +123,7 @@ CONFIG_POWEROFF_GPIO=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y
configs/imx6dl_mamoj_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y # CONFIG_SPL_DM_USB is not set +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/kontron-sl-mx6ul_defconfig +1 -0
@@ -92,6 +92,7 @@ CONFIG_FSL_QSPI=y CONFIG_MXC_SPI=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -105,6 +105,7 @@ CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/lx2160aqds_tfa_defconfig +1 -0
@@ -112,6 +112,7 @@ CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -96,6 +96,7 @@ CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_RSA=y CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/lx2160ardb_tfa_defconfig +1 -0
@@ -107,6 +107,7 @@ CONFIG_OPTEE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_WDT=y CONFIG_WDT_SBSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/lx2160ardb_tfa_stmm_defconfig +1 -0
@@ -107,5 +107,6 @@ CONFIG_OPTEE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_EFI_MM_COMM_TEE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/mx6sabreauto_defconfig +1 -0
@@ -103,6 +103,7 @@ CONFIG_DM_SPI=y CONFIG_MXC_SPI=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/mx6ul_14x14_evk_defconfig +1 -0
@@ -93,6 +93,7 @@ CONFIG_FSL_QSPI=y CONFIG_SOFT_SPI=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL"
configs/pico-dwarf-imx6ul_defconfig +1 -0
@@ -72,6 +72,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_MXC_UART=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-dwarf-imx7d_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-hobbit-imx6ul_defconfig +1 -0
@@ -75,6 +75,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_MXC_UART=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-hobbit-imx7d_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-imx6ul_defconfig +1 -0
@@ -78,6 +78,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_MXC_UART=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-imx7d_bl33_defconfig +1 -0
@@ -84,6 +84,7 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-imx7d_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-nymph-imx7d_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-pi-imx6ul_defconfig +1 -0
@@ -75,6 +75,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_MXC_UART=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pico-pi-imx7d_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/variscite_dart6ul_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Variscite" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/vining_2000_defconfig +1 -0
@@ -93,6 +93,7 @@ CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
drivers/usb/common/fsl-dt-fixup.c +0 -4
@@ -16,10 +16,6 @@#include <fsl_usb.h> #include <fdt_support.h> -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif -/* USB Controllers */ #define FSL_USB2_MPH "fsl-usb2-mph"#define FSL_USB2_DR "fsl-usb2-dr"
drivers/usb/host/Kconfig +6 -0
@@ -380,3 +380,9 @@ config USB_R8A66597_HCD ---help--- This enables support for the on-chip Renesas R8A66597 USB 2.0 controller, present in various RZ and SH SoCs. + +config USB_MAX_CONTROLLER_COUNT + int "Maximum number of USB host controllers" + depends on USB_EHCI_FSL || USB_XHCI_FSL || \ + (SPL_USB_HOST && !DM_SPL_USB) || (USB_HOST && !DM_USB) + default 1
drivers/usb/host/ehci-hcd.c +0 -4
@@ -25,10 +25,6 @@#include "ehci.h" -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif -/* * EHCI spec page 20 says that the HC may take up to 16 uFrames (= 4ms) to halt. * Let's time out after 8 to have a little safety margin on top of that.
include/configs/apalis_imx6.h +0 -1
@@ -30,7 +30,6 @@/* USB Configs */ /* Host */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0/* Client */
include/configs/cl-som-imx7.h +0 -1
@@ -104,7 +104,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/* SPL */ #include "imx7_spl.h"
include/configs/cm_fx6.h +0 -1
@@ -141,7 +141,6 @@/* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/* Boot */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20)
include/configs/colibri-imx6ull.h +0 -1
@@ -138,7 +138,6 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_USBD_HS
include/configs/colibri_imx6.h +0 -1
@@ -27,7 +27,6 @@/* USB Configs */ /* Host */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0/* Client */
include/configs/colibri_imx7.h +0 -1
@@ -182,7 +182,6 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_USBD_HS
include/configs/colibri_vf.h +0 -1
@@ -97,7 +97,6 @@#endif /* USB Host Support */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/* USB DFU */
include/configs/dart_6ul.h +0 -1
@@ -52,7 +52,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define ENV_MMC \ "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
include/configs/db-88f6720.h +0 -1
@@ -20,7 +20,6 @@#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* USB/EHCI configuration */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3/* Environment in SPI NOR flash */
include/configs/db-mv784mp-gp.h +0 -1
@@ -16,7 +16,6 @@#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* USB/EHCI configuration */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3/* Environment in SPI NOR flash */
include/configs/dh_imx6.h +0 -1
@@ -40,7 +40,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/* Enabled USB controller number */ /* USB Gadget (DFU, UMS) */ #if defined(CONFIG_CMD_DFU ) || defined(CONFIG_CMD_USB_MASS_STORAGE )
include/configs/ge_b1x5v2.h +0 -1
@@ -31,7 +31,6 @@/* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/* Enabled USB controller number */ #define CONFIG_USBD_HS /* Video */
include/configs/imx6_logic.h +0 -1
@@ -124,7 +124,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Enabled USB controller number */ #endif /* Falcon Mode */
include/configs/imx6dl-mamoj.h +0 -1
@@ -45,7 +45,6 @@/* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/* Falcon */
include/configs/imx6q-bosch-acc.h +0 -1
@@ -113,6 +113,5 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Enabled USB controller number */ #endif /* __IMX6Q_ACC_H */
include/configs/imx8mm-cl-iot-gate.h +0 -1
@@ -142,6 +142,5 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif /*__IMX8MM_CL_IOT_GATE_H*/
include/configs/kontron-sl-mx6ul.h +0 -1
@@ -31,7 +31,6 @@#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif /* Boot order for distro boot */
include/configs/kontron-sl-mx8mm.h +0 -1
@@ -29,7 +29,6 @@#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif /* GUID for capsule updatable firmware image */
include/configs/kp_imx6q_tpc.h +0 -1
@@ -23,7 +23,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/* Enabled USB controller number */ #endif #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/liteboard.h +0 -1
@@ -100,7 +100,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#endif #ifdef CONFIG_CMD_NET
include/configs/ls1021atsn.h +0 -1
@@ -10,7 +10,6 @@#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE/* XHCI Support - enabled by default */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define DDR_SDRAM_CFG 0x470c0008#define DDR_CS0_BNDS 0x008000bf
include/configs/lx2160a_common.h +0 -5
@@ -96,11 +96,6 @@#endif /* USB */ -#ifdef CONFIG_USB_HOST -#ifndef CONFIG_TARGET_LX2162AQDS -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#endif -#endif #define COUNTER_FREQUENCY_REAL (get_board_sys_clk() / 4)
include/configs/lx2162aqds.h +0 -2
@@ -9,8 +9,6 @@#include "lx2160a_common.h" /* USB */ -#undef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* RTC */ #define CONFIG_SYS_RTC_BUS_NUM 0
include/configs/mvebu_armada-37xx.h +0 -2
@@ -34,8 +34,6 @@*/ #define DEFAULT_ENV_IS_RW /* required for configuring default fdtfile= */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3) -#define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \
include/configs/mvebu_armada-8k.h +0 -2
@@ -27,8 +27,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3) -/* USB ethernet */ /*
include/configs/mx23_olinuxino.h +0 -3
@@ -15,9 +15,6 @@/* Status LED */ /* USB */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif /* Ethernet */
include/configs/mx23evk.h +0 -3
@@ -20,9 +20,6 @@/* Environment is in MMC */ /* USB */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif /* Framebuffer support */ #ifdef CONFIG_DM_VIDEO
include/configs/mx28evk.h +0 -3
@@ -34,9 +34,6 @@#endif /* USB */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif /* Framebuffer support */ #ifdef CONFIG_DM_VIDEO
include/configs/mx6sabreauto.h +0 -1
@@ -16,7 +16,6 @@#define CONSOLE_DEV "ttymxc3"/* USB Configs */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0
include/configs/mx6sabresd.h +0 -1
@@ -38,7 +38,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Enabled USB controller number */ #endif #endif /* __MX6SABRESD_CONFIG_H */
include/configs/mx6slevk.h +0 -1
@@ -96,7 +96,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif #define CONFIG_SYS_FSL_USDHC_NUM 3
include/configs/mx6sxsabreauto.h +0 -1
@@ -99,7 +99,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif #define CONFIG_SYS_FSL_USDHC_NUM 2
include/configs/mx6sxsabresd.h +0 -1
@@ -126,7 +126,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif #ifdef CONFIG_CMD_PCI
include/configs/mx6ul_14x14_evk.h +0 -1
@@ -121,7 +121,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif #ifdef CONFIG_CMD_NET
include/configs/mys_6ulx.h +0 -1
@@ -36,7 +36,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \
include/configs/nitrogen6x.h +0 -1
@@ -23,7 +23,6 @@#define CONFIG_FEC_MXC_PHYADDR 6/* USB Configs */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0
include/configs/novena.h +0 -1
@@ -64,7 +64,6 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0/* Gadget part */
include/configs/npi_imx6ull.h +0 -1
@@ -37,7 +37,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#ifdef CONFIG_CMD_NET #define CONFIG_FEC_MXC_PHYADDR 0x1
include/configs/opos6uldev.h +0 -1
@@ -26,7 +26,6 @@#ifdef CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif /* LCD */
include/configs/p1_p2_rdb_pc.h +0 -4
@@ -448,10 +448,6 @@* USB */ -#if defined(CONFIG_TARGET_P1020RDB_PD ) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif -#ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR#endif
include/configs/pcl063.h +0 -1
@@ -48,7 +48,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \
include/configs/pcl063_ull.h +0 -1
@@ -50,7 +50,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define ENV_MMC \ "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
include/configs/pico-imx6ul.h +0 -1
@@ -32,7 +32,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_USBD_HS
include/configs/pico-imx7d.h +0 -1
@@ -118,6 +118,5 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif
include/configs/poplar.h +0 -1
@@ -21,7 +21,6 @@/* ATF bl33.bin load address (must match) */ /* USB configuration */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2/***************************************************************************** * Initial environment variables
include/configs/somlabs_visionsom_6ull.h +0 -1
@@ -68,7 +68,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif #ifdef CONFIG_CMD_NET
include/configs/theadorable.h +0 -1
@@ -29,7 +29,6 @@#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE/* USB/EHCI configuration */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3/* Environment in SPI NOR flash */
include/configs/tqma6.h +0 -1
@@ -52,7 +52,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#if defined(CONFIG_TQMA6X_MMC_BOOT )
include/configs/turris_mox.h +0 -2
@@ -18,8 +18,6 @@4000000 ,4500000 ,5000000 ,5500000 , \ 6000000 } -#define CONFIG_USB_MAX_CONTROLLER_COUNT 6 -#define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 0) \ func(NVME, nvme, 0) \
include/configs/verdin-imx8mm.h +0 -1
@@ -74,6 +74,5 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#endif /* __VERDIN_IMX8MM_H */
include/configs/vining_2000.h +0 -1
@@ -43,7 +43,6 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#ifdef CONFIG_CMD_PCI #define CONFIG_PCI_SCAN_SHOW
include/configs/warp.h +0 -1
@@ -36,7 +36,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Only OTG2 port enabled */ #endif #define CONFIG_USBD_HS
include/configs/xpress.h +0 -1
@@ -33,7 +33,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_FEC_ENET_DEV 0#define CONFIG_FEC_MXC_PHYADDR 0x0
scripts/config_whitelist.txt +0 -1
@@ -1674,7 +1674,6 @@ CONFIG_USB_FAT_BOOT CONFIG_USB_GADGET_AT91 CONFIG_USB_GADGET_DWC2_OTG_PHY CONFIG_USB_ISP1301_I2C_ADDR -CONFIG_USB_MAX_CONTROLLER_COUNT CONFIG_USB_OHCI_LPC32XX CONFIG_USB_OHCI_NEW CONFIG_USB_TTY
Signature · 1 line
2.25.1
PATCH 8/8 Convert CONFIG_SYS_USB_FAT_BOOT_PARTITION to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_SYS_USB_FAT_BOOT_PARTITION
--- common/spl/Kconfig | 7 +++++++ include/configs/am43xx_evm.h | 6 ------ include/configs/am64x_evm.h | 2 -- include/configs/am65x_evm.h | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-)
common/spl/Kconfig +7 -0
@@ -1317,6 +1317,13 @@ config SPL_USB_STORAGE config options. This enables loading from USB using a configured device. +config SYS_USB_FAT_BOOT_PARTITION + int "Partition on USB to use to load U-Boot from" + depends on SPL_USB_STORAGE + default 1 + help + Partition on the USB storage device to load U-Boot from + config SPL_USB_GADGET bool "Suppport USB Gadget drivers" help
include/configs/am43xx_evm.h +0 -6
@@ -48,12 +48,6 @@/* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000/* Base EVM has UART0 */ -/* SPL USB Support */ - -#if defined(CONFIG_SPL_USB_HOST ) || !defined(CONFIG_SPL_BUILD ) -#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 -#endif -#ifndef CONFIG_SPL_BUILD /* USB Device Firmware Update support */ #define DFUARGS \
include/configs/am64x_evm.h +0 -2
@@ -106,6 +106,4 @@/* Now for the remaining common defines */ #include <configs/ti_armv7_common.h> -#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 -#endif /* __CONFIG_AM642_EVM_H */
include/configs/am65x_evm.h +0 -2
@@ -110,8 +110,6 @@EXTRA_ENV_DFUARGS \BOOTENV -#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 - /* Now for the remaining common defines */#include <configs/ti_armv7_common.h>
Signature · 1 line
2.25.1
Quoted 6 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_ENV_MIN_ENTRIES
CONFIG_ENV_MAX_ENTRIESCc Michal Simek <[email protected]>Signed-off-by Tom Rini <[email protected]>
For the series, applied to u-boot/next, thanks!
Signature · 1 line
Tom