LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: layerscape: Move CONFIG_HAS_FSL_XHCI_USB to Kconfig 

Use Kconfig to select QE-HDLC and USB pin-mux.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Ran Wang 2017-10-23 10:09:21 +08:00 committed by York Sun
parent 2af1b08a1a
commit 4417e83495
14 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
View File

@ -490,3 +490,10 @@ config SYS_MC_RSV_MEM_ALIGN
config SPL_LDSCRIPT config SPL_LDSCRIPT
default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A
config HAS_FSL_XHCI_USB
bool
default y if ARCH_LS1043A || ARCH_LS1046A
help
For some SoC(such as LS1043A and LS1046A), USB and QE-HDLC multiplex use
pins, select it when the pins are assigned to USB.

4
include/configs/ls1012afrdm.h
View File

@ -34,12 +34,8 @@
/* /*
* USB * USB
*/ */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
#define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMINFO
#define CONFIG_CMD_MEMTEST #define CONFIG_CMD_MEMTEST

4
include/configs/ls1012aqds.h
View File

@ -119,12 +119,8 @@
#endif #endif
/*XHCI Support - enabled by default*/ /*XHCI Support - enabled by default*/
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
/* MMC */ /* MMC */
#ifdef CONFIG_MMC #ifdef CONFIG_MMC

4
include/configs/ls1012ardb.h
View File

@ -22,12 +22,8 @@
/* /*
* USB * USB
*/ */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
/* /*
* I2C IO expander * I2C IO expander

4
include/configs/ls1021aiot.h
View File

@ -20,12 +20,8 @@
#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE
/* XHCI Support - enabled by default */ /* XHCI Support - enabled by default */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
#define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_SYS_CLK_FREQ 100000000
#define CONFIG_DDR_CLK_FREQ 100000000 #define CONFIG_DDR_CLK_FREQ 100000000

4
include/configs/ls1021aqds.h
View File

@ -405,12 +405,8 @@ unsigned long get_board_ddr_clk(void);
#endif #endif
/*XHCI Support - enabled by default*/ /*XHCI Support - enabled by default*/
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
/* /*
* Video * Video

4
include/configs/ls1021atwr.h
View File

@ -45,12 +45,8 @@
#endif #endif
/* XHCI Support - enabled by default */ /* XHCI Support - enabled by default */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
#define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_SYS_CLK_FREQ 100000000
#define CONFIG_DDR_CLK_FREQ 100000000 #define CONFIG_DDR_CLK_FREQ 100000000

3
include/configs/ls1043aqds.h
View File

@ -371,11 +371,8 @@ unsigned long get_board_ddr_clk(void);
#endif #endif
/* USB */ /* USB */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#endif
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options

3
include/configs/ls1043ardb.h
View File

@ -286,12 +286,9 @@
/* USB */ /* USB */
#ifndef SPL_NO_USB #ifndef SPL_NO_USB
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#endif #endif
#endif
/* SATA */ /* SATA */
#ifndef SPL_NO_SATA #ifndef SPL_NO_SATA

3
include/configs/ls1046aqds.h
View File

@ -137,11 +137,8 @@ unsigned long get_board_ddr_clk(void);
#endif #endif
/* USB */ /* USB */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#endif
/* SATA */ /* SATA */
#define CONFIG_LIBATA #define CONFIG_LIBATA

3
include/configs/ls1046ardb.h
View File

@ -211,12 +211,9 @@
/* USB */ /* USB */
#ifndef SPL_NO_USB #ifndef SPL_NO_USB
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#endif #endif
#endif
/* SATA */ /* SATA */
#ifndef SPL_NO_SATA #ifndef SPL_NO_SATA

1
include/configs/ls2080aqds.h
View File

@ -438,7 +438,6 @@ unsigned long get_board_ddr_clk(void);
/* /*
* USB * USB
*/ */
#define CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

1
include/configs/ls2080ardb.h
View File

@ -336,7 +336,6 @@ unsigned long get_board_sys_clk(void);
/* /*
* USB * USB
*/ */
#define CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

1
scripts/config_whitelist.txt
View File

@ -873,7 +873,6 @@ CONFIG_HAS_ETH7
CONFIG_HAS_FEC CONFIG_HAS_FEC
CONFIG_HAS_FSL_DR_USB CONFIG_HAS_FSL_DR_USB
CONFIG_HAS_FSL_MPH_USB CONFIG_HAS_FSL_MPH_USB
CONFIG_HAS_FSL_XHCI_USB
CONFIG_HAS_POST CONFIG_HAS_POST
CONFIG_HCLK_FREQ CONFIG_HCLK_FREQ
CONFIG_HDBOOT CONFIG_HDBOOT