global: Move remaining CONFIG_SYS_NUM_* to CFG_SYS_NUM_*

The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_NUM
namespace do not easily transition to Kconfig. In many cases they likely
should come from the device tree instead. Move these out of CONFIG
namespace and in to CFG namespace.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index 9086207954eae1fd03c272ff1765904ac77d60c6..efb1d37df9a62ca6f818ccc77b9eaf2f22b9e5b9 100644 (file)
--- a/README
+++ b/README
@@ -923,7 +923,7 @@ The following options need to be configured:
                with a list of GPIO LEDs that have inverted polarity.
 
 - I2C Support:
-               CONFIG_SYS_NUM_I2C_BUSES
+               CFG_SYS_NUM_I2C_BUSES
                Hold the number of i2c buses you want to use.
 
                CONFIG_SYS_I2C_DIRECT_BUS
@@ -940,7 +940,7 @@ The following options need to be configured:
                hold a list of buses you want to use, only used if
                CONFIG_SYS_I2C_DIRECT_BUS is not defined, for example
                a board with CONFIG_SYS_I2C_MAX_HOPS = 1 and
-               CONFIG_SYS_NUM_I2C_BUSES = 9:
+               CFG_SYS_NUM_I2C_BUSES = 9:
 
                 CONFIG_SYS_I2C_BUSES   {{0, {I2C_NULL_HOP}}, \
                                        {0, {{I2C_MUX_PCA9547, 0x70, 1}}}, \

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index ff752c21b14db7a95dc60c6c794a33b22fd018a4..0669222fed7f0af30abd3b36763055a1752abae6 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -209,9 +209,9 @@
 
 /* SoC related */
 #ifdef CONFIG_ARCH_LS1043A
-#define CONFIG_SYS_NUM_FMAN                    1
-#define CONFIG_SYS_NUM_FM1_DTSEC               7
-#define CONFIG_SYS_NUM_FM1_10GEC               1
+#define CFG_SYS_NUM_FMAN                       1
+#define CFG_SYS_NUM_FM1_DTSEC          7
+#define CFG_SYS_NUM_FM1_10GEC          1
 #define CONFIG_SYS_DDR_BLOCK1_SIZE             ((phys_size_t)2 << 30)
 #define CONFIG_MAX_MEM_MAPPED                  CONFIG_SYS_DDR_BLOCK1_SIZE
 
@@ -255,9 +255,9 @@
 #define CONFIG_MAX_MEM_MAPPED          CONFIG_SYS_DDR_BLOCK1_SIZE
 
 #elif defined(CONFIG_ARCH_LS1046A)
-#define CONFIG_SYS_NUM_FMAN                    1
-#define CONFIG_SYS_NUM_FM1_DTSEC               8
-#define CONFIG_SYS_NUM_FM1_10GEC               2
+#define CFG_SYS_NUM_FMAN                       1
+#define CFG_SYS_NUM_FM1_DTSEC          8
+#define CFG_SYS_NUM_FM1_10GEC          2
 #define CONFIG_SYS_DDR_BLOCK1_SIZE  ((phys_size_t)2 << 30)
 #define CONFIG_MAX_MEM_MAPPED           CONFIG_SYS_DDR_BLOCK1_SIZE
 

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
index aef615873343dec465ff2d40b15c4b302b5cf427..c11018d732943a6e1e3e4dbb6c90aa8adde50c8d 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
@@ -160,7 +160,7 @@ struct sys_info {
        unsigned long freq_localbus;
        unsigned long freq_cga_m2;
 #ifdef CONFIG_SYS_DPAA_FMAN
-       unsigned long freq_fman[CONFIG_SYS_NUM_FMAN];
+       unsigned long freq_fman[CFG_SYS_NUM_FMAN];
 #endif
        unsigned long freq_qman;
 };

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
index bad18d778aa0d25b15ccc1eaf7f9a42c847ba828..a4e971ebbd70695664a2357f6286b66fb3966157 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
@@ -306,7 +306,7 @@ struct sys_info {
        unsigned long freq_localbus;
        unsigned long freq_qe;
 #ifdef CONFIG_SYS_DPAA_FMAN
-       unsigned long freq_fman[CONFIG_SYS_NUM_FMAN];
+       unsigned long freq_fman[CFG_SYS_NUM_FMAN];
 #endif
 #ifdef CONFIG_SYS_DPAA_QBMAN
        unsigned long freq_qman;

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 49a1aac42b532e6a757b624d3893f074aa20eb9a..b0363c9c1028ef5c4cf7960c4d56ab88ad707407 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -264,7 +264,7 @@ int checkcpu (void)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-       for (i = 0; i < CONFIG_SYS_NUM_FMAN; i++) {
+       for (i = 0; i < CFG_SYS_NUM_FMAN; i++) {
                printf("       FMAN%d: %s MHz\n", i + 1,
                        strmhz(buf1, sysinfo.freq_fman[i]));
        }

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 47bea512c928e9ba4405a69b594fdef4157b394e..2c320b202ea222fe1a01dbb9e80ecf155bfbda5c 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -162,7 +162,7 @@ void disable_cpc_sram(void)
 
        cpc_corenet_t *cpc = (cpc_corenet_t *)CFG_SYS_FSL_CPC_ADDR;
 
-       for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
+       for (i = 0; i < CFG_SYS_NUM_CPC; i++, cpc++) {
                if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN) {
                        /* find and disable LAW of SRAM */
                        struct law_entry law = find_law(CONFIG_SYS_INIT_L3_ADDR);
@@ -232,7 +232,7 @@ void enable_cpc(void)
                        have_hwconfig = true;
        }
 
-       for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
+       for (i = 0; i < CFG_SYS_NUM_CPC; i++, cpc++) {
                if (have_hwconfig) {
                        sprintf(cpc_subarg, "cpc%u", i + 1);
                        cpc_args = hwconfig_sub_f("en_cpc", cpc_subarg, buffer);
@@ -273,7 +273,7 @@ static void invalidate_cpc(void)
        int i;
        cpc_corenet_t *cpc = (cpc_corenet_t *)CFG_SYS_FSL_CPC_ADDR;
 
-       for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
+       for (i = 0; i < CFG_SYS_NUM_CPC; i++, cpc++) {
                /* skip CPC when it used as all SRAM */
                if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN)
                        continue;

diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 6dd61caf1c47e24458fa92212b889a3e2dbd9b41..32348b4e147f4edb4fde0dc43b7f29287d22f4ef 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -167,7 +167,7 @@ static inline void ft_fixup_l3cache(void *blob, int off)
        cpc_corenet_t *cpc = (void *)CFG_SYS_FSL_CPC_ADDR;
        u32 cfg0 = in_be32(&cpc->cpccfg0);
 
-       size = CPC_CFG0_SZ_K(cfg0) * 1024 * CONFIG_SYS_NUM_CPC;
+       size = CPC_CFG0_SZ_K(cfg0) * 1024 * CFG_SYS_NUM_CPC;
        num_ways = CPC_CFG0_NUM_WAYS(cfg0);
        line_size = CPC_CFG0_LINE_SZ(cfg0);
        num_sets = size / (line_size * num_ways);
@@ -469,7 +469,7 @@ static void ft_fixup_dpaa_clks(void *blob)
        ft_fixup_clks(blob, "fsl,fman", CFG_SYS_FSL_FM1_OFFSET,
                        sysinfo.freq_fman[0]);
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        ft_fixup_clks(blob, "fsl,fman", CFG_SYS_FSL_FM2_OFFSET,
                        sysinfo.freq_fman[1]);
 #endif

diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index 9ad48d440f927f6476bdd2edc2077e7ebaa7231e..abc14fae4ec087ff9dc602f71e7e263a7683e473 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -104,7 +104,7 @@ static void setup_fman_liodn_base(enum fsl_dpaa_dev dev,
                fm = (void *)CFG_SYS_FSL_FM1_ADDR;
                break;
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        case FSL_HW_PORTAL_FMAN2:
                fm = (void *)CFG_SYS_FSL_FM2_ADDR;
                break;
@@ -201,7 +201,7 @@ void set_liodns(void)
        setup_fman_liodn_base(FSL_HW_PORTAL_FMAN1, fman1_liodn_tbl,
                                fman1_liodn_tbl_sz);
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        set_fman_liodn(fman2_liodn_tbl, fman2_liodn_tbl_sz);
        setup_fman_liodn_base(FSL_HW_PORTAL_FMAN2, fman2_liodn_tbl,
                                fman2_liodn_tbl_sz);
@@ -373,7 +373,7 @@ void fdt_fixup_liodn(void *blob)
        fdt_fixup_liodn_tbl(blob, liodn_tbl, liodn_tbl_sz);
 #ifdef CONFIG_SYS_DPAA_FMAN
        fdt_fixup_liodn_tbl_fman(blob, fman1_liodn_tbl, fman1_liodn_tbl_sz);
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        fdt_fixup_liodn_tbl_fman(blob, fman2_liodn_tbl, fman2_liodn_tbl_sz);
 #endif
 #endif

diff --git a/arch/powerpc/cpu/mpc85xx/p2041_ids.c b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
index 8a8334667824ccd969ed4898a570a03abbf282f6..2b790868e126e0d4dab83586d982b3f673742424 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/p2041_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
@@ -66,7 +66,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
        SET_FMAN_RX_1G_LIODN(1, 2, 12),
        SET_FMAN_RX_1G_LIODN(1, 3, 13),
        SET_FMAN_RX_1G_LIODN(1, 4, 14),
-#if (CONFIG_SYS_NUM_FM1_10GEC == 1)
+#if (CFG_SYS_NUM_FM1_10GEC == 1)
        SET_FMAN_RX_10G_LIODN(1, 0, 15),
 #endif
 };

diff --git a/arch/powerpc/cpu/mpc85xx/p4080_ids.c b/arch/powerpc/cpu/mpc85xx/p4080_ids.c
index 5b766f1d5171f5dfa3e7f6a1144006dd009ab66c..ba54b0310a7b56549f3e518179f19f0e4f759cf3 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/p4080_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_ids.c
@@ -62,7 +62,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
 };
 int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl);
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 struct fman_liodn_id_table fman2_liodn_tbl[] = {
        SET_FMAN_RX_1G_LIODN(2, 0, 16),
        SET_FMAN_RX_1G_LIODN(2, 1, 17),
@@ -101,7 +101,7 @@ struct liodn_id_table liodn_bases[] = {
        [FSL_HW_PORTAL_SEC]  = SET_LIODN_BASE_2(96, 106),
 #ifdef CONFIG_SYS_DPAA_FMAN
        [FSL_HW_PORTAL_FMAN1] = SET_LIODN_BASE_1(32),
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        [FSL_HW_PORTAL_FMAN2] = SET_LIODN_BASE_1(64),
 #endif
 #endif

diff --git a/arch/powerpc/cpu/mpc85xx/p5040_ids.c b/arch/powerpc/cpu/mpc85xx/p5040_ids.c
index e3d163af9eb9eb0d416f9c01be0e39962083c10c..6f11c81aba5df7aa6c6597c6c7efeb183ed605e3 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/p5040_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_ids.c
@@ -57,7 +57,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
 };
 int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl);
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 struct fman_liodn_id_table fman2_liodn_tbl[] = {
        SET_FMAN_RX_1G_LIODN(2, 0, 17),
        SET_FMAN_RX_1G_LIODN(2, 1, 18),
@@ -101,7 +101,7 @@ struct liodn_id_table liodn_bases[] = {
 #ifdef CONFIG_SYS_DPAA_FMAN
        [FSL_HW_PORTAL_FMAN1] = SET_LIODN_BASE_1(32),
 #endif
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        [FSL_HW_PORTAL_FMAN2] = SET_LIODN_BASE_1(160),
 #endif
 #ifdef CONFIG_SYS_FSL_RAID_ENGINE

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 31d0481927676d693692e65b9aec9f2e4372ff68..e2bdc2f9f112f2f318b9e0ad15c5a61014644898 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -406,7 +406,7 @@ void get_sys_info(sys_info_t *sys_info)
                sys_info->freq_fman[0] = sys_info->freq_systembus / 2;
                break;
        }
-#if (CONFIG_SYS_NUM_FMAN) == 2
+#if (CFG_SYS_NUM_FMAN) == 2
 #ifdef CONFIG_SYS_FM2_CLK
 #define FM2_CLK_SEL    0x00000038
 #define FM2_CLK_SHIFT  3
@@ -440,7 +440,7 @@ void get_sys_info(sys_info_t *sys_info)
                break;
        }
 #endif
-#endif /* CONFIG_SYS_NUM_FMAN == 2 */
+#endif /* CFG_SYS_NUM_FMAN == 2 */
 #else
        sys_info->freq_fman[0] = sys_info->freq_systembus / CONFIG_SYS_FM1_CLK;
 #endif
@@ -491,7 +491,7 @@ void get_sys_info(sys_info_t *sys_info)
        } else {
                sys_info->freq_fman[0] = sys_info->freq_systembus / 2;
        }
-#if (CONFIG_SYS_NUM_FMAN) == 2
+#if (CFG_SYS_NUM_FMAN) == 2
        if (rcw_tmp & FM2_CLK_SEL) {
                if (rcw_tmp & HWA_ASYNC_DIV)
                        sys_info->freq_fman[1] = freq_c_pll[HWA_CC_PLL] / 4;

diff --git a/arch/powerpc/cpu/mpc85xx/t4240_ids.c b/arch/powerpc/cpu/mpc85xx/t4240_ids.c
index 172dbdbe46496e463bc09491f489d2c59f40f31a..8fe4e96a1140fbec4d884e21e995aa68bfdef3e5 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/t4240_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_ids.c
@@ -122,7 +122,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
        SET_FMAN_RX_10G_LIODN(1, 1, 95),
 };
 int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl);
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 struct fman_liodn_id_table fman2_liodn_tbl[] = {
        SET_FMAN_RX_1G_LIODN(2, 0, 88),
        SET_FMAN_RX_1G_LIODN(2, 1, 89),
@@ -175,7 +175,7 @@ struct liodn_id_table liodn_bases[] = {
        [FSL_HW_PORTAL_SEC]  = SET_LIODN_BASE_2(462, 558),
 #ifdef CONFIG_SYS_DPAA_FMAN
        [FSL_HW_PORTAL_FMAN1] = SET_LIODN_BASE_1(973),
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        [FSL_HW_PORTAL_FMAN2] = SET_LIODN_BASE_1(1069),
 #endif
 #endif

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 25d1b4861746cc118cdf3e85b4bcd37b91221237..2edf0d6f83c28da636dfdf7c7287038bd35720be 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -41,8 +41,8 @@
 #define QE_NUM_OF_SNUM                 28
 
 #elif defined(CONFIG_ARCH_P1023)
-#define CONFIG_SYS_NUM_FMAN            1
-#define CONFIG_SYS_NUM_FM1_DTSEC       2
+#define CFG_SYS_NUM_FMAN               1
+#define CFG_SYS_NUM_FM1_DTSEC  2
 #define CONFIG_SYS_QMAN_NUM_PORTALS    3
 #define CONFIG_SYS_BMAN_NUM_PORTALS    3
 #define CONFIG_SYS_FM_MURAM_SIZE       0x10000
@@ -65,9 +65,9 @@
 #define CFG_SYS_FSL_SRIO_MSG_UNIT_NUM  2
 
 #elif defined(CONFIG_ARCH_P2041) /* also supports P2040 */
-#define CONFIG_SYS_NUM_FMAN            1
-#define CONFIG_SYS_NUM_FM1_DTSEC       5
-#define CONFIG_SYS_NUM_FM1_10GEC       1
+#define CFG_SYS_NUM_FMAN               1
+#define CFG_SYS_NUM_FM1_DTSEC  5
+#define CFG_SYS_NUM_FM1_10GEC  1
 #define CONFIG_SYS_FM_MURAM_SIZE       0x28000
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9
@@ -75,9 +75,9 @@
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
 
 #elif defined(CONFIG_ARCH_P3041)
-#define CONFIG_SYS_NUM_FMAN            1
-#define CONFIG_SYS_NUM_FM1_DTSEC       5
-#define CONFIG_SYS_NUM_FM1_10GEC       1
+#define CFG_SYS_NUM_FMAN               1
+#define CFG_SYS_NUM_FM1_DTSEC  5
+#define CFG_SYS_NUM_FM1_10GEC  1
 #define CONFIG_SYS_FM_MURAM_SIZE       0x28000
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9
@@ -85,11 +85,11 @@
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
 
 #elif defined(CONFIG_ARCH_P4080) /* also supports P4040 */
-#define CONFIG_SYS_NUM_FMAN            2
-#define CONFIG_SYS_NUM_FM1_DTSEC       4
-#define CONFIG_SYS_NUM_FM2_DTSEC       4
-#define CONFIG_SYS_NUM_FM1_10GEC       1
-#define CONFIG_SYS_NUM_FM2_10GEC       1
+#define CFG_SYS_NUM_FMAN               2
+#define CFG_SYS_NUM_FM1_DTSEC  4
+#define CFG_SYS_NUM_FM2_DTSEC  4
+#define CFG_SYS_NUM_FM1_10GEC  1
+#define CFG_SYS_NUM_FM2_10GEC  1
 #define CONFIG_SYS_FM_MURAM_SIZE       0x28000
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9
@@ -98,11 +98,11 @@
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xff000000
 
 #elif defined(CONFIG_ARCH_P5040)
-#define CONFIG_SYS_NUM_FMAN            2
-#define CONFIG_SYS_NUM_FM1_DTSEC       5
-#define CONFIG_SYS_NUM_FM1_10GEC       1
-#define CONFIG_SYS_NUM_FM2_DTSEC       5
-#define CONFIG_SYS_NUM_FM2_10GEC       1
+#define CFG_SYS_NUM_FMAN               2
+#define CFG_SYS_NUM_FM1_DTSEC  5
+#define CFG_SYS_NUM_FM1_10GEC  1
+#define CFG_SYS_NUM_FM2_DTSEC  5
+#define CFG_SYS_NUM_FM2_10GEC  1
 #define CONFIG_SYS_FM_MURAM_SIZE       0x28000
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
 
@@ -119,21 +119,21 @@
 #elif defined(CONFIG_ARCH_T4240)
 #ifdef CONFIG_ARCH_T4240
 #define CFG_SYS_FSL_CLUSTER_CLOCKS   { 1, 1, 4 }
-#define CONFIG_SYS_NUM_FM1_DTSEC       8
-#define CONFIG_SYS_NUM_FM1_10GEC       2
-#define CONFIG_SYS_NUM_FM2_DTSEC       8
-#define CONFIG_SYS_NUM_FM2_10GEC       2
+#define CFG_SYS_NUM_FM1_DTSEC  8
+#define CFG_SYS_NUM_FM1_10GEC  2
+#define CFG_SYS_NUM_FM2_DTSEC  8
+#define CFG_SYS_NUM_FM2_10GEC  2
 #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 CFG_SYS_NUM_FM1_DTSEC  6
+#define CFG_SYS_NUM_FM1_10GEC  1
+#define CFG_SYS_NUM_FM2_DTSEC  8
+#define CFG_SYS_NUM_FM2_10GEC  1
 #endif
 #define CONFIG_SYS_FSL_SRDS_1
 #define CONFIG_SYS_FSL_SRDS_2
 #define CFG_SYS_FSL_SRDS_3
 #define CFG_SYS_FSL_SRDS_4
-#define CONFIG_SYS_NUM_FMAN            2
+#define CFG_SYS_NUM_FMAN               2
 #define CONFIG_SYS_PME_CLK             0
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  8
 #define CONFIG_SYS_FM1_CLK             3
@@ -146,7 +146,7 @@
 #elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420)
 #define CONFIG_SYS_FSL_SRDS_1
 #define CONFIG_SYS_FSL_SRDS_2
-#define CONFIG_SYS_NUM_FMAN            1
+#define CFG_SYS_NUM_FMAN               1
 #define CONFIG_SYS_FM1_CLK             0
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  4
 #define CONFIG_SYS_FM_MURAM_SIZE       0x60000
@@ -155,23 +155,23 @@
 #define CONFIG_MAX_DSP_CPUS            12
 #define CONFIG_NUM_DSP_CPUS            6
 #define CFG_SYS_FSL_CLUSTER_CLOCKS     { 1, 4, 4, 4 }
-#define CONFIG_SYS_NUM_FM1_DTSEC       6
-#define CONFIG_SYS_NUM_FM1_10GEC       2
+#define CFG_SYS_NUM_FM1_DTSEC  6
+#define CFG_SYS_NUM_FM1_10GEC  2
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM    5
 #else
 #define CONFIG_MAX_DSP_CPUS            2
 #define CFG_SYS_FSL_CLUSTER_CLOCKS     { 1, 4 }
-#define CONFIG_SYS_NUM_FM1_DTSEC       4
-#define CONFIG_SYS_NUM_FM1_10GEC       0
+#define CFG_SYS_NUM_FM1_DTSEC  4
+#define CFG_SYS_NUM_FM1_10GEC  0
 #endif
 
 #elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042)
 #define CFG_SYS_FSL_CLUSTER_CLOCKS   { 1, 1, 1, 1 }
 #define CONFIG_SYS_FSL_SRDS_1
-#define CONFIG_SYS_NUM_FMAN            1
-#define CONFIG_SYS_NUM_FM1_DTSEC       5
+#define CFG_SYS_NUM_FMAN               1
+#define CFG_SYS_NUM_FM1_DTSEC  5
 #define CONFIG_PME_PLAT_CLK_DIV                2
 #define CONFIG_SYS_PME_CLK             CONFIG_PME_PLAT_CLK_DIV
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  8
@@ -186,9 +186,9 @@
 #elif defined(CONFIG_ARCH_T1024)
 #define CFG_SYS_FSL_CLUSTER_CLOCKS  { 1, 1, 1, 1 }
 #define CONFIG_SYS_FSL_SRDS_1
-#define CONFIG_SYS_NUM_FMAN            1
-#define CONFIG_SYS_NUM_FM1_DTSEC       4
-#define CONFIG_SYS_NUM_FM1_10GEC       1
+#define CFG_SYS_NUM_FMAN               1
+#define CFG_SYS_NUM_FM1_DTSEC  4
+#define CFG_SYS_NUM_FM1_10GEC  1
 #define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT  8
 #define CONFIG_SYS_FM1_CLK             0
@@ -200,12 +200,12 @@
 #define QE_NUM_OF_SNUM                 28
 
 #elif defined(CONFIG_ARCH_T2080)
-#define CONFIG_SYS_NUM_FMAN            1
+#define CFG_SYS_NUM_FMAN               1
 #define CFG_SYS_FSL_CLUSTER_CLOCKS     { 1, 4, 4, 4 }
 #define CONFIG_SYS_FSL_SRDS_1
 #if defined(CONFIG_ARCH_T2080)
-#define CONFIG_SYS_NUM_FM1_DTSEC       8
-#define CONFIG_SYS_NUM_FM1_10GEC       4
+#define CFG_SYS_NUM_FM1_DTSEC  8
+#define CFG_SYS_NUM_FM1_10GEC  4
 #define CONFIG_SYS_FSL_SRDS_2
 #define CFG_SYS_FSL_SRIO_MAX_PORTS     2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM    9

diff --git a/arch/powerpc/include/asm/fsl_portals.h b/arch/powerpc/include/asm/fsl_portals.h
index b1fd6bd5cef6613eb6a09a0a3158b0aed6122bd0..54ef4fb629542090cd41a7748d0dbb8413f39e98 100644 (file)
--- a/arch/powerpc/include/asm/fsl_portals.h
+++ b/arch/powerpc/include/asm/fsl_portals.h
@@ -11,7 +11,7 @@ enum fsl_dpaa_dev {
        FSL_HW_PORTAL_SEC,
 #ifdef CONFIG_SYS_DPAA_FMAN
        FSL_HW_PORTAL_FMAN1,
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        FSL_HW_PORTAL_FMAN2,
 #endif
 #endif

diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index 6783ebebb59e4c20c2f5fe80d159bea68ddc23f6..645c56c73d53355b7f22f72f56795acc9976e948 100644 (file)
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -427,7 +427,7 @@ int board_eth_init(struct bd_info *bis)
                break;
        }
 
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
                idx = i - FM1_DTSEC1;
                interface = fm_info_get_enet_if(i);
                switch (interface) {

diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index 00ff6028e69fc5be9a55a179a95684e64d225a5c..3cae2a08677c38059d39772f1321da77b7501453 100644 (file)
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -62,7 +62,7 @@ int board_eth_init(struct bd_info *bis)
        }
 
        dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++)
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++)
                fm_info_set_mdio(i, dev);
 
        /* 10GBase-R on lane A, MAC 9 */

diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 88265a399487fd7cc976952c2660feeb02ad4fa1..926bd74ddc67849713fb332ae288d5b779283acf 100644 (file)
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -349,7 +349,7 @@ int board_eth_init(struct bd_info *bis)
                /* SGMII on slot 4, MAC 2 */
                fm_info_set_phy_address(FM1_DTSEC2, SGMII_CARD_PORT1_PHY_ADDR);
 
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
                idx = i - FM1_DTSEC1;
                interface = fm_info_get_enet_if(i);
                switch (interface) {

diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index 04fa57f81b2969324abb0f553c946160389e2058..af70d1077344c482c1ad1d22e2d58db2367f7d9d 100644 (file)
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -64,7 +64,7 @@ int board_eth_init(struct bd_info *bis)
        }
 
        dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++)
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++)
                fm_info_set_mdio(i, dev);
 
        /* 10GBase-R on lane A, MAC 9 */

diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 23fd619ceed325f14ace19fa1a34cc829907ac80..23ec32b7f975ae7ad234cd420e28e38f8c381746 100644 (file)
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -162,7 +162,7 @@ int board_eth_init(struct bd_info *bis)
        fm_info_set_phy_address(FM1_DTSEC2, CONFIG_SYS_FM1_DTSEC2_PHY_ADDR);
        fm_info_set_phy_address(FM1_DTSEC3, CONFIG_SYS_FM1_DTSEC3_PHY_ADDR);
 
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
                int idx = i - FM1_DTSEC1;
 
                switch (fm_info_get_enet_if(i)) {

diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index be42efa5c76413f7bcaa687c2831c15440cd37bc..ed6b36339f74f23c167c28215fbf1b870a056519 100644 (file)
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -85,7 +85,7 @@ int board_eth_init(struct bd_info *bis)
                break;
        }
 
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
                interface = fm_info_get_enet_if(i);
                switch (interface) {
                case PHY_INTERFACE_MODE_RGMII:
@@ -112,7 +112,7 @@ int board_eth_init(struct bd_info *bis)
                }
        }
 
-       for (i = FM1_10GEC1; i < FM1_10GEC1 + CONFIG_SYS_NUM_FM1_10GEC; i++) {
+       for (i = FM1_10GEC1; i < FM1_10GEC1 + CFG_SYS_NUM_FM1_10GEC; i++) {
                switch (fm_info_get_enet_if(i)) {
                case PHY_INTERFACE_MODE_XGMII:
                        dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);

diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index bb6641b88a99fa9cb523e85aa33cc3fb8d33a8a9..5ce24b40964fe9e83de0ce2322e8f57e86d4ecfe 100644 (file)
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -39,7 +39,7 @@ int board_eth_init(struct bd_info *bis)
        /*
         * Program on board RGMII, SGMII PHY addresses.
         */
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
                int idx = i - FM1_DTSEC1;
 
                switch (fm_info_get_enet_if(i)) {

diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index 555985b6f2510a20399c2eb1a1ebad36bfc25d57..62261f50ea94df4ed1a6ac83555963cedb9f02d5 100644 (file)
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -625,7 +625,7 @@ int board_eth_init(struct bd_info *bis)
                break;
        }
 
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
                idx = i - FM1_DTSEC1;
                interface = fm_info_get_enet_if(i);
                switch (interface) {
@@ -673,7 +673,7 @@ int board_eth_init(struct bd_info *bis)
                }
        }
 
-       for (i = FM1_10GEC1; i < FM1_10GEC1 + CONFIG_SYS_NUM_FM1_10GEC; i++) {
+       for (i = FM1_10GEC1; i < FM1_10GEC1 + CFG_SYS_NUM_FM1_10GEC; i++) {
                idx = i - FM1_10GEC1;
                switch (fm_info_get_enet_if(i)) {
                case PHY_INTERFACE_MODE_XGMII:

diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index 4041b3d9ac4c5e055c3dcafb82cab6cb261f91db..241ee5a4a253c5ad7306f8d05bbad0fb211b22ab 100644 (file)
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -81,7 +81,7 @@ int board_eth_init(struct bd_info *bis)
        fm_disable_port(FM1_DTSEC5);
        fm_disable_port(FM1_DTSEC6);
 
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
                interface = fm_info_get_enet_if(i);
                switch (interface) {
                case PHY_INTERFACE_MODE_SGMII:
@@ -93,7 +93,7 @@ int board_eth_init(struct bd_info *bis)
                }
        }
 
-       for (i = FM1_10GEC1; i < FM1_10GEC1 + CONFIG_SYS_NUM_FM1_10GEC; i++) {
+       for (i = FM1_10GEC1; i < FM1_10GEC1 + CFG_SYS_NUM_FM1_10GEC; i++) {
                switch (fm_info_get_enet_if(i)) {
                case PHY_INTERFACE_MODE_XGMII:
                        dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);
@@ -104,7 +104,7 @@ int board_eth_init(struct bd_info *bis)
                }
        }
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        if ((srds_prtcl_s2 == 56) || (srds_prtcl_s2 == 55)) {
                /* SGMII && 10GBase-R */
                fm_info_set_phy_address(FM2_DTSEC1, SGMII_PHY_ADDR5);
@@ -121,7 +121,7 @@ int board_eth_init(struct bd_info *bis)
 
        fm_disable_port(FM2_DTSEC5);
        fm_disable_port(FM2_DTSEC6);
-       for (i = FM2_DTSEC1; i < FM2_DTSEC1 + CONFIG_SYS_NUM_FM2_DTSEC; i++) {
+       for (i = FM2_DTSEC1; i < FM2_DTSEC1 + CFG_SYS_NUM_FM2_DTSEC; i++) {
                interface = fm_info_get_enet_if(i);
                switch (interface) {
                case PHY_INTERFACE_MODE_SGMII:
@@ -133,7 +133,7 @@ int board_eth_init(struct bd_info *bis)
                }
        }
 
-       for (i = FM2_10GEC1; i < FM2_10GEC1 + CONFIG_SYS_NUM_FM2_10GEC; i++) {
+       for (i = FM2_10GEC1; i < FM2_10GEC1 + CFG_SYS_NUM_FM2_10GEC; i++) {
                switch (fm_info_get_enet_if(i)) {
                case PHY_INTERFACE_MODE_XGMII:
                        dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);
@@ -143,7 +143,7 @@ int board_eth_init(struct bd_info *bis)
                        break;
                }
        }
-#endif /* CONFIG_SYS_NUM_FMAN */
+#endif /* CFG_SYS_NUM_FMAN */
 
        cpu_eth_init(bis);
 #endif /* CONFIG_FMAN_ENET */

diff --git a/board/freescale/t4rdb/t4rdb.h b/board/freescale/t4rdb/t4rdb.h
index 06779f552fac00b2d89b084d75212e89a20eb332..bb3ce216d7d708be3a6c6b3014f7948aacdc80c8 100644 (file)
--- a/board/freescale/t4rdb/t4rdb.h
+++ b/board/freescale/t4rdb/t4rdb.h
@@ -6,10 +6,10 @@
 #ifndef __T4RDB_H__
 #define __T4RDB_H__
 
-#undef CONFIG_SYS_NUM_FM1_DTSEC
-#undef CONFIG_SYS_NUM_FM2_DTSEC
-#define CONFIG_SYS_NUM_FM1_DTSEC       4
-#define CONFIG_SYS_NUM_FM2_DTSEC       4
+#undef CFG_SYS_NUM_FM1_DTSEC
+#undef CFG_SYS_NUM_FM2_DTSEC
+#define CFG_SYS_NUM_FM1_DTSEC  4
+#define CFG_SYS_NUM_FM2_DTSEC  4
 
 #define CORTINA_FW_ADDR_IFCNOR                         0xefe00000
 #define CORTINA_FW_ADDR_IFCNOR_ALTBANK         0xebf00000

diff --git a/cmd/i2c.c b/cmd/i2c.c
index e196a73efa69735dccd4131b784bb8fc6faa2178..7b84378f7cd2cf0acc0a7d9194b569ce7970fb12 100644 (file)
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -1697,7 +1697,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
 #else
                int i;
 
-               for (i = 0; i < CONFIG_SYS_NUM_I2C_BUSES; i++) {
+               for (i = 0; i < CFG_SYS_NUM_I2C_BUSES; i++) {
                        printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name);
 #ifndef CONFIG_SYS_I2C_DIRECT_BUS
                        int j;
@@ -1730,7 +1730,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
                }
                show_bus(bus);
 #else
-               if (i >= CONFIG_SYS_NUM_I2C_BUSES) {
+               if (i >= CFG_SYS_NUM_I2C_BUSES) {
                        printf("Invalid bus %d\n", i);
                        return -1;
                }
@@ -1788,7 +1788,7 @@ static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc,
        } else {
                bus_no = dectoul(argv[1], NULL);
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
-               if (bus_no >= CONFIG_SYS_NUM_I2C_BUSES) {
+               if (bus_no >= CFG_SYS_NUM_I2C_BUSES) {
                        printf("Invalid bus %d\n", bus_no);
                        return -1;
                }

diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index 09f91e674d441af342818f4c185d8315d93da950..c3f6a1251f15958459156dd9d8d0f00a9b99c7be 100644 (file)
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -34,7 +34,7 @@ struct i2c_adapter *i2c_get_adapter(int index)
 }
 
 #if !defined(CONFIG_SYS_I2C_DIRECT_BUS)
-struct i2c_bus_hose i2c_bus[CONFIG_SYS_NUM_I2C_BUSES] =
+struct i2c_bus_hose i2c_bus[CFG_SYS_NUM_I2C_BUSES] =
                        CONFIG_SYS_I2C_BUSES;
 #endif
 
@@ -173,7 +173,7 @@ static int i2c_mux_disconnect_all(void)
  */
 static void i2c_init_bus(unsigned int bus_no, int speed, int slaveaddr)
 {
-       if (bus_no >= CONFIG_SYS_NUM_I2C_BUSES)
+       if (bus_no >= CFG_SYS_NUM_I2C_BUSES)
                return;
 
        I2C_ADAP->init(I2C_ADAP, speed, slaveaddr);
@@ -238,7 +238,7 @@ int i2c_set_bus_num(unsigned int bus)
                return 0;
 
 #ifndef CONFIG_SYS_I2C_DIRECT_BUS
-       if (bus >= CONFIG_SYS_NUM_I2C_BUSES)
+       if (bus >= CFG_SYS_NUM_I2C_BUSES)
                return -1;
 #endif
 

diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 30a9409e5ab294e6424675d757e254d1282d1c8e..9c4b4d7e46ddda31d3aa8830665d6c4d9c1ca5b7 100644 (file)
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -257,7 +257,7 @@ defined(CONFIG_ARCH_LS1046A)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-               for (j = 0; j < CONFIG_SYS_NUM_FMAN; j++) {
+               for (j = 0; j < CFG_SYS_NUM_FMAN; j++) {
                        char name[] = "fman@0";
 
                        name[sizeof(name) - 2] = '0' + j;

diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 9b6dbe2882fded85b907db20ee37f06a60446996..1d3b7aa058366aa81b09de1a652fb07248b20c39 100644 (file)
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -26,7 +26,7 @@
 #include <asm/arch/cpu.h>
 #endif
 
-struct fm_muram muram[CONFIG_SYS_NUM_FMAN];
+struct fm_muram muram[CFG_SYS_NUM_FMAN];
 
 void *fm_muram_base(int fm_idx)
 {

diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h
index 2379b3a11cabeb37bf3c93aa72f340d34a2d0a4f..3d9cc5ca069d6993de420f86f9aae341bac521f2 100644 (file)
--- a/drivers/net/fm/fm.h
+++ b/drivers/net/fm/fm.h
@@ -15,11 +15,11 @@
 #define OH_PORT_ID_BASE                0x01
 #define MAX_NUM_OH_PORT                7
 #define RX_PORT_1G_BASE                0x08
-#define MAX_NUM_RX_PORT_1G     CONFIG_SYS_NUM_FM1_DTSEC
+#define MAX_NUM_RX_PORT_1G     CFG_SYS_NUM_FM1_DTSEC
 #define RX_PORT_10G_BASE       0x10
 #define RX_PORT_10G_BASE2      0x08
 #define TX_PORT_1G_BASE                0x28
-#define MAX_NUM_TX_PORT_1G     CONFIG_SYS_NUM_FM1_DTSEC
+#define MAX_NUM_TX_PORT_1G     CFG_SYS_NUM_FM1_DTSEC
 #define TX_PORT_10G_BASE       0x30
 #define TX_PORT_10G_BASE2      0x28
 #define MIIM_TIMEOUT    0xFFFF

diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 34f3816e65af0460d21b3618765677a2dbf6f46e..8443cbb6b65fc6eae808f2184889f938fdb5d22d 100644 (file)
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -19,70 +19,70 @@
 
 #ifndef CONFIG_DM_ETH
 struct fm_eth_info fm_info[] = {
-#if (CONFIG_SYS_NUM_FM1_DTSEC >= 1)
+#if (CFG_SYS_NUM_FM1_DTSEC >= 1)
        FM_DTSEC_INFO_INITIALIZER(1, 1),
 #endif
-#if (CONFIG_SYS_NUM_FM1_DTSEC >= 2)
+#if (CFG_SYS_NUM_FM1_DTSEC >= 2)
        FM_DTSEC_INFO_INITIALIZER(1, 2),
 #endif
-#if (CONFIG_SYS_NUM_FM1_DTSEC >= 3)
+#if (CFG_SYS_NUM_FM1_DTSEC >= 3)
        FM_DTSEC_INFO_INITIALIZER(1, 3),
 #endif
-#if (CONFIG_SYS_NUM_FM1_DTSEC >= 4)
+#if (CFG_SYS_NUM_FM1_DTSEC >= 4)
        FM_DTSEC_INFO_INITIALIZER(1, 4),
 #endif
-#if (CONFIG_SYS_NUM_FM1_DTSEC >= 5)
+#if (CFG_SYS_NUM_FM1_DTSEC >= 5)
        FM_DTSEC_INFO_INITIALIZER(1, 5),
 #endif
-#if (CONFIG_SYS_NUM_FM1_DTSEC >= 6)
+#if (CFG_SYS_NUM_FM1_DTSEC >= 6)
        FM_DTSEC_INFO_INITIALIZER(1, 6),
 #endif
-#if (CONFIG_SYS_NUM_FM1_DTSEC >= 7)
+#if (CFG_SYS_NUM_FM1_DTSEC >= 7)
        FM_DTSEC_INFO_INITIALIZER(1, 9),
 #endif
-#if (CONFIG_SYS_NUM_FM1_DTSEC >= 8)
+#if (CFG_SYS_NUM_FM1_DTSEC >= 8)
        FM_DTSEC_INFO_INITIALIZER(1, 10),
 #endif
-#if (CONFIG_SYS_NUM_FM2_DTSEC >= 1)
+#if (CFG_SYS_NUM_FM2_DTSEC >= 1)
        FM_DTSEC_INFO_INITIALIZER(2, 1),
 #endif
-#if (CONFIG_SYS_NUM_FM2_DTSEC >= 2)
+#if (CFG_SYS_NUM_FM2_DTSEC >= 2)
        FM_DTSEC_INFO_INITIALIZER(2, 2),
 #endif
-#if (CONFIG_SYS_NUM_FM2_DTSEC >= 3)
+#if (CFG_SYS_NUM_FM2_DTSEC >= 3)
        FM_DTSEC_INFO_INITIALIZER(2, 3),
 #endif
-#if (CONFIG_SYS_NUM_FM2_DTSEC >= 4)
+#if (CFG_SYS_NUM_FM2_DTSEC >= 4)
        FM_DTSEC_INFO_INITIALIZER(2, 4),
 #endif
-#if (CONFIG_SYS_NUM_FM2_DTSEC >= 5)
+#if (CFG_SYS_NUM_FM2_DTSEC >= 5)
        FM_DTSEC_INFO_INITIALIZER(2, 5),
 #endif
-#if (CONFIG_SYS_NUM_FM2_DTSEC >= 6)
+#if (CFG_SYS_NUM_FM2_DTSEC >= 6)
        FM_DTSEC_INFO_INITIALIZER(2, 6),
 #endif
-#if (CONFIG_SYS_NUM_FM2_DTSEC >= 7)
+#if (CFG_SYS_NUM_FM2_DTSEC >= 7)
        FM_DTSEC_INFO_INITIALIZER(2, 9),
 #endif
-#if (CONFIG_SYS_NUM_FM2_DTSEC >= 8)
+#if (CFG_SYS_NUM_FM2_DTSEC >= 8)
        FM_DTSEC_INFO_INITIALIZER(2, 10),
 #endif
-#if (CONFIG_SYS_NUM_FM1_10GEC >= 1)
+#if (CFG_SYS_NUM_FM1_10GEC >= 1)
        FM_TGEC_INFO_INITIALIZER(1, 1),
 #endif
-#if (CONFIG_SYS_NUM_FM1_10GEC >= 2)
+#if (CFG_SYS_NUM_FM1_10GEC >= 2)
        FM_TGEC_INFO_INITIALIZER(1, 2),
 #endif
-#if (CONFIG_SYS_NUM_FM1_10GEC >= 3)
+#if (CFG_SYS_NUM_FM1_10GEC >= 3)
        FM_TGEC_INFO_INITIALIZER2(1, 3),
 #endif
-#if (CONFIG_SYS_NUM_FM1_10GEC >= 4)
+#if (CFG_SYS_NUM_FM1_10GEC >= 4)
        FM_TGEC_INFO_INITIALIZER2(1, 4),
 #endif
-#if (CONFIG_SYS_NUM_FM2_10GEC >= 1)
+#if (CFG_SYS_NUM_FM2_10GEC >= 1)
        FM_TGEC_INFO_INITIALIZER(2, 1),
 #endif
-#if (CONFIG_SYS_NUM_FM2_10GEC >= 2)
+#if (CFG_SYS_NUM_FM2_10GEC >= 2)
        FM_TGEC_INFO_INITIALIZER(2, 2),
 #endif
 };
@@ -101,7 +101,7 @@ int fm_standard_init(struct bd_info *bis)
                        fm_eth_initialize(reg, &fm_info[i]);
        }
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
        reg = (void *)CFG_SYS_FSL_FM2_ADDR;
        if (fm_init_common(1, reg))
                return 0;
@@ -276,7 +276,7 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
            ((info->port == FM1_10GEC2) && (PORT_IS_ENABLED(FM1_DTSEC10))) ||
            ((info->port == FM1_10GEC3) && (PORT_IS_ENABLED(FM1_DTSEC1)))  ||
            ((info->port == FM1_10GEC4) && (PORT_IS_ENABLED(FM1_DTSEC2)))
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
                                                                                ||
            ((info->port == FM2_DTSEC9) && (PORT_IS_ENABLED(FM2_10GEC1)))       ||
            ((info->port == FM2_DTSEC10) && (PORT_IS_ENABLED(FM2_10GEC2)))      ||

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 132786a42368a21da7c1b84fbd41446afd1c5630..6b83b021f77ebeef7fd00bc021fb6d11d9094d68 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -30,7 +30,7 @@
 #define CONFIG_RESET_VECTOR_ADDRESS    0xeffffffc
 #endif
 
-#define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC                CONFIG_SYS_NUM_DDR_CTLRS
 
 #define CONFIG_SYS_SRIO
 #define CONFIG_SRIO1                   /* SRIO port 1 */

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index b8f3d70e5953d542e6694b5937074baa5b0ddb78..c4fed68273b5ac803230d69d3dc5809a21043f9a 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -15,7 +15,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC                CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define RESET_VECTOR_OFFSET            0x27FFC

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 777a64eceee0e0addf659e95c40bb4b3946bc17c..1eec94542100ccdf918b19b766bfb72231958e59 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -58,7 +58,7 @@
 #define CONFIG_RESET_VECTOR_ADDRESS    0xeffffffc
 #endif
 
-#define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC                CONFIG_SYS_NUM_DDR_CTLRS
 
 /*
  * These can be toggled for performance analysis, otherwise use default.

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 710f105cfad99c825a9283e4defdc81bf485c6cf..42a0926329e937c208096dec51e497152c0951cf 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -22,7 +22,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_NUM_CPC     CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC        CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define RESET_VECTOR_OFFSET            0x27FFC

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 4c60364f7e7803af0f6f4a5a8bb493955d52b79e..941efdc243f8f24987ff698f80e7468a854c3db1 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -17,7 +17,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_NUM_CPC     CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC        CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define RESET_VECTOR_OFFSET            0x27FFC

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index ba4a989fc5f7dbb6330d9c3277b2e85252285573..5969854796ec428b86845fa62b7b3b3d3de77fdb 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -39,7 +39,7 @@
 #define CONFIG_RESET_VECTOR_ADDRESS    0xeffffffc
 #endif
 
-#define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC                CONFIG_SYS_NUM_DDR_CTLRS
 
 /*
  * These can be toggled for performance analysis, otherwise use default.

diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index a658cbc07c20e4a6bc7d7d54d8b68f5e3642558b..ab0d0a721af1f15c4942d5c3a9d58cf8c1566496 100644 (file)
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -50,7 +50,7 @@
 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
 
 /* I2C */
-#define CONFIG_SYS_NUM_I2C_BUSES       4
+#define CFG_SYS_NUM_I2C_BUSES  4
 #define CONFIG_SYS_I2C_MAX_HOPS                1
 #define CONFIG_SYS_I2C_BUSES   {{0, {I2C_NULL_HOP} }, \
                {0, {{I2C_MUX_PCA9547, 0x70, 2} } }, \

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 57b0fc9069790a994f265d20aeedfae13f66292d..ad9853ab6b3b6d773042f9f40ae94783945c1228 100644 (file)
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -156,7 +156,7 @@
 
 #define CONFIG_I2C_MULTI_BUS
 #define CONFIG_SYS_I2C_MAX_HOPS                1
-#define CONFIG_SYS_NUM_I2C_BUSES       3
+#define CFG_SYS_NUM_I2C_BUSES  3
 #define I2C_MUX_PCA_ADDR               0x70
 #define I2C_MUX_CH_DEFAULT             0x0
 #define CONFIG_SYS_I2C_BUSES   {       {0, {I2C_NULL_HOP} }, \

diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index e6e54fba898bbd73b416178640a67694c464a578..7af65737ff01630da5be59a78911ab1289efd653 100644 (file)
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -136,7 +136,7 @@
 
 #define CONFIG_RESET_VECTOR_ADDRESS    0xebfffffc
 
-#define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC                CONFIG_SYS_NUM_DDR_CTLRS
 
 /* Environment in parallel NOR-Flash */
 #define CONFIG_ENV_TOTAL_SIZE          0x040000

diff --git a/include/e500.h b/include/e500.h
index 255f46bf1e54c0ac98c46e35e20997819eb184a9..9f68a834c2f07acd5924ba5d6e04da31c1acb1e0 100644 (file)
--- a/include/e500.h
+++ b/include/e500.h
@@ -19,7 +19,7 @@ typedef struct
        unsigned long freq_localbus;
        unsigned long freq_qe;
 #ifdef CONFIG_SYS_DPAA_FMAN
-       unsigned long freq_fman[CONFIG_SYS_NUM_FMAN];
+       unsigned long freq_fman[CFG_SYS_NUM_FMAN];
 #endif
 #ifdef CONFIG_SYS_DPAA_QBMAN
        unsigned long freq_qman;

diff --git a/include/fm_eth.h b/include/fm_eth.h
index 7475b5150738e76a8633fb2b0a62c187cbea9f56..aeb640925ee2c135576f5baec5c1fcdf3b490b5d 100644 (file)
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -56,7 +56,7 @@ enum fm_eth_type {
 #define CONFIG_SYS_FM1_DTSEC_MDIO_ADDR (CFG_SYS_FSL_FM1_ADDR + 0xfc000)
 #endif
 #define CONFIG_SYS_FM1_TGEC_MDIO_ADDR  (CFG_SYS_FSL_FM1_ADDR + 0xfd000)
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 #define CONFIG_SYS_FM2_DTSEC_MDIO_ADDR (CFG_SYS_FSL_FM2_ADDR + 0xfc000)
 #define CONFIG_SYS_FM2_TGEC_MDIO_ADDR  (CFG_SYS_FSL_FM2_ADDR + 0xfd000)
 #endif
@@ -102,7 +102,7 @@ enum fm_eth_type {
                                 offsetof(struct ccsr_fman, memac[n-1]),\
 }
 #else
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 #define FM_TGEC_INFO_INITIALIZER(idx, n) \
 {                                                                      \
        FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM2_TGEC_MDIO_ADDR)     \
@@ -131,7 +131,7 @@ enum fm_eth_type {
 #endif
 #endif
 
-#if (CONFIG_SYS_NUM_FM1_10GEC >= 3)
+#if (CFG_SYS_NUM_FM1_10GEC >= 3)
 #define FM_TGEC_INFO_INITIALIZER2(idx, n) \
 {                                                                      \
        FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR)     \

diff --git a/include/i2c.h b/include/i2c.h
index e0ee94e550467cf716e9e56424fd470898da548f..c07e60b04bd0688ed3b8f1e2f27c1c2428963e7e 100644 (file)
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -637,7 +637,7 @@ void i2c_early_init_f(void);
 /* no muxes used bus = i2c adapters */
 #define CONFIG_SYS_I2C_DIRECT_BUS      1
 #define CONFIG_SYS_I2C_MAX_HOPS                0
-#define CONFIG_SYS_NUM_I2C_BUSES       ll_entry_count(struct i2c_adapter, i2c)
+#define CFG_SYS_NUM_I2C_BUSES  ll_entry_count(struct i2c_adapter, i2c)
 #else
 /* we use i2c muxes */
 #undef CONFIG_SYS_I2C_DIRECT_BUS