Perform a simple rename of CONFIG_STD_DEVICES_SETTINGS to
CFG_STD_DEVICES_SETTINGS
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
include/configs/bayleybay.h | 2 +-
include/configs/cherryhill.h | 2 +-
include/configs/chromebook_coral.h | 4 ++--
include/configs/chromebook_samus.h | 4 ++--
include/configs/conga-qeval20-qa3-e3845.h | 2 +-
include/configs/coreboot.h | 2 +-
include/configs/cougarcanyon2.h | 2 +-
include/configs/crownbay.h | 2 +-
include/configs/dfi-bt700.h | 2 +-
include/configs/efi-x86_app.h | 2 +-
include/configs/efi-x86_payload.h | 2 +-
include/configs/galileo.h | 2 +-
include/configs/minnowmax.h | 2 +-
include/configs/qemu-x86.h | 2 +-
include/configs/slimbootloader.h | 4 ++--
include/configs/som-db5800-som-6867.h | 2 +-
include/configs/theadorable-x86-common.h | 2 +-
include/configs/x86-chromebook.h | 2 +-
include/configs/x86-common.h | 2 +-
19 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index b347125f2fa0..b0df328cd84b 100644
--- 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 726c43d35ea0..d6ce70a96aea 100644
--- 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 d14c1d445b25..43fdc394416d 100644
--- 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 e29be3fda4ac..03a1033c5735 100644
--- 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 6f431725269c..60617e6fec25 100644
--- 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 f73004386fda..b4f49bf5289d 100644
--- 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 b64c7df1b25f..31639e48da88 100644
--- 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 ff74deb3d400..387bb8800e89 100644
--- 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 d10422b6c1c7..05389a435bee 100644
--- 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 17a785140262..843ed8b9d1db 100644
--- 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 f50c2ce4dd07..c72b067c367d 100644
--- 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 472f236b9b6e..0380ac287be2 100644
--- 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 6c15c72efda5..4a12c2f72c62 100644
--- 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 5cd13887084c..33263a46a407 100644
--- 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 748a423b0833..20b99a1021df 100644
--- 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 f09709213673..b2e7aa1514c0 100644
--- 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 746995179f9c..b23b8783076b 100644
--- 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 9df3bfd527f6..41fb499ae4f7 100644
--- 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 f421ec580344..c1c5a09a35c7 100644
--- 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" \
--
2.25.1
