diff options
Diffstat (limited to 'package/boot/uboot-layerscape/patches/0038-Shift-board-specific-configurations.patch')
| -rw-r--r-- | package/boot/uboot-layerscape/patches/0038-Shift-board-specific-configurations.patch | 228 |
1 files changed, 228 insertions, 0 deletions
diff --git a/package/boot/uboot-layerscape/patches/0038-Shift-board-specific-configurations.patch b/package/boot/uboot-layerscape/patches/0038-Shift-board-specific-configurations.patch new file mode 100644 index 0000000000..1c1cc81e2b --- /dev/null +++ b/package/boot/uboot-layerscape/patches/0038-Shift-board-specific-configurations.patch @@ -0,0 +1,228 @@ +From 8f096adfd96941e596b5fbf30a21193e32f2c1b0 Mon Sep 17 00:00:00 2001 +From: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com> +Date: Fri, 27 May 2016 15:10:40 +0530 +Subject: [PATCH 38/93] Shift board specific configurations + +Board specific configurations are moved from +ls1012a_common.h to ls1012aqds.h and ls1012ardb.h + +Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> +Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com> +--- + include/configs/ls1012a_common.h | 60 -------------------------------------- + include/configs/ls1012aqds.h | 58 ++++++++++++++++++++++++++++++++++++ + include/configs/ls1012ardb.h | 58 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 116 insertions(+), 60 deletions(-) + +diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h +index 89d1370..07ef7c6 100644 +--- a/include/configs/ls1012a_common.h ++++ b/include/configs/ls1012a_common.h +@@ -88,66 +88,6 @@ + #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ + #endif /* CONFIG_EMU */ + +-/* MMC */ +-#if !defined(CONFIG_EMU) +-#define CONFIG_MMC +-#ifdef CONFIG_MMC +-#define CONFIG_CMD_MMC +-#define CONFIG_FSL_ESDHC +-#define CONFIG_FSL_ESDHC_TWO_CONTROLLERS_SUPPORT +-#define CONFIG_FSL_ESDHC_1_NON_REMOVABLE_CARD +-#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 +-#define CONFIG_GENERIC_MMC +-#define CONFIG_CMD_FAT +-#define CONFIG_DOS_PARTITION +-#endif +-#endif /* CONFIG_EMU */ +- +-/* SATA */ +-#if !defined(CONFIG_EMU) +-#define CONFIG_LIBATA +-#define CONFIG_SCSI_AHCI +-#define CONFIG_SCSI_AHCI_PLAT +-#define CONFIG_CMD_SCSI +-#define CONFIG_CMD_FAT +-#define CONFIG_CMD_EXT2 +-#define CONFIG_DOS_PARTITION +-#define CONFIG_BOARD_LATE_INIT +- +-#define CONFIG_SYS_SATA AHCI_BASE_ADDR +- +-#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 +-#define CONFIG_SYS_SCSI_MAX_LUN 1 +-#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ +- CONFIG_SYS_SCSI_MAX_LUN) +- +-#define CONFIG_PCI /* Enable PCI/PCIE */ +-#define CONFIG_PCIE1 /* PCIE controller 1 */ +-#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ +-#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 0x08000000 +-#define CONFIG_SYS_PCIE_MEM_PHYS_OFF 0x04000000 +-#define CONFIG_SYS_PCIE_MEM_SIZE 0x80000000 /* 128M */ +- +-#define CONFIG_NET_MULTI +-#define CONFIG_PCI_PNP +-#define CONFIG_E1000 +-#define CONFIG_PCI_SCAN_SHOW +-#define CONFIG_CMD_PCI +-#endif +- + #define CONFIG_CONS_INDEX 1 + #define CONFIG_SYS_NS16550_SERIAL + #define CONFIG_SYS_NS16550_REG_SIZE 1 +diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h +index de998b8..488811b 100644 +--- a/include/configs/ls1012aqds.h ++++ b/include/configs/ls1012aqds.h +@@ -26,6 +26,64 @@ + #define SGMII_CARD_PORT4_PHY_ADDR 0x1F + #endif + ++/* MMC */ ++#if !defined(CONFIG_EMU) ++#define CONFIG_MMC ++#ifdef CONFIG_MMC ++#define CONFIG_CMD_MMC ++#define CONFIG_FSL_ESDHC ++#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 ++#define CONFIG_GENERIC_MMC ++#define CONFIG_CMD_FAT ++#define CONFIG_DOS_PARTITION ++#endif ++#endif /* CONFIG_EMU */ ++ ++/* SATA */ ++#if !defined(CONFIG_EMU) ++#define CONFIG_LIBATA ++#define CONFIG_SCSI_AHCI ++#define CONFIG_SCSI_AHCI_PLAT ++#define CONFIG_CMD_SCSI ++#define CONFIG_CMD_FAT ++#define CONFIG_CMD_EXT2 ++#define CONFIG_DOS_PARTITION ++#define CONFIG_BOARD_LATE_INIT ++ ++#define CONFIG_SYS_SATA AHCI_BASE_ADDR ++ ++#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 ++#define CONFIG_SYS_SCSI_MAX_LUN 1 ++#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ ++ CONFIG_SYS_SCSI_MAX_LUN) ++ ++#define CONFIG_PCI /* Enable PCI/PCIE */ ++#define CONFIG_PCIE1 /* PCIE controller 1 */ ++#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ ++#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 0x08000000 ++#define CONFIG_SYS_PCIE_MEM_PHYS_OFF 0x04000000 ++#define CONFIG_SYS_PCIE_MEM_SIZE 0x80000000 /* 128M */ ++ ++#define CONFIG_NET_MULTI ++#define CONFIG_PCI_PNP ++#define CONFIG_E1000 ++#define CONFIG_PCI_SCAN_SHOW ++#define CONFIG_CMD_PCI ++#endif ++ + /* + * QIXIS Definitions + */ +diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h +index b40e02b..1629e19 100644 +--- a/include/configs/ls1012ardb.h ++++ b/include/configs/ls1012ardb.h +@@ -55,6 +55,64 @@ + #define CONFIG_CMD_USB_MASS_STORAGE + #endif + ++/* MMC */ ++#if !defined(CONFIG_EMU) ++#define CONFIG_MMC ++#ifdef CONFIG_MMC ++#define CONFIG_CMD_MMC ++#define CONFIG_FSL_ESDHC ++#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 ++#define CONFIG_GENERIC_MMC ++#define CONFIG_CMD_FAT ++#define CONFIG_DOS_PARTITION ++#endif ++#endif /* CONFIG_EMU */ ++ ++/* SATA */ ++#if !defined(CONFIG_EMU) ++#define CONFIG_LIBATA ++#define CONFIG_SCSI_AHCI ++#define CONFIG_SCSI_AHCI_PLAT ++#define CONFIG_CMD_SCSI ++#define CONFIG_CMD_FAT ++#define CONFIG_CMD_EXT2 ++#define CONFIG_DOS_PARTITION ++#define CONFIG_BOARD_LATE_INIT ++ ++#define CONFIG_SYS_SATA AHCI_BASE_ADDR ++ ++#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 ++#define CONFIG_SYS_SCSI_MAX_LUN 1 ++#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ ++ CONFIG_SYS_SCSI_MAX_LUN) ++ ++#define CONFIG_PCI /* Enable PCI/PCIE */ ++#define CONFIG_PCIE1 /* PCIE controller 1 */ ++#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ ++#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 0x08000000 ++#define CONFIG_SYS_PCIE_MEM_PHYS_OFF 0x04000000 ++#define CONFIG_SYS_PCIE_MEM_SIZE 0x80000000 /* 128M */ ++ ++#define CONFIG_NET_MULTI ++#define CONFIG_PCI_PNP ++#define CONFIG_E1000 ++#define CONFIG_PCI_SCAN_SHOW ++#define CONFIG_CMD_PCI ++#endif ++ + /* + * I2C IO expander + */ +-- +1.7.9.5 + |