[PoC 139/241] global: Migrate CONFIG_OTHBOOTARGS to CFG

Tom Rini
2022-11-20T14:13:28Z

include/configs/x86-common.h | 6 +++---
scripts/config_whitelist.txt | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index fdd7dba9a6f2..df75deedf583 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -45,9 +45,9 @@
#define CFG_HOSTNAME "x86"
#define CONFIG_RAMDISK_ADDR 0x4000000
#if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
-#define CONFIG_OTHBOOTARGS "othbootargs=\0"
+#define CFG_OTHBOOTARGS "othbootargs=\0"
#else
-#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0"
+#define CFG_OTHBOOTARGS "othbootargs=acpi=off\0"
#endif

#if defined(CONFIG_DISTRO_DEFAULTS)
@@ -67,7 +67,7 @@
"pciconfighost=1\0" \
"netdev=eth0\0" \
"consoledev=ttyS0\0" \
- CONFIG_OTHBOOTARGS \
+ CFG_OTHBOOTARGS \
"scriptaddr=0x7000000\0" \
"kernel_addr_r=0x1000000\0" \
"ramdisk_addr_r=0x4000000\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d8e9be8a82ef..a5c5644e65dd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -148,7 +148,7 @@ CFG_NETMASK
CFG_NORBOOT
CFG_NUM_DSP_CPUS
CFG_ODROID_REV_AIN
-CONFIG_OTHBOOTARGS
+CFG_OTHBOOTARGS
CONFIG_OVERWRITE_ETHADDR_ONCE
CONFIG_PCIE_IMX_PERST_GPIO
CONFIG_PCIE_IMX_POWER_GPIO
--
2.25.1