global: Migrate CONFIG_STD_DEVICES_SETTINGS to CFG

Perform a simple rename of CONFIG_STD_DEVICES_SETTINGS to CFG_STD_DEVICES_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index b347125..b0df328 100644 (file)
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial,usbkbd\0" \
                                        "stdout=serial,vidconsole\0" \
                                        "stderr=serial,vidconsole\0"
 

diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h
index 726c43d..d6ce70a 100644 (file)
--- a/include/configs/cherryhill.h
+++ b/include/configs/cherryhill.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=usbkbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=usbkbd,serial\0" \
                                        "stdout=vidconsole,serial\0" \
                                        "stderr=vidconsole,serial\0"
 

diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h
index d14c1d4..43fdc39 100644 (file)
--- a/include/configs/chromebook_coral.h
+++ b/include/configs/chromebook_coral.h
@@ -13,8 +13,8 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#undef CONFIG_STD_DEVICES_SETTINGS
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
+#undef CFG_STD_DEVICES_SETTINGS
+#define CFG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
                                        "stdout=vidconsole,serial\0" \
                                        "stderr=vidconsole,serial\0"
 

diff --git a/include/configs/chromebook_samus.h b/include/configs/chromebook_samus.h
index e29be3f..03a1033 100644 (file)
--- a/include/configs/chromebook_samus.h
+++ b/include/configs/chromebook_samus.h
@@ -15,8 +15,8 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#undef CONFIG_STD_DEVICES_SETTINGS
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
+#undef CFG_STD_DEVICES_SETTINGS
+#define CFG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
                                        "stdout=vidconsole,serial\0" \
                                        "stderr=vidconsole,serial\0"
 

diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 6f43172..60617e6 100644 (file)
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 

diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index f730043..b4f49bf 100644 (file)
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -15,7 +15,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial,i8042-kbd,usbkbd\0" \
                                        "stdout=serial,vidconsole\0" \
                                        "stderr=serial,vidconsole\0"
 

diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index b64c7df..31639e4 100644 (file)
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial,i8042-kbd,usbkbd\0" \
                                        "stdout=serial,vga\0" \
                                        "stderr=serial,vga\0"
 

diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index ff74deb..387bb88 100644 (file)
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial,i8042-kbd,usbkbd\0" \
                                        "stdout=serial,vidconsole\0" \
                                        "stderr=serial,vidconsole\0"
 

diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index d10422b..05389a4 100644 (file)
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -16,7 +16,7 @@
 /* Use BayTrail internal HS UART which is memory-mapped */
 #endif
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 

diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
index 17a7851..843ed8b 100644 (file)
--- a/include/configs/efi-x86_app.h
+++ b/include/configs/efi-x86_app.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial\0" \
                                        "stdout=vidconsole\0" \
                                        "stderr=vidconsole\0"
 

diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h
index f50c2ce..c72b067 100644 (file)
--- a/include/configs/efi-x86_payload.h
+++ b/include/configs/efi-x86_payload.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial,i8042-kbd,usbkbd\0" \
                                        "stdout=serial,vidconsole\0" \
                                        "stderr=serial,vidconsole\0"
 

diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 472f236..0380ac2 100644 (file)
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -14,7 +14,7 @@
 
 /* ns16550 UART is memory-mapped in Quark SoC */
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial\0" \
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 

diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 6c15c72..4a12c2f 100644 (file)
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=usbkbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=usbkbd,serial\0" \
                                        "stdout=vidconsole,serial\0" \
                                        "stderr=vidconsole,serial\0" \
                                        "usb_pgood_delay=40\0"

diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index 5cd1388..33263a4 100644 (file)
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -22,7 +22,7 @@
 #include <config_distro_bootcmd.h>
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,i8042-kbd\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial,i8042-kbd\0" \
                                        "stdout=serial,vidconsole\0" \
                                        "stderr=serial,vidconsole\0"
 

diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h
index 748a423..20b99a1 100644 (file)
--- a/include/configs/slimbootloader.h
+++ b/include/configs/slimbootloader.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS            \
+#define CFG_STD_DEVICES_SETTINGS               \
        "stdin=serial,i8042-kbd,usbkbd\0"       \
        "stdout=serial\0"                       \
        "stderr=serial\0"
@@ -18,7 +18,7 @@
  */
 #undef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS         \
-       CONFIG_STD_DEVICES_SETTINGS             \
+       CFG_STD_DEVICES_SETTINGS                \
        "netdev=eth0\0"                         \
        "consoledev=ttyS0\0"                    \
        "ramdiskaddr=0x4000000\0"               \

diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index f097092..b2e7aa1 100644 (file)
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=serial,usbkbd\0" \
                                        "stdout=serial,vidconsole\0" \
                                        "stderr=serial,vidconsole\0"
 

diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index 7469951..b23b878 100644 (file)
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -11,7 +11,7 @@
 #ifndef __THEADORABLE_X86_COMMON_H
 #define __THEADORABLE_X86_COMMON_H
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 

diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 9df3bfd..41fb499 100644 (file)
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -12,7 +12,7 @@
 
 #define VIDEO_IO_OFFSET                                0
 
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=usbkbd,i8042-kbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS       "stdin=usbkbd,i8042-kbd,serial\0" \
                                        "stdout=vidconsole,serial\0" \
                                        "stderr=vidconsole,serial\0"
 

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index f421ec5..c1c5a09 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -44,7 +44,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS                 \
        DISTRO_BOOTENV                                  \
-       CONFIG_STD_DEVICES_SETTINGS                     \
+       CFG_STD_DEVICES_SETTINGS                        \
        SPLASH_SETTINGS                                 \
        "pciconfighost=1\0"                             \
        "netdev=eth0\0"                                 \