aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini2022-11-16 13:10:25 -0500
committerTom Rini2022-12-05 16:05:38 -0500
commit0ed384fd2f511fb415b16fb0eb221e9437cd17ee (patch)
tree2f6a4e320b5a49c8128e6d61a1f3d75e25e067f1 /board
parent4e5909450ec2acafb3d2e5b9714251ae67e0f0e0 (diff)
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>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/ls1043aqds/ls1043aqds.c48
-rw-r--r--board/freescale/ls1043ardb/ls1043ardb.c32
-rw-r--r--board/freescale/ls1046aqds/ls1046aqds.c48
-rw-r--r--board/freescale/ls1088a/ls1088a.c26
4 files changed, 77 insertions, 77 deletions
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 481d3a5d9bd..5fe40c4bdb2 100644
--- 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 7f321281988..a8a7263a653 100644
--- 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 de6828673b5..97d71dbf2ad 100644
--- 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 b70c198188b..ff3abc83022 100644
--- 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",
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 04:19:57 +0000