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/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index d51209c..d565492 100644
--- 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