global: Move remaining CONFIG_SYS_NOR_* to CFG_SYS_NOR_*

The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_NOR
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/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 481d3a5d9bd9f76c3402e862320a0b24763a3367..5fe40c4bdb251fd0087732c2d753b1bf9c52adfa 100644 (file)
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -59,13 +59,13 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                "nor0",
                CONFIG_SYS_NOR0_CSPR,
                CONFIG_SYS_NOR0_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
 
        },
@@ -73,13 +73,13 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                "nor1",
                CONFIG_SYS_NOR1_CSPR,
                CONFIG_SYS_NOR1_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
        },
        {
@@ -128,26 +128,26 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                "nor0",
                CONFIG_SYS_NOR0_CSPR,
                CONFIG_SYS_NOR0_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
        },
        {
                "nor1",
                CONFIG_SYS_NOR1_CSPR,
                CONFIG_SYS_NOR1_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
        },
        {

diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index 7f3212819885d2a5f13743bb0f26c5680f4d02de..a8a7263a6538c6dfb499401e1df8e53750b09e71 100644 (file)
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -33,15 +33,15 @@ DECLARE_GLOBAL_DATA_PTR;
 struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        {
                "nor",
-               CONFIG_SYS_NOR_CSPR,
-               CONFIG_SYS_NOR_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_CSPR,
+               CFG_SYS_NOR_CSPR_EXT,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
 
        },
@@ -89,15 +89,15 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
        },
        {
                "nor",
-               CONFIG_SYS_NOR_CSPR,
-               CONFIG_SYS_NOR_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_CSPR,
+               CFG_SYS_NOR_CSPR_EXT,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
        },
        {

diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index de6828673b50ecb1560ab0726c191c135483aaee..97d71dbf2adb6fd44afef171116145dd556883b9 100644 (file)
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -43,13 +43,13 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                "nor0",
                CONFIG_SYS_NOR0_CSPR,
                CONFIG_SYS_NOR0_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
 
        },
@@ -57,13 +57,13 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                "nor1",
                CONFIG_SYS_NOR1_CSPR,
                CONFIG_SYS_NOR1_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
        },
        {
@@ -112,26 +112,26 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                "nor0",
                CONFIG_SYS_NOR0_CSPR,
                CONFIG_SYS_NOR0_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
        },
        {
                "nor1",
                CONFIG_SYS_NOR1_CSPR,
                CONFIG_SYS_NOR1_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
        },
        {

diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index b70c198188bf41f6225f018680d8de71c6ec11ab..ff3abc830229fee185d20f6bbab5bd6f5b1c93ea 100644 (file)
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -43,13 +43,13 @@ struct ifc_regs ifc_cfg_ifc_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                "nor0",
                CONFIG_SYS_NOR0_CSPR_EARLY,
                CONFIG_SYS_NOR0_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
                0,
                CONFIG_SYS_NOR0_CSPR,
@@ -59,17 +59,17 @@ struct ifc_regs ifc_cfg_ifc_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
                "nor1",
                CONFIG_SYS_NOR1_CSPR_EARLY,
                CONFIG_SYS_NOR0_CSPR_EXT,
-               CONFIG_SYS_NOR_AMASK_EARLY,
-               CONFIG_SYS_NOR_CSOR,
+               CFG_SYS_NOR_AMASK_EARLY,
+               CFG_SYS_NOR_CSOR,
                {
-                       CONFIG_SYS_NOR_FTIM0,
-                       CONFIG_SYS_NOR_FTIM1,
-                       CONFIG_SYS_NOR_FTIM2,
-                       CONFIG_SYS_NOR_FTIM3
+                       CFG_SYS_NOR_FTIM0,
+                       CFG_SYS_NOR_FTIM1,
+                       CFG_SYS_NOR_FTIM2,
+                       CFG_SYS_NOR_FTIM3
                },
                0,
                CONFIG_SYS_NOR1_CSPR,
-               CONFIG_SYS_NOR_AMASK,
+               CFG_SYS_NOR_AMASK,
        },
        {
                "nand",

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 3288969ce8caaf562d65b253c508d3d9406534d7..154bf584f29fd2e2915e43df3fee4aab479297e5 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -144,22 +144,22 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_SYS_NOR_CSPR    (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK   IFC_AMASK(32*1024*1024)
-#define CONFIG_SYS_NOR_CSOR    CSOR_NOR_ADM_SHIFT(7)
+#define CFG_SYS_NOR_AMASK      IFC_AMASK(32*1024*1024)
+#define CFG_SYS_NOR_CSOR       CSOR_NOR_ADM_SHIFT(7)
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_FTIM0   FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0      FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TEAHC(0x5)
-#define CONFIG_SYS_NOR_FTIM1   FTIM1_NOR_TACO(0x1e) | \
+#define CFG_SYS_NOR_FTIM1      FTIM1_NOR_TACO(0x1e) | \
                                FTIM1_NOR_TRAD_NOR(0x0f)
-#define CONFIG_SYS_NOR_FTIM2   FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2      FTIM2_NOR_TCS(0x4) | \
                                FTIM2_NOR_TCH(0x4) | \
                                FTIM2_NOR_TWP(0x1c)
-#define CONFIG_SYS_NOR_FTIM3   0x0
+#define CFG_SYS_NOR_FTIM3      0x0
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
@@ -244,21 +244,21 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
 #define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR1               CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR0               CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
 #define CONFIG_SYS_CSOR1               CFG_SYS_NAND_CSOR

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 6eaa4144959d3e32205aec7b73f46e104f6bf3d2..978cc6714ec69bbf4e90557720ab72e8b7fef354 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -139,26 +139,26 @@
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK   IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK      IFC_AMASK(128*1024*1024)
 
 /* NOR Flash Timing Params */
 #if defined(CONFIG_TARGET_T1024RDB)
-#define CONFIG_SYS_NOR_CSOR    CSOR_NAND_TRHZ_80
+#define CFG_SYS_NOR_CSOR       CSOR_NAND_TRHZ_80
 #elif defined(CONFIG_TARGET_T1023RDB)
-#define CONFIG_SYS_NOR_CSOR    (CSOR_NOR_ADM_SHIFT(0) | \
+#define CFG_SYS_NOR_CSOR    (CSOR_NOR_ADM_SHIFT(0) | \
                                CSOR_NAND_TRHZ_80 | CSOR_NOR_ADM_SHFT_MODE_EN)
 #endif
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1A) |\
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x4) | \
                                FTIM2_NOR_TCH(0x4) | \
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3   0x0
+#define CFG_SYS_NOR_FTIM3      0x0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
@@ -247,21 +247,21 @@
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index a9e6cfad4bc17c84df77fab22cd40604b8a7e4e9..f26e9d6e869249472acfa7dc7022bc164cac7913 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -100,12 +100,12 @@
 #define CONFIG_SYS_FLASH_BASE  0xe8000000
 #define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | CONFIG_SYS_FLASH_BASE)
 
-#define CONFIG_SYS_NOR_CSPR_EXT        (0xf)
-#define CONFIG_SYS_NOR_CSPR    (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
+#define CFG_SYS_NOR_CSPR_EXT   (0xf)
+#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK   IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK      IFC_AMASK(128*1024*1024)
 
 /*
  * TDM Definition
@@ -113,18 +113,18 @@
 #define T1040_TDM_QUIRK_CCSR_BASE      0xfe000000
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR    CSOR_NAND_TRHZ_80
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_CSOR       CSOR_NAND_TRHZ_80
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1A) |\
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x4) | \
                                FTIM2_NOR_TCH(0x4) | \
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3   0x0
+#define CFG_SYS_NOR_FTIM3      0x0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
@@ -221,23 +221,23 @@
 #define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
 #define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR1               CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR0               CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 47f499031e89e604e5b38cb2a74ad0a881849cdf..62f07108126d9a6d1dbed109856da22767d4ea43 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -109,21 +109,21 @@
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK   IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK      IFC_AMASK(128*1024*1024)
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR    CSOR_NAND_TRHZ_80
+#define CFG_SYS_NOR_CSOR       CSOR_NAND_TRHZ_80
 
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1A) |\
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x4) | \
                                FTIM2_NOR_TCH(0x4) | \
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3   0x0
+#define CFG_SYS_NOR_FTIM3      0x0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
@@ -211,37 +211,37 @@
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 111f2e6245f9497352cf0bb99a4341fca27ab818..0616f8a86dff8795ad344d268ae2fbe1ec80b14e 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -98,22 +98,22 @@
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK   IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK      IFC_AMASK(128*1024*1024)
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR    CSOR_NAND_TRHZ_80
+#define CFG_SYS_NOR_CSOR       CSOR_NAND_TRHZ_80
 
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1A) |\
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x4) | \
                                FTIM2_NOR_TCH(0x4) | \
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3   0x0
+#define CFG_SYS_NOR_FTIM3      0x0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
@@ -187,21 +187,21 @@
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index b8232986be6806d69d720a6930d4c02a793182ae..2eb4e73efa9ecef47d69f4d91d2f02d0b2187393 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -175,21 +175,21 @@
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK   IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK      IFC_AMASK(128*1024*1024)
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR    CSOR_NAND_TRHZ_80
+#define CFG_SYS_NOR_CSOR       CSOR_NAND_TRHZ_80
 
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1A) |\
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x4) | \
                                FTIM2_NOR_TCH(0x4) | \
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3   0x0
+#define CFG_SYS_NOR_FTIM3      0x0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
@@ -242,21 +242,21 @@
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK1              CFG_SYS_NAND_AMASK
@@ -268,12 +268,12 @@
 #endif
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
 
 /* CPLD on IFC */
 #define CONFIG_SYS_CPLD_BASE   0xffdf0000

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index d883b188ce3ae4a9942c62e9bf0551c0b305a99f..cc8c37ec0bf5747072b2eed89e24f8af1136f824 100644 (file)
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -41,25 +41,25 @@
                                CSPR_TE | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(64 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(64 * 1024 * 1024)
 
-#define CONFIG_SYS_NOR_CSOR            (CSOR_NOR_AVD_TGL_PGM_EN | \
+#define CFG_SYS_NOR_CSOR               (CSOR_NOR_AVD_TGL_PGM_EN | \
                                        CSOR_NOR_ADM_SHIFT(0x4) | \
                                        CSOR_NOR_NOR_MODE_ASYNC_NOR | \
                                        CSOR_NOR_TRHZ_20 | \
                                        CSOR_NOR_BCTLD)
-#define CONFIG_SYS_NOR_FTIM0           (FTIM0_NOR_TACSE(0x1) | \
+#define CFG_SYS_NOR_FTIM0              (FTIM0_NOR_TACSE(0x1) | \
                                        FTIM0_NOR_TEADC(0x7) | \
                                        FTIM0_NOR_TAVDS(0x0) | \
                                        FTIM0_NOR_TEAHC(0x1))
-#define CONFIG_SYS_NOR_FTIM1           (FTIM1_NOR_TACO(0x1) | \
+#define CFG_SYS_NOR_FTIM1              (FTIM1_NOR_TACO(0x1) | \
                                        FTIM1_NOR_TRAD_NOR(0x21) | \
                                        FTIM1_NOR_TSEQRAD_NOR(0x21))
-#define CONFIG_SYS_NOR_FTIM2           (FTIM2_NOR_TCS(0x1) | \
+#define CFG_SYS_NOR_FTIM2              (FTIM2_NOR_TCS(0x1) | \
                                        FTIM2_NOR_TCH(0x1) | \
                                        FTIM2_NOR_TWPH(0x6) | \
                                        FTIM2_NOR_TWP(0xb))
-#define CONFIG_SYS_NOR_FTIM3           0
+#define CFG_SYS_NOR_FTIM3              0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
@@ -69,12 +69,12 @@
 
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 
 /* NAND Flash Definitions */
 #define CFG_SYS_NAND_BASE              0x68000000

diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 51ee6865533384a339a4a82b4b52d7f2835bc2ea..16fd6d562d412a119784db7da7ecbb81b21bb90a 100644 (file)
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -193,38 +193,38 @@
 #define CONFIG_SYS_FLASH_BASE_PHYS     (0xf00000000ull | \
                                        CONFIG_SYS_FLASH_BASE)
 
-#define CONFIG_SYS_NOR_CSPR_EXT        (0x0f)
-#define CONFIG_SYS_NOR_CSPR    (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
+#define CFG_SYS_NOR_CSPR_EXT   (0x0f)
+#define CFG_SYS_NOR_CSPR       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
                                CSPR_PORT_SIZE_16 | /* Port size = 16 bit */\
                                0x00000010 |        /* drive TE high */\
                                CSPR_MSEL_NOR |     /* MSEL = NOR */\
                                CSPR_V)             /* valid */
-#define CONFIG_SYS_NOR_AMASK   IFC_AMASK(64 * 1024 * 1024) /* 64MB */
-#define CONFIG_SYS_NOR_CSOR    (CSOR_NOR_AVD_TGL_PGM_EN | /* AVD toggle */\
+#define CFG_SYS_NOR_AMASK      IFC_AMASK(64 * 1024 * 1024) /* 64MB */
+#define CFG_SYS_NOR_CSOR       (CSOR_NOR_AVD_TGL_PGM_EN | /* AVD toggle */\
                                CSOR_NOR_TRHZ_20 | \
                                CSOR_NOR_BCTLD)
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x1) | \
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x1) | \
                                FTIM0_NOR_TEADC(0x7) | \
                                FTIM0_NOR_TEAHC(0x1))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x1) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x1) | \
                                FTIM1_NOR_TRAD_NOR(0x21) | \
                                FTIM1_NOR_TSEQRAD_NOR(0x21))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCH(0x1) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCH(0x1) | \
                                FTIM2_NOR_TCS(0x1) | \
                                FTIM2_NOR_TWP(0xb) | \
                                FTIM2_NOR_TWPH(0x6))
-#define CONFIG_SYS_NOR_FTIM3   0x0
-
-#define CONFIG_SYS_CSPR0_EXT   CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0       CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0      CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0       CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0   CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1   CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2   CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3   CONFIG_SYS_NOR_FTIM3
+#define CFG_SYS_NOR_FTIM3      0x0
+
+#define CONFIG_SYS_CSPR0_EXT   CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR0       CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK0      CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0       CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0   CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1   CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2   CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3   CFG_SYS_NOR_FTIM3
 
 /* More NOR Flash params */
 

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 7d89b538952229fe452c4b0663cdca3ee730a8a1..6b23134ecc9990ceb577402b773bea0b48b80a38 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -44,21 +44,21 @@
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128 * 1024 * 1024)
 
-#define CONFIG_SYS_NOR_CSOR            (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_NOR_CSOR               (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_TRHZ_80)
-#define CONFIG_SYS_NOR_FTIM0           (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0              (FTIM0_NOR_TACSE(0x4) | \
                                        FTIM0_NOR_TEADC(0x5) | \
                                        FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1           (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1              (FTIM1_NOR_TACO(0x35) | \
                                        FTIM1_NOR_TRAD_NOR(0x1a) | \
                                        FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2           (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2              (FTIM2_NOR_TCS(0x4) | \
                                        FTIM2_NOR_TCH(0x4) | \
                                        FTIM2_NOR_TWPH(0xe) | \
                                        FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3           0
+#define CFG_SYS_NOR_FTIM3              0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45
 #define CONFIG_SYS_WRITE_SWAPPED_DATA
@@ -166,20 +166,20 @@
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
 #define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
 #define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
@@ -191,20 +191,20 @@
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 2c96b6f778956872e1b155292a758ac720dc2bf5..1ac59a2d45970094700b038323be294210d98697 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -74,23 +74,23 @@
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128 * 1024 * 1024)
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR            (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_NOR_CSOR               (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_TRHZ_80)
-#define CONFIG_SYS_NOR_FTIM0           (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0              (FTIM0_NOR_TACSE(0x4) | \
                                        FTIM0_NOR_TEADC(0x5) | \
                                        FTIM0_NOR_TAVDS(0x0) | \
                                        FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1           (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1              (FTIM1_NOR_TACO(0x35) | \
                                        FTIM1_NOR_TRAD_NOR(0x1A) | \
                                        FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2           (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2              (FTIM2_NOR_TCS(0x4) | \
                                        FTIM2_NOR_TCH(0x4) | \
                                        FTIM2_NOR_TWP(0x1c) | \
                                        FTIM2_NOR_TWPH(0x0e))
-#define CONFIG_SYS_NOR_FTIM3           0
+#define CFG_SYS_NOR_FTIM3              0
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
@@ -126,12 +126,12 @@
 #define CONFIG_SYS_FPGA_FTIM3           0x0
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_FPGA_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_FPGA_CSPR
 #define CONFIG_SYS_AMASK1              CONFIG_SYS_FPGA_AMASK

diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 21263705c80333ab3ea0aa21c09f1c13de78a382..3b51cb8f174a3319917cf1a4116b11a25f8b7002 100644 (file)
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -54,21 +54,21 @@
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128 * 1024 * 1024)
 
-#define CONFIG_SYS_NOR_CSOR            (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_NOR_CSOR               (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_TRHZ_80)
-#define CONFIG_SYS_NOR_FTIM0           (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0              (FTIM0_NOR_TACSE(0x4) | \
                                        FTIM0_NOR_TEADC(0x5) | \
                                        FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1           (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1              (FTIM1_NOR_TACO(0x35) | \
                                        FTIM1_NOR_TRAD_NOR(0x1a) | \
                                        FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2           (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2              (FTIM2_NOR_TCS(0x4) | \
                                        FTIM2_NOR_TCH(0x4) | \
                                        FTIM2_NOR_TWPH(0xe) | \
                                        FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3           0
+#define CFG_SYS_NOR_FTIM3              0
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
                                        CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
@@ -174,20 +174,20 @@
 #ifdef CONFIG_TFABOOT
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
@@ -216,20 +216,20 @@
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
 #define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
 #define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
@@ -241,20 +241,20 @@
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 51667f2025808577b787d851d6e5bb06eee36db5..76251fde57cc5ced61aedb6e07d37ad0eef1aeec 100644 (file)
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -18,29 +18,29 @@
 /*
  * NOR Flash Definitions
  */
-#define CONFIG_SYS_NOR_CSPR_EXT                (0x0)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128*1024*1024)
-#define CONFIG_SYS_NOR_CSPR                                    \
+#define CFG_SYS_NOR_CSPR_EXT           (0x0)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_CSPR                                       \
        (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR            (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_NOR_CSOR               (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_TRHZ_80)
-#define CONFIG_SYS_NOR_FTIM0           (FTIM0_NOR_TACSE(0x1) | \
+#define CFG_SYS_NOR_FTIM0              (FTIM0_NOR_TACSE(0x1) | \
                                        FTIM0_NOR_TEADC(0x1) | \
                                        FTIM0_NOR_TAVDS(0x0) | \
                                        FTIM0_NOR_TEAHC(0xc))
-#define CONFIG_SYS_NOR_FTIM1           (FTIM1_NOR_TACO(0x1c) | \
+#define CFG_SYS_NOR_FTIM1              (FTIM1_NOR_TACO(0x1c) | \
                                        FTIM1_NOR_TRAD_NOR(0xb) | \
                                        FTIM1_NOR_TSEQRAD_NOR(0x9))
-#define CONFIG_SYS_NOR_FTIM2           (FTIM2_NOR_TCS(0x1) | \
+#define CFG_SYS_NOR_FTIM2              (FTIM2_NOR_TCS(0x1) | \
                                        FTIM2_NOR_TCH(0x4) | \
                                        FTIM2_NOR_TWPH(0x8) | \
                                        FTIM2_NOR_TWP(0x10))
-#define CONFIG_SYS_NOR_FTIM3           0
+#define CFG_SYS_NOR_FTIM3              0
 #define CONFIG_SYS_IFC_CCR             0x01000000
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE_PHYS }
@@ -117,14 +117,14 @@
 
 /* IFC Timing Params */
 #ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR0               CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 
 #define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR
@@ -145,23 +145,23 @@
 #define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
 
-#define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR1               CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR0               CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 
 #define CONFIG_SYS_CSPR1_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CFG_SYS_NAND_CSPR

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index d51209c60f2dd4c4bb60910f943f3e51c770fb9f..d565492f1d1cbc68e3636cd483ee2bf3c6fa40cf 100644 (file)
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -69,22 +69,22 @@
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128 * 1024 * 1024)
 
-#define CONFIG_SYS_NOR_CSOR            (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_NOR_CSOR               (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_TRHZ_80)
-#define CONFIG_SYS_NOR_FTIM0           (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0              (FTIM0_NOR_TACSE(0x4) | \
                                        FTIM0_NOR_TEADC(0x5) | \
                                        FTIM0_NOR_TAVDS(0x6) | \
                                        FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1           (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1              (FTIM1_NOR_TACO(0x35) | \
                                        FTIM1_NOR_TRAD_NOR(0x1a) | \
                                        FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2           (FTIM2_NOR_TCS(0x8) | \
+#define CFG_SYS_NOR_FTIM2              (FTIM2_NOR_TCS(0x8) | \
                                        FTIM2_NOR_TCH(0x8) | \
                                        FTIM2_NOR_TWPH(0xe) | \
                                        FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3           0
+#define CFG_SYS_NOR_FTIM3              0
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
                                        CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
@@ -190,20 +190,20 @@
 #ifdef CONFIG_TFABOOT
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
@@ -232,20 +232,20 @@
 #define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
 #define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
 #define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
@@ -257,20 +257,20 @@
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR1_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK

diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index ae452075ac0d29c6bbcdff4bf6d05fc14980e091..b75d4ccf5cfdf090074c6401d0a530a6245befdc 100644 (file)
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -23,8 +23,8 @@
  */
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 #define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128*1024*1024)
-#define CONFIG_SYS_NOR_AMASK_EARLY     IFC_AMASK(64*1024*1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64*1024*1024)
 
 #define CONFIG_SYS_NOR0_CSPR                                   \
        (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
@@ -46,19 +46,19 @@
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR_CSOR    CSOR_NOR_ADM_SHIFT(12)
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_CSOR       CSOR_NOR_ADM_SHIFT(12)
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TAVDS(0x6) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1a) | \
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x8) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x8) | \
                                FTIM2_NOR_TCH(0x8) | \
                                FTIM2_NOR_TWPH(0xe) | \
                                FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3   0x04000000
+#define CFG_SYS_NOR_FTIM3      0x04000000
 #define CONFIG_SYS_IFC_CCR     0x01000000
 
 #ifndef SYS_NO_FLASH
@@ -158,22 +158,22 @@
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR_EARLY
 #define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK1_FINAL                CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK_EARLY
+#define CONFIG_SYS_AMASK1_FINAL                CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
@@ -214,22 +214,22 @@
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR_EARLY
 #define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK1_FINAL                CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK_EARLY
+#define CONFIG_SYS_AMASK1_FINAL                CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 2ca1384c23155e034c839097e12d045a112b086c..27510adae67771832aa2391cbdfae8e65c322f4b 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -21,8 +21,8 @@
 
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 #define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128 * 1024 * 1024)
-#define CONFIG_SYS_NOR_AMASK_EARLY     IFC_AMASK(64 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64 * 1024 * 1024)
 
 #define CONFIG_SYS_NOR0_CSPR                                   \
        (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
@@ -34,16 +34,16 @@
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR_CSOR    CSOR_NOR_ADM_SHIFT(6)
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x1) | \
+#define CFG_SYS_NOR_CSOR       CSOR_NOR_ADM_SHIFT(6)
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x1) | \
                                FTIM0_NOR_TEADC(0x1) | \
                                FTIM0_NOR_TEAHC(0x1))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x1) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x1) | \
                                FTIM1_NOR_TRAD_NOR(0x1))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x0) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x0) | \
                                FTIM2_NOR_TCH(0x0) | \
                                FTIM2_NOR_TWP(0x1))
-#define CONFIG_SYS_NOR_FTIM3   0x04000000
+#define CFG_SYS_NOR_FTIM3      0x04000000
 #define CONFIG_SYS_IFC_CCR     0x01000000
 
 #ifndef SYS_NO_FLASH
@@ -153,12 +153,12 @@
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #endif
 
 #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index d9e11cc191792153fbdaa506a4fdbd572b71699c..7315790f1fe105717ebaf84ad9a0b504d0ed7e45 100644 (file)
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -26,8 +26,8 @@
 #define SPD_EEPROM_ADDRESS     SPD_EEPROM_ADDRESS1
 
 #define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128*1024*1024)
-#define CONFIG_SYS_NOR_AMASK_EARLY     IFC_AMASK(64*1024*1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64*1024*1024)
 
 #define CONFIG_SYS_NOR0_CSPR                                   \
        (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
@@ -49,18 +49,18 @@
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR_CSOR    CSOR_NOR_ADM_SHIFT(12)
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_CSOR       CSOR_NOR_ADM_SHIFT(12)
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1a) |\
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x4) | \
                                FTIM2_NOR_TCH(0x4) | \
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3   0x04000000
+#define CFG_SYS_NOR_FTIM3      0x04000000
 #define CONFIG_SYS_IFC_CCR     0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
@@ -147,22 +147,22 @@
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR_EARLY
 #define CONFIG_SYS_CSPR2_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK2_FINAL                CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK_EARLY
+#define CONFIG_SYS_AMASK2_FINAL                CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
@@ -178,22 +178,22 @@
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR_EARLY
 #define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK1_FINAL                CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1              CFG_SYS_NOR_AMASK_EARLY
+#define CONFIG_SYS_AMASK1_FINAL                CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 086c46902c865d12cabe5e4bc1b1cdc441b261b5..daca3be16c510c0017dcfbd94525d3ccb2c3bef2 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -33,8 +33,8 @@
 #if !defined(CONFIG_FSL_QSPI) || defined(CONFIG_TFABOOT)
 
 #define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128*1024*1024)
-#define CONFIG_SYS_NOR_AMASK_EARLY     IFC_AMASK(64*1024*1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64*1024*1024)
 
 #define CONFIG_SYS_NOR0_CSPR                                   \
        (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
@@ -46,18 +46,18 @@
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR_CSOR    CSOR_NOR_ADM_SHIFT(12)
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_CSOR       CSOR_NOR_ADM_SHIFT(12)
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1a) |\
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x4) | \
                                FTIM2_NOR_TCH(0x4) | \
                                FTIM2_NOR_TWPH(0x0E) | \
                                FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3   0x04000000
+#define CFG_SYS_NOR_FTIM3      0x04000000
 #define CONFIG_SYS_IFC_CCR     0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
@@ -140,12 +140,12 @@
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR2_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
@@ -160,12 +160,12 @@
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0              CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK