@ -25,7 +25,6 @@
# define CONFIG_SYS_FSL_SEC_MON_BE
# if defined(CONFIG_ARCH_MPC8536)
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_SYS_FSL_ERRATUM_A004508
# define CONFIG_SYS_FSL_ERRATUM_A005125
@ -34,16 +33,13 @@
# elif defined(CONFIG_ARCH_MPC8541)
# define CONFIG_SYS_FSL_DDRC_GEN1
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# elif defined(CONFIG_ARCH_MPC8544)
# define CONFIG_SYS_FSL_DDRC_GEN2
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_SYS_FSL_ERRATUM_A005125
# elif defined(CONFIG_ARCH_MPC8548)
# define CONFIG_SYS_FSL_DDRC_GEN2
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_SYS_FSL_ERRATUM_NMG_DDR120
# define CONFIG_SYS_FSL_ERRATUM_NMG_LBC103
# define CONFIG_SYS_FSL_ERRATUM_NMG_ETSEC129
@ -58,14 +54,12 @@
# elif defined(CONFIG_ARCH_MPC8555)
# define CONFIG_SYS_FSL_DDRC_GEN1
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# elif defined(CONFIG_ARCH_MPC8560)
# define CONFIG_SYS_FSL_DDRC_GEN1
# elif defined(CONFIG_ARCH_MPC8568)
# define CONFIG_SYS_FSL_DDRC_GEN2
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define QE_MURAM_SIZE 0x10000UL
# define MAX_QE_RISC 2
# define QE_NUM_OF_SNUM 28
@ -76,7 +70,6 @@
# define CONFIG_SYS_FSL_SRIO_MSG_UNIT_NUM 2
# elif defined(CONFIG_ARCH_MPC8569)
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define QE_MURAM_SIZE 0x20000UL
# define MAX_QE_RISC 4
# define QE_NUM_OF_SNUM 46
@ -89,7 +82,6 @@
# define CONFIG_SYS_FSL_ERRATUM_A005125
# elif defined(CONFIG_ARCH_MPC8572)
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_SYS_FSL_ERRATUM_DDR_115
# define CONFIG_SYS_FSL_ERRATUM_DDR111_DDR134
# define CONFIG_SYS_FSL_ERRATUM_A004508
@ -98,7 +90,6 @@
# elif defined(CONFIG_ARCH_P1010)
# define CONFIG_FSL_SDHC_V2_3
# define CONFIG_TSECV2
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
@ -123,7 +114,6 @@
# elif defined(CONFIG_ARCH_P1011)
# define CONFIG_TSECV2
# define CONFIG_FSL_PCIE_DISABLE_ASPM
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
@ -133,7 +123,6 @@
# elif defined(CONFIG_ARCH_P1020)
# define CONFIG_TSECV2
# define CONFIG_FSL_PCIE_DISABLE_ASPM
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
# define CONFIG_SYS_FSL_ERRATUM_A004508
@ -145,7 +134,6 @@
# elif defined(CONFIG_ARCH_P1021)
# define CONFIG_TSECV2
# define CONFIG_FSL_PCIE_DISABLE_ASPM
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
# define QE_MURAM_SIZE 0x6000UL
@ -157,7 +145,6 @@
# elif defined(CONFIG_ARCH_P1022)
# define CONFIG_TSECV2
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
# define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
@ -167,7 +154,6 @@
# define CONFIG_SYS_FSL_ERRATUM_A004477
# elif defined(CONFIG_ARCH_P1023)
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 2
# define CONFIG_NUM_DDR_CONTROLLERS 1
@ -185,7 +171,6 @@
# elif defined(CONFIG_ARCH_P1024)
# define CONFIG_TSECV2
# define CONFIG_FSL_PCIE_DISABLE_ASPM
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
@ -197,7 +182,6 @@
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
# define CONFIG_TSECV2
# define CONFIG_FSL_PCIE_DISABLE_ASPM
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
# define QE_MURAM_SIZE 0x6000UL
@ -207,7 +191,6 @@
# define CONFIG_SYS_FSL_ERRATUM_A005125
# elif defined(CONFIG_ARCH_P2020)
# define CONFIG_SYS_FSL_SEC_COMPAT 2
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
# define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001
# define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2
@ -224,7 +207,6 @@
# define CONFIG_SYS_FSL_QORIQ_CHASSIS1
# define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
# define CONFIG_SYS_FSL_NUM_CC_PLLS 2
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_SYS_NUM_FM1_10GEC 1
@ -259,7 +241,6 @@
# define CONFIG_SYS_FSL_QORIQ_CHASSIS1
# define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
# define CONFIG_SYS_FSL_NUM_CC_PLLS 2
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_SYS_NUM_FM1_10GEC 1
@ -296,7 +277,6 @@
# define CONFIG_SYS_FSL_QORIQ_CHASSIS1
# define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
# define CONFIG_SYS_FSL_NUM_CC_PLLS 4
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 2
# define CONFIG_SYS_NUM_FM1_DTSEC 4
# define CONFIG_SYS_NUM_FM2_DTSEC 4
@ -345,7 +325,6 @@
# define CONFIG_SYS_FSL_QORIQ_CHASSIS1
# define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
# define CONFIG_SYS_FSL_NUM_CC_PLLS 2
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_SYS_NUM_FM1_10GEC 1
@ -378,7 +357,6 @@
# define CONFIG_SYS_FSL_QORIQ_CHASSIS1
# define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
# define CONFIG_SYS_FSL_NUM_CC_PLLS 3
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 2
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_SYS_NUM_FM1_10GEC 1
@ -407,7 +385,6 @@
# elif defined(CONFIG_ARCH_BSC9131)
# define CONFIG_FSL_SDHC_V2_3
# define CONFIG_TSECV2
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
@ -423,7 +400,6 @@
# elif defined(CONFIG_ARCH_BSC9132)
# define CONFIG_FSL_SDHC_V2_3
# define CONFIG_TSECV2
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_NUM_DDR_CONTROLLERS 2
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_6
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
@ -473,7 +449,6 @@
# define CONFIG_SYS_FSL_SRDS_2
# define CONFIG_SYS_FSL_SRDS_3
# define CONFIG_SYS_FSL_SRDS_4
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 2
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_PME_CLK 0
@ -515,7 +490,6 @@
# define CONFIG_SYS_MAPLE
# define CONFIG_SYS_CPRI
# define CONFIG_SYS_FSL_NUM_CC_PLLS 5
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
# define CONFIG_SYS_FM1_CLK 0
@ -578,7 +552,6 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
# define CONFIG_SYS_FSL_NUM_CC_PLLS 2
# define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 1, 1, 1 }
# define CONFIG_SYS_FSL_SRDS_1
# define CONFIG_SYS_FSL_SEC_COMPAT 5
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_NUM_DDR_CONTROLLERS 1
@ -624,7 +597,6 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
# define CONFIG_SYS_FSL_NUM_CC_PLL 2
# define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 1, 1, 1 }
# define CONFIG_SYS_FSL_SRDS_1
# define CONFIG_SYS_FSL_SEC_COMPAT 5
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 4
# define CONFIG_SYS_NUM_FM1_10GEC 1
@ -661,7 +633,6 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
# define CONFIG_SYS_FSL_CORES_PER_CLUSTER 4
# define CONFIG_SYS_FSL_NUM_CC_PLLS 2
# define CONFIG_SYS_FSL_QMAN_V3
# define CONFIG_SYS_FSL_SEC_COMPAT 4
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 }
# define CONFIG_SYS_FSL_SRDS_1
@ -709,7 +680,6 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
# elif defined(CONFIG_ARCH_C29X)
# define CONFIG_FSL_SDHC_V2_3
# define CONFIG_TSECV2_1
# define CONFIG_SYS_FSL_SEC_COMPAT 6
# define CONFIG_SYS_FSL_ERRATUM_ESDHC111
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_6