mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-27 21:07:15 +00:00
arm: layerscape: Remove CONFIG_USB_MAX_CONTROLLER_COUNT
Because COMFIG_DM_USB has been enabled and will not use it anymore. 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:
parent
420b0eba3c
commit
90be2fe37e
12 changed files with 0 additions and 47 deletions
|
@ -31,11 +31,6 @@
|
||||||
"kernel_load=0x96000000\0" \
|
"kernel_load=0x96000000\0" \
|
||||||
"kernel_size=0x2800000\0"
|
"kernel_size=0x2800000\0"
|
||||||
|
|
||||||
/*
|
|
||||||
* USB
|
|
||||||
*/
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
|
||||||
|
|
||||||
#define CONFIG_CMD_MEMINFO
|
#define CONFIG_CMD_MEMINFO
|
||||||
#define CONFIG_CMD_MEMTEST
|
#define CONFIG_CMD_MEMTEST
|
||||||
#define CONFIG_SYS_MEMTEST_START 0x80000000
|
#define CONFIG_SYS_MEMTEST_START 0x80000000
|
||||||
|
|
|
@ -118,9 +118,6 @@
|
||||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*XHCI Support - enabled by default*/
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
|
||||||
|
|
||||||
/* MMC */
|
/* MMC */
|
||||||
#ifdef CONFIG_MMC
|
#ifdef CONFIG_MMC
|
||||||
#define CONFIG_FSL_ESDHC
|
#define CONFIG_FSL_ESDHC
|
||||||
|
|
|
@ -19,10 +19,6 @@
|
||||||
#define CONFIG_SYS_MEMTEST_START 0x80000000
|
#define CONFIG_SYS_MEMTEST_START 0x80000000
|
||||||
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
|
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
|
||||||
|
|
||||||
/*
|
|
||||||
* USB
|
|
||||||
*/
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C IO expander
|
* I2C IO expander
|
||||||
|
|
|
@ -19,9 +19,6 @@
|
||||||
#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR
|
#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR
|
||||||
#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE
|
#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE
|
||||||
|
|
||||||
/* XHCI Support - enabled by default */
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
|
||||||
|
|
||||||
#define CONFIG_SYS_CLK_FREQ 100000000
|
#define CONFIG_SYS_CLK_FREQ 100000000
|
||||||
#define CONFIG_DDR_CLK_FREQ 100000000
|
#define CONFIG_DDR_CLK_FREQ 100000000
|
||||||
|
|
||||||
|
|
|
@ -404,9 +404,6 @@ unsigned long get_board_ddr_clk(void);
|
||||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*XHCI Support - enabled by default*/
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Video
|
* Video
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -44,9 +44,6 @@
|
||||||
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* XHCI Support - enabled by default */
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
|
||||||
|
|
||||||
#define CONFIG_SYS_CLK_FREQ 100000000
|
#define CONFIG_SYS_CLK_FREQ 100000000
|
||||||
#define CONFIG_DDR_CLK_FREQ 100000000
|
#define CONFIG_DDR_CLK_FREQ 100000000
|
||||||
|
|
||||||
|
|
|
@ -370,9 +370,6 @@ unsigned long get_board_ddr_clk(void);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* USB */
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Miscellaneous configurable options
|
* Miscellaneous configurable options
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -284,11 +284,6 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* USB */
|
|
||||||
#ifndef SPL_NO_USB
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* SATA */
|
/* SATA */
|
||||||
#ifndef SPL_NO_SATA
|
#ifndef SPL_NO_SATA
|
||||||
#define CONFIG_LIBATA
|
#define CONFIG_LIBATA
|
||||||
|
|
|
@ -136,9 +136,6 @@ unsigned long get_board_ddr_clk(void);
|
||||||
#define CFG_LPUART_EN 0x2
|
#define CFG_LPUART_EN 0x2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* USB */
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
|
||||||
|
|
||||||
/* SATA */
|
/* SATA */
|
||||||
#define CONFIG_LIBATA
|
#define CONFIG_LIBATA
|
||||||
#define CONFIG_SCSI_AHCI
|
#define CONFIG_SCSI_AHCI
|
||||||
|
|
|
@ -209,11 +209,6 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* USB */
|
|
||||||
#ifndef SPL_NO_USB
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* SATA */
|
/* SATA */
|
||||||
#ifndef SPL_NO_SATA
|
#ifndef SPL_NO_SATA
|
||||||
#define CONFIG_LIBATA
|
#define CONFIG_LIBATA
|
||||||
|
|
|
@ -435,11 +435,6 @@ unsigned long get_board_ddr_clk(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* USB
|
|
||||||
*/
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
|
||||||
|
|
||||||
#include <asm/fsl_secure_boot.h>
|
#include <asm/fsl_secure_boot.h>
|
||||||
|
|
||||||
#endif /* __LS2_QDS_H */
|
#endif /* __LS2_QDS_H */
|
||||||
|
|
|
@ -333,11 +333,6 @@ unsigned long get_board_sys_clk(void);
|
||||||
|
|
||||||
#define CONFIG_MISC_INIT_R
|
#define CONFIG_MISC_INIT_R
|
||||||
|
|
||||||
/*
|
|
||||||
* USB
|
|
||||||
*/
|
|
||||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
|
||||||
|
|
||||||
#undef CONFIG_CMDLINE_EDITING
|
#undef CONFIG_CMDLINE_EDITING
|
||||||
#include <config_distro_defaults.h>
|
#include <config_distro_defaults.h>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue