global: Migrate CONFIG_VSC7385_IMAGE et al to CFG

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>

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 8b1bfe0a9f914aafa5a2800be4b95844789d8eb3..97884a3979649f33239383a38c674e18ccf76800 100644 (file)
--- 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 4d7d042eaf3bd3e401a0b69768e752ee998c94ff..602b7f0156ba8fb19587b0732dd7281721e408d3 100644 (file)
--- 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 07c989d989062f181b08db948ac92e882700f7b1..70b1c399241edf89ff19e45fd09132209b5faa49 100644 (file)
--- 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 be7680198299e241511dd3a4cc4f72231eb823a4..f5bd09134499a26f310e0dedbe51975231dfd417 100644 (file)
--- 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