diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ls1012a_common.h | 2 | ||||
| -rw-r--r-- | include/configs/ls1012afrdm.h | 10 | ||||
| -rw-r--r-- | include/configs/ls1012aqds.h | 8 | ||||
| -rw-r--r-- | include/configs/ls1012ardb.h | 9 | ||||
| -rw-r--r-- | include/configs/ls1021aiot.h | 8 | ||||
| -rw-r--r-- | include/configs/ls1021aqds.h | 8 | ||||
| -rw-r--r-- | include/configs/ls1021atwr.h | 8 | ||||
| -rw-r--r-- | include/configs/ls1043aqds.h | 7 | ||||
| -rw-r--r-- | include/configs/ls1043ardb.h | 9 | ||||
| -rw-r--r-- | include/configs/ls1046aqds.h | 7 | ||||
| -rw-r--r-- | include/configs/ls1046ardb.h | 9 | ||||
| -rw-r--r-- | include/configs/ls1088aqds.h | 1 | ||||
| -rw-r--r-- | include/configs/ls1088ardb.h | 1 | ||||
| -rw-r--r-- | include/configs/ls2080aqds.h | 7 | ||||
| -rw-r--r-- | include/configs/ls2080ardb.h | 7 | ||||
| -rw-r--r-- | include/linux/usb/xhci-fsl.h | 2 | 
16 files changed, 2 insertions, 101 deletions
| diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 77bd9308562..d2fa50a8be7 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -32,7 +32,7 @@  #define CONFIG_SYS_DDR_BLOCK2_BASE     0x880000000ULL  /* Generic Timer Definitions */ -#define COUNTER_FREQUENCY		CONFIG_SYS_CLK_FREQ/4	/* 25MHz */ +#define COUNTER_FREQUENCY		25000000	/* 25MHz */  /* CSU */  #define CONFIG_LAYERSCAPE_NS_ACCESS diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 6b1ba578e92..efb4c00cd91 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -31,16 +31,6 @@         "kernel_load=0x96000000\0"              \         "kernel_size=0x2800000\0" -/* -* USB -*/ -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB -#define CONFIG_USB_XHCI_FSL -#define CONFIG_USB_MAX_CONTROLLER_COUNT         1 -#endif -  #define CONFIG_CMD_MEMINFO  #define CONFIG_CMD_MEMTEST  #define CONFIG_SYS_MEMTEST_START	0x80000000 diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 2899ff13dc1..d15054709ec 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -118,14 +118,6 @@  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET  #endif -/*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_MAX_CONTROLLER_COUNT         1 -#endif -  /*  MMC  */  #ifdef CONFIG_MMC  #define CONFIG_FSL_ESDHC diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index c720a8d4bcf..794117062f4 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -19,15 +19,6 @@  #define CONFIG_SYS_MEMTEST_START	0x80000000  #define CONFIG_SYS_MEMTEST_END		0x9fffffff -/* -* USB -*/ -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB -#define CONFIG_USB_XHCI_FSL -#define CONFIG_USB_MAX_CONTROLLER_COUNT         1 -#endif  /*   * I2C IO expander diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 63667810bd1..46bf55f8917 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -19,14 +19,6 @@  #define CONFIG_SYS_INIT_RAM_ADDR	OCRAM_BASE_ADDR  #define CONFIG_SYS_INIT_RAM_SIZE	OCRAM_SIZE -/* 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_MAX_CONTROLLER_COUNT		1 -#endif -  #define CONFIG_SYS_CLK_FREQ		100000000  #define CONFIG_DDR_CLK_FREQ		100000000 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index f3d3aa22712..6669f2f9602 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -404,14 +404,6 @@ unsigned long get_board_ddr_clk(void);  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET  #endif -/*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_MAX_CONTROLLER_COUNT		1 -#endif -  /*   * Video   */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 852ff57fb6d..0f20e5e2cc8 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -44,14 +44,6 @@  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET  #endif -/* 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_MAX_CONTROLLER_COUNT        1 -#endif -  #define CONFIG_SYS_CLK_FREQ		100000000  #define CONFIG_DDR_CLK_FREQ		100000000 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 5aadd92efd5..8cc2abb2b6b 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -370,13 +370,6 @@ unsigned long get_board_ddr_clk(void);  #endif  #endif -/* USB */ -#define CONFIG_HAS_FSL_XHCI_USB -#ifdef CONFIG_HAS_FSL_XHCI_USB -#define CONFIG_USB_XHCI_FSL -#define CONFIG_USB_MAX_CONTROLLER_COUNT		3 -#endif -  /*   * Miscellaneous configurable options   */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index f9843f5ebae..b4b4d5e178f 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -284,15 +284,6 @@  #endif  #endif -/* 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_MAX_CONTROLLER_COUNT		3 -#endif -#endif -  /* SATA */  #ifndef SPL_NO_SATA  #define CONFIG_LIBATA diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 39bd1c38a80..586e9e9b6b3 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -136,13 +136,6 @@ unsigned long get_board_ddr_clk(void);  #define CFG_LPUART_EN		0x2  #endif -/* USB */ -#define CONFIG_HAS_FSL_XHCI_USB -#ifdef CONFIG_HAS_FSL_XHCI_USB -#define CONFIG_USB_XHCI_FSL -#define CONFIG_USB_MAX_CONTROLLER_COUNT         3 -#endif -  /* SATA */  #define CONFIG_LIBATA  #define CONFIG_SCSI_AHCI diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 7bbd4ada707..bb27dd058a4 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -209,15 +209,6 @@  #endif  #endif -/* 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_MAX_CONTROLLER_COUNT         3 -#endif -#endif -  /* SATA */  #ifndef SPL_NO_SATA  #define CONFIG_LIBATA diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 71d0e4e7d19..c2e6fd26d35 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -20,7 +20,6 @@ unsigned long get_board_ddr_clk(void);  #if defined(CONFIG_QSPI_BOOT) -#define CONFIG_ENV_IS_IN_SPI_FLASH  #define CONFIG_ENV_SIZE			0x2000          /* 8KB */  #define CONFIG_ENV_OFFSET		0x300000        /* 3MB */  #define CONFIG_ENV_SECT_SIZE		0x40000 diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 39f1345f979..478ddd0864f 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -12,7 +12,6 @@  #define CONFIG_DISPLAY_BOARDINFO_LATE  #if defined(CONFIG_QSPI_BOOT) -#define CONFIG_ENV_IS_IN_SPI_FLASH  #define CONFIG_ENV_SIZE			0x2000          /* 8KB */  #define CONFIG_ENV_OFFSET		0x300000        /* 3MB */  #define CONFIG_ENV_SECT_SIZE		0x40000 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 54d6b51c552..f1968cc5335 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -435,13 +435,6 @@ unsigned long get_board_ddr_clk(void);  #endif -/* - * USB - */ -#define CONFIG_HAS_FSL_XHCI_USB -#define CONFIG_USB_XHCI_FSL -#define CONFIG_USB_MAX_CONTROLLER_COUNT		2 -  #include <asm/fsl_secure_boot.h>  #endif /* __LS2_QDS_H */ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 9e9979e1c7f..48c3a5397f7 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -333,13 +333,6 @@ unsigned long get_board_sys_clk(void);  #define CONFIG_MISC_INIT_R -/* - * USB - */ -#define CONFIG_HAS_FSL_XHCI_USB -#define CONFIG_USB_XHCI_FSL -#define CONFIG_USB_MAX_CONTROLLER_COUNT         2 -  #undef CONFIG_CMDLINE_EDITING  #include <config_distro_defaults.h> diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index bd54089722f..a916afb885a 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -58,7 +58,7 @@ struct fsl_xhci {  #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR  #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0  #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif defined(CONFIG_ARCH_LS2080A) +#elif defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A)  #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR  #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR  #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 | 
