|
@@ -9,10 +9,6 @@
|
|
|
|
|
|
/* SoC specific defines for Freescale MPC85xx (PQ3) and QorIQ processors */
|
|
|
|
|
|
-#ifdef CONFIG_SYS_CCSRBAR_DEFAULT
|
|
|
-#error "Do not define CONFIG_SYS_CCSRBAR_DEFAULT in the board header file."
|
|
|
-#endif
|
|
|
-
|
|
|
/*
|
|
|
* This macro should be removed when we no longer care about backwards
|
|
|
* compatibility with older operating systems.
|
|
@@ -39,27 +35,23 @@
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 12
|
|
|
#define CONFIG_SYS_PPC_E500_DEBUG_TLB 1
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A004508
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A005125
|
|
|
|
|
|
#elif defined(CONFIG_ARCH_MPC8540)
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 8
|
|
|
#define CONFIG_SYS_FSL_DDRC_GEN1
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
|
|
|
#elif defined(CONFIG_ARCH_MPC8541)
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 8
|
|
|
#define CONFIG_SYS_FSL_DDRC_GEN1
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
|
|
|
#elif defined(CONFIG_ARCH_MPC8544)
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 10
|
|
|
#define CONFIG_SYS_FSL_DDRC_GEN2
|
|
|
#define CONFIG_SYS_PPC_E500_DEBUG_TLB 0
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A005125
|
|
|
|
|
|
#elif defined(CONFIG_ARCH_MPC8548)
|
|
@@ -67,7 +59,6 @@
|
|
|
#define CONFIG_SYS_FSL_DDRC_GEN2
|
|
|
#define CONFIG_SYS_PPC_E500_DEBUG_TLB 0
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_NMG_DDR120
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_NMG_LBC103
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_NMG_ETSEC129
|
|
@@ -84,12 +75,10 @@
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 8
|
|
|
#define CONFIG_SYS_FSL_DDRC_GEN1
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
|
|
|
#elif defined(CONFIG_ARCH_MPC8560)
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 8
|
|
|
#define CONFIG_SYS_FSL_DDRC_GEN1
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
|
|
|
#elif defined(CONFIG_ARCH_MPC8568)
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 10
|
|
@@ -98,7 +87,6 @@
|
|
|
#define QE_MURAM_SIZE 0x10000UL
|
|
|
#define MAX_QE_RISC 2
|
|
|
#define QE_NUM_OF_SNUM 28
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_SRIO_MAX_PORTS 1
|
|
|
#define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9
|
|
|
#define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5
|
|
@@ -111,7 +99,6 @@
|
|
|
#define QE_MURAM_SIZE 0x20000UL
|
|
|
#define MAX_QE_RISC 4
|
|
|
#define QE_NUM_OF_SNUM 46
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_SRIO_MAX_PORTS 1
|
|
|
#define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9
|
|
|
#define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5
|
|
@@ -124,7 +111,6 @@
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 12
|
|
|
#define CONFIG_SYS_PPC_E500_DEBUG_TLB 2
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_DDR_115
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A004508
|
|
@@ -140,7 +126,6 @@
|
|
|
#define CONFIG_NUM_DDR_CONTROLLERS 1
|
|
|
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
|
|
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 4
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"
|
|
|
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_IFC_A002769
|
|
@@ -165,7 +150,6 @@
|
|
|
#define CONFIG_FSL_PCIE_DISABLE_ASPM
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A004508
|
|
@@ -177,7 +161,6 @@
|
|
|
#define CONFIG_TSECV2
|
|
|
#define CONFIG_FSL_PCIE_DISABLE_ASPM
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A004508
|
|
@@ -192,7 +175,6 @@
|
|
|
#define CONFIG_TSECV2
|
|
|
#define CONFIG_FSL_PCIE_DISABLE_ASPM
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define QE_MURAM_SIZE 0x6000UL
|
|
@@ -208,7 +190,6 @@
|
|
|
#define CONFIG_TSECV2
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define CONFIG_FSL_SATA_ERRATUM_A001
|
|
@@ -227,7 +208,6 @@
|
|
|
#define CONFIG_SYS_BMAN_NUM_PORTALS 3
|
|
|
#define CONFIG_SYS_FM_MURAM_SIZE 0x10000
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff600000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A004508
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A005125
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_I2C_A004447
|
|
@@ -241,7 +221,6 @@
|
|
|
#define CONFIG_FSL_PCIE_DISABLE_ASPM
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A004508
|
|
@@ -255,7 +234,6 @@
|
|
|
#define CONFIG_TSECV2
|
|
|
#define CONFIG_FSL_PCIE_DISABLE_ASPM
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define QE_MURAM_SIZE 0x6000UL
|
|
@@ -268,7 +246,6 @@
|
|
|
#define CONFIG_SYS_FSL_NUM_LAWS 12
|
|
|
#define CONFIG_SYS_PPC_E500_DEBUG_TLB 2
|
|
|
#define CONFIG_SYS_FSL_SEC_COMPAT 2
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001
|
|
|
#define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2
|
|
@@ -295,7 +272,6 @@
|
|
|
#define CONFIG_SYS_FM_MURAM_SIZE 0x28000
|
|
|
#define CONFIG_SYS_FSL_TBCLK_DIV 32
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_USB1_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB2_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
|
|
@@ -332,7 +308,6 @@
|
|
|
#define CONFIG_SYS_FM_MURAM_SIZE 0x28000
|
|
|
#define CONFIG_SYS_FSL_TBCLK_DIV 32
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_USB1_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB2_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
|
|
@@ -374,7 +349,6 @@
|
|
|
#define CONFIG_SYS_FM_MURAM_SIZE 0x28000
|
|
|
#define CONFIG_SYS_FSL_TBCLK_DIV 16
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,p4080-pcie"
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_CPC_A002
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_CPC_A003
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_DDR_A003
|
|
@@ -423,7 +397,6 @@
|
|
|
#define CONFIG_SYS_FM_MURAM_SIZE 0x28000
|
|
|
#define CONFIG_SYS_FSL_TBCLK_DIV 32
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_USB1_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB2_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
|
|
@@ -460,7 +433,6 @@
|
|
|
#define CONFIG_SYS_FM_MURAM_SIZE 0x28000
|
|
|
#define CONFIG_SYS_FSL_TBCLK_DIV 16
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.4"
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_USB1_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB2_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
|
|
@@ -486,7 +458,6 @@
|
|
|
#define CONFIG_SYS_FSL_DSP_M2_RAM_ADDR 0xb0000000
|
|
|
#define CONFIG_SYS_FSL_DSP_CCSRBAR_DEFAULT 0xff600000
|
|
|
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 3
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_NAND_FSL_IFC
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A005125
|
|
@@ -507,7 +478,6 @@
|
|
|
#define CONFIG_SYS_FSL_DSP_M3_RAM_ADDR 0xc0000000
|
|
|
#define CONFIG_SYS_FSL_DSP_CCSRBAR_DEFAULT 0xff600000
|
|
|
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 3
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_NAND_FSL_IFC
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define CONFIG_SYS_FSL_ESDHC_P1010_BROKEN_SDCLK
|
|
@@ -575,7 +545,6 @@
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A007186
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A006593
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A007798
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_SFP_VER_3_0
|
|
|
#define CONFIG_SYS_FSL_PCI_VER_3_X
|
|
|
|
|
@@ -618,7 +587,6 @@
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A006384
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A007212
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A004477
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_SFP_VER_3_0
|
|
|
|
|
|
#ifdef CONFIG_ARCH_B4860
|
|
@@ -681,7 +649,6 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.4"
|
|
|
#define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
|
|
|
#define QE_MURAM_SIZE 0x6000UL
|
|
@@ -725,7 +692,6 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
|
|
|
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.4"
|
|
|
#define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
|
#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
|
|
|
#define QE_MURAM_SIZE 0x6000UL
|
|
@@ -778,7 +744,6 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
|
|
|
#define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
|
|
|
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A007212
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
|
|
|
#define CONFIG_SYS_FSL_SFP_VER_3_0
|
|
|
#define CONFIG_SYS_FSL_ISBC_VER 2
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
|
|
@@ -799,22 +764,16 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
|
|
|
#define CONFIG_NUM_DDR_CONTROLLERS 1
|
|
|
#define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_6
|
|
|
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
|
|
|
#define CONFIG_SYS_FSL_ERRATUM_A005125
|
|
|
#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 3
|
|
|
#define CONFIG_SYS_FSL_SEC_IDX_OFFSET 0x20000
|
|
|
|
|
|
#elif defined(CONFIG_ARCH_QEMU_E500)
|
|
|
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xe0000000
|
|
|
|
|
|
#else
|
|
|
#error Processor type not defined for this platform
|
|
|
#endif
|
|
|
|
|
|
-#ifndef CONFIG_SYS_CCSRBAR_DEFAULT
|
|
|
-#error "CONFIG_SYS_CCSRBAR_DEFAULT is not defined for this platform."
|
|
|
-#endif
|
|
|
-
|
|
|
#ifdef CONFIG_E6500
|
|
|
#define CONFIG_SYS_FSL_THREADS_PER_CORE 2
|
|
|
#else
|