[PATCH 134/149] global: Migrate CONFIG_VSC7385_IMAGE et al to CFG

Tom Rini
2022-12-04T15:31:49Z

Perform simple renames of:
CONFIG_VSC7385_IMAGE to CFG_VSC7385_IMAGE
CONFIG_VSC7385_IMAGE_SIZE to CFG_VSC7385_IMAGE_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/freescale/mpc837xerdb/mpc837xerdb.c | 6 +++---
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
include/configs/MPC837XERDB.h | 4 ++--
include/configs/p1_p2_rdb_pc.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 8b1bfe0a9f91..97884a397964 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -206,9 +206,9 @@ int misc_init_r(void)
{
int rc = 0;

-#ifdef CONFIG_VSC7385_IMAGE
- if (vsc7385_upload_firmware((void *) CONFIG_VSC7385_IMAGE,
- CONFIG_VSC7385_IMAGE_SIZE)) {
+#ifdef CFG_VSC7385_IMAGE
+ if (vsc7385_upload_firmware((void *) CFG_VSC7385_IMAGE,
+ CFG_VSC7385_IMAGE_SIZE)) {
puts("Failure uploading VSC7385 microcode.\n");
rc = 1;
}
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 4d7d042eaf3b..602b7f0156ba 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -355,7 +355,7 @@ int board_early_init_r(void)
vscfw_addr = hextoul(tmp, NULL);
printf("uploading VSC7385 microcode from %x\n", vscfw_addr);
if (vsc7385_upload_firmware((void *)vscfw_addr,
- CONFIG_VSC7385_IMAGE_SIZE))
+ CFG_VSC7385_IMAGE_SIZE))
puts("Failure uploading VSC7385 microcode.\n");
} else {
puts("No address specified for VSC7385 microcode.\n");
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 07c989d98906..70b1c399241e 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -42,8 +42,8 @@
#ifdef CONFIG_VSC7385_ENET

/* The flash address and size of the VSC7385 firmware image */
-#define CONFIG_VSC7385_IMAGE 0xFE7FE000
-#define CONFIG_VSC7385_IMAGE_SIZE 8192
+#define CFG_VSC7385_IMAGE 0xFE7FE000
+#define CFG_VSC7385_IMAGE_SIZE 8192

#endif

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index be7680198299..f5bd09134499 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -270,7 +270,7 @@
#endif

/* The size of the VSC7385 firmware image */
-#define CONFIG_VSC7385_IMAGE_SIZE 8192
+#define CFG_VSC7385_IMAGE_SIZE 8192
#endif

#ifndef __VSCFW_ADDR
--
2.25.1