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 b347125f2fa0bc5a6670749fd52abc8226d0585a..b0df328cd84b13010c0083ebf66e69d0f36737f6 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 726c43d35ea0a97cb98a1c097d2b7f032ce5bd76..d6ce70a96aeab43e3e1884de0865f0fda255b988 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 d14c1d445b25a364c77145cf9175c17e9d268f31..43fdc394416df47ddd52272cf9ff0e32132fb390 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 e29be3fda4acb0a99879f57095c9abbd3d0a35b4..03a1033c57350f310de398c0184794702a182bd6 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 6f431725269cae1f14eee05c26363eaf1874ebda..60617e6fec25a5c3575fcd48ee2358de9f128da7 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 f73004386fdab0f17d6213fd78e5b0d44dc30f6d..b4f49bf5289d4ba3bc51e13f96636e0b383e9e41 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 b64c7df1b25f934d767fd30f5ae2048b2edd8f01..31639e48da886ac67cf9d9e4a7988a5d9f3ec4c7 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 ff74deb3d40091dcc8d719a360c84a0da092b551..387bb8800e89f77672f1f873b1e7288c0e55583e 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 d10422b6c1c7e470382befd739ebf73224ff0c33..05389a435bee67a810ee5dc2cfc3a44c523142e7 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 17a785140262dfc4ac82c7344fe783bb81b67d57..843ed8b9d1db70b5e243f994e703401296a88a36 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 f50c2ce4dd07998bc09395e1cf3f1728625983ff..c72b067c367dafeb4056bf9e0dd296d251d46c27 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 472f236b9b6ecfeddfc2f49e28dabeaeddabecad..0380ac287be2859510379b28949991caa395876f 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 6c15c72efda518c167b785c32807b628692f3f5c..4a12c2f72c62cc3a2b53efab276a8a9087fe2406 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 5cd13887084c97aac311b880e4a2e2199535f8d2..33263a46a40717865f433dc98065a07bdc165313 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 748a423b08336c6521ea90433afa9a7c88d33673..20b99a1021df662198a492fad51a5f7f5440c69f 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 f097092136731a08a0ced0c8f176af19b252929d..b2e7aa1514c0de9c2ea13b36f33abe8ac194b735 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 746995179f9c90e7eef07bc5ffa2f49cc8dc2630..b23b8783076b1130b34f1def5d83abe85a056e3c 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 9df3bfd527f6a5e91e29095b2479269ccc2af2f9..41fb499ae4f7b8c58645f6d5cf2ba245c8c5b653 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 f421ec58034459d705acc0827c9bf31d95ef0fe3..c1c5a09a35c71454e303b242656bfce7a1778c7a 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"                                 \