Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

armv8: ls1043a: Enable PCIe and E1000 in defconfigs

Browse source 
The patch enables PCIe and E1000 in ls1043a defconfigs and
removes unused PCIe related macro defines.

Signed-off-by: Minghuan Lian <Minghuan.Lian@nxp.com>
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Minghuan Lian 2016-12-13 14:54:20 +08:00 committed by York Sun
parent 41873d1571
commit be6430dc7a
12 changed files with 66 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configs/ls1043aqds_defconfig
View file

@ -24,7 +24,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -32,3 +31,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043aqds_lpuart_defconfig
View file

@ -25,7 +25,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_FSL_LPUART=y CONFIG_FSL_LPUART=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
@ -34,3 +33,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043aqds_nand_defconfig
View file

@ -38,7 +38,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -46,3 +45,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043aqds_nor_ddr3_defconfig
View file

@ -25,7 +25,6 @@ CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SYS_FSL_DDR3=y CONFIG_SYS_FSL_DDR3=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -33,3 +32,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043aqds_qspi_defconfig
View file

@ -27,7 +27,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -35,3 +34,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043aqds_sdcard_ifc_defconfig
View file

@ -38,7 +38,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -46,3 +45,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043aqds_sdcard_qspi_defconfig
View file

@ -39,7 +39,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -47,3 +46,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043ardb_SECURE_BOOT_defconfig
View file

@ -20,7 +20,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -30,3 +29,9 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_RSA=y CONFIG_RSA=y
CONFIG_SPL_RSA=y CONFIG_SPL_RSA=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043ardb_defconfig
View file

@ -20,7 +20,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -28,3 +27,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043ardb_nand_defconfig
View file

@ -34,7 +34,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -42,3 +41,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

7
configs/ls1043ardb_sdcard_defconfig
View file

@ -34,7 +34,6 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_PCI=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_USB=y CONFIG_USB=y
@ -42,3 +41,9 @@ CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y

17
include/configs/ls1043a_common.h
View file

@ -118,27 +118,10 @@
#define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCIE1 /* PCIE controller 1 */
#define CONFIG_PCIE2 /* PCIE controller 2 */ #define CONFIG_PCIE2 /* PCIE controller 2 */
#define CONFIG_PCIE3 /* PCIE controller 3 */ #define CONFIG_PCIE3 /* PCIE controller 3 */
#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */
#define FSL_PCIE_COMPAT "fsl,ls1043a-pcie" #define FSL_PCIE_COMPAT "fsl,ls1043a-pcie"
#define CONFIG_SYS_PCI_64BIT
#define CONFIG_SYS_PCIE_CFG0_PHYS_OFF 0x00000000
#define CONFIG_SYS_PCIE_CFG0_SIZE 0x00001000 /* 4k */
#define CONFIG_SYS_PCIE_CFG1_PHYS_OFF 0x00001000
#define CONFIG_SYS_PCIE_CFG1_SIZE 0x00001000 /* 4k */
#define CONFIG_SYS_PCIE_IO_BUS 0x00000000
#define CONFIG_SYS_PCIE_IO_PHYS_OFF 0x00010000
#define CONFIG_SYS_PCIE_IO_SIZE 0x00010000 /* 64k */
#define CONFIG_SYS_PCIE_MEM_BUS 0x40000000
#define CONFIG_SYS_PCIE_MEM_PHYS_OFF 0x40000000
#define CONFIG_SYS_PCIE_MEM_SIZE 0x40000000 /* 1G */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define CONFIG_NET_MULTI #define CONFIG_NET_MULTI
#define CONFIG_E1000
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI
#endif #endif