@ -66,7 +66,6 @@
# elif defined(CONFIG_ARCH_P1010)
# define CONFIG_FSL_SDHC_V2_3
# define CONFIG_TSECV2
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
# define CONFIG_SYS_FSL_IFC_BANK_COUNT 4
# define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"
@ -102,7 +101,6 @@
# elif defined(CONFIG_ARCH_P1023)
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 2
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
# define CONFIG_SYS_QMAN_NUM_PORTALS 3
# define CONFIG_SYS_BMAN_NUM_PORTALS 3
@ -139,7 +137,6 @@
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_SYS_NUM_FM1_10GEC 1
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_FM_MURAM_SIZE 0x28000
# define CONFIG_SYS_FSL_TBCLK_DIV 32
@ -159,7 +156,6 @@
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_SYS_NUM_FM1_10GEC 1
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_5
# define CONFIG_SYS_FM_MURAM_SIZE 0x28000
# define CONFIG_SYS_FSL_TBCLK_DIV 32
@ -182,7 +178,6 @@
# define CONFIG_SYS_NUM_FM2_DTSEC 4
# define CONFIG_SYS_NUM_FM1_10GEC 1
# define CONFIG_SYS_NUM_FM2_10GEC 1
# define CONFIG_NUM_DDR_CONTROLLERS 2
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_FM_MURAM_SIZE 0x28000
@ -203,7 +198,6 @@
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_SYS_NUM_FM1_10GEC 1
# define CONFIG_NUM_DDR_CONTROLLERS 2
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_FM_MURAM_SIZE 0x28000
@ -227,7 +221,6 @@
# define CONFIG_SYS_NUM_FM1_10GEC 1
# define CONFIG_SYS_NUM_FM2_DTSEC 5
# define CONFIG_SYS_NUM_FM2_10GEC 1
# define CONFIG_NUM_DDR_CONTROLLERS 2
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_FM_MURAM_SIZE 0x28000
@ -241,7 +234,6 @@
# elif defined(CONFIG_ARCH_BSC9131)
# define CONFIG_FSL_SDHC_V2_3
# define CONFIG_TSECV2
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
# define CONFIG_SYS_FSL_DSP_M2_RAM_ADDR 0xb0000000
@ -253,7 +245,6 @@
# elif defined(CONFIG_ARCH_BSC9132)
# define CONFIG_FSL_SDHC_V2_3
# define CONFIG_TSECV2
# define CONFIG_NUM_DDR_CONTROLLERS 2
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_6
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
# define CONFIG_SYS_FSL_DSP_DDR_ADDR 0x40000000
@ -279,13 +270,11 @@
# define CONFIG_SYS_NUM_FM1_10GEC 2
# define CONFIG_SYS_NUM_FM2_DTSEC 8
# define CONFIG_SYS_NUM_FM2_10GEC 2
# define CONFIG_NUM_DDR_CONTROLLERS 3
# else
# define CONFIG_SYS_NUM_FM1_DTSEC 6
# define CONFIG_SYS_NUM_FM1_10GEC 1
# define CONFIG_SYS_NUM_FM2_DTSEC 8
# define CONFIG_SYS_NUM_FM2_10GEC 1
# define CONFIG_NUM_DDR_CONTROLLERS 2
# if defined(CONFIG_ARCH_T4160)
# define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 1 }
# endif
@ -352,7 +341,6 @@
# define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 }
# define CONFIG_SYS_NUM_FM1_DTSEC 6
# define CONFIG_SYS_NUM_FM1_10GEC 2
# define CONFIG_NUM_DDR_CONTROLLERS 2
# define CONFIG_USB_MAX_CONTROLLER_COUNT 1
# define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2
# define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9
@ -365,7 +353,6 @@
# define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 4 }
# define CONFIG_SYS_NUM_FM1_DTSEC 4
# define CONFIG_SYS_NUM_FM1_10GEC 0
# define CONFIG_NUM_DDR_CONTROLLERS 1
# endif
# elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042)
@ -379,7 +366,6 @@
# define CONFIG_SYS_FSL_SRDS_1
# define CONFIG_SYS_NUM_FMAN 1
# define CONFIG_SYS_NUM_FM1_DTSEC 5
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_PME_PLAT_CLK_DIV 2
# define CONFIG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV
@ -417,7 +403,6 @@
# define CONFIG_SYS_NUM_FM1_DTSEC 4
# define CONFIG_SYS_NUM_FM1_10GEC 1
# define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_5_0
# define CONFIG_SYS_FSL_IFC_BANK_COUNT 8
@ -462,7 +447,6 @@
# define CONFIG_SYS_NUM_FM1_10GEC 2
# endif
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_NUM_DDR_CONTROLLERS 1
# define CONFIG_PME_PLAT_CLK_DIV 1
# define CONFIG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV
# define CONFIG_SYS_FM1_CLK 0
@ -486,7 +470,6 @@
# elif defined(CONFIG_ARCH_C29X)
# define CONFIG_FSL_SDHC_V2_3
# define CONFIG_TSECV2_1
# 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_FSL_MAX_NUM_OF_SEC 3