[PoC 069/241] global: Migrate CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 include/configs/km/keymile-common.h  | 2 +-
 include/configs/km/km-powerpc.h      | 2 +-
 include/configs/km/pg-wcom-ls102xa.h | 4 ++--
 include/configs/kmcent2.h            | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index cc5ec219b8db..94408e6efd9a 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -98,7 +98,7 @@
 		CONFIG_KM_ECC_MODE					\
 		" phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
 		" " CONFIG_KM_UBI_LINUX_MTD " "				\
-		CONFIG_KM_DEF_BOOT_ARGS_CPU				\
+		CFG_KM_DEF_BOOT_ARGS_CPU				\
 		"\0"							\
 	"addpanic="							\
 		"setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0"	\
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index f6c21e1666d1..da0ee3f27e7e 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -28,7 +28,7 @@
 #define CONFIG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
 
 /* architecture specific default bootargs */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
+#define CFG_KM_DEF_BOOT_ARGS_CPU		""
 
 #define CONFIG_KM_DEF_ENV_CPU						\
 	"u-boot="CFG_HOSTNAME "/u-boot.bin\0"		\
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index e64cf24bd5e9..516fa76e3209 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -179,8 +179,8 @@
 #define CONFIG_KM_DEF_ENV
 #endif
 
-#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
+#ifndef CFG_KM_DEF_BOOT_ARGS_CPU
+#define CFG_KM_DEF_BOOT_ARGS_CPU		""
 #endif
 
 #define CONFIG_KM_DEF_ENV_CPU						\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 870603d461af..3c49e174d9a0 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -16,7 +16,7 @@
  * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot
  * parameters
  */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU	"fsl_dpaa_fman.fsl_fm_max_frm=1558"
+#define CFG_KM_DEF_BOOT_ARGS_CPU	"fsl_dpaa_fman.fsl_fm_max_frm=1558"
 
 #include "km/keymile-common.h"
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 12edc317773f..d203ede8c963 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -71,7 +71,7 @@ CFG_IRAM_END
 CFG_IRAM_SIZE
 CFG_IRAM_TOP
 CFG_KM_DEF_ARCH
-CONFIG_KM_DEF_BOOT_ARGS_CPU
+CFG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
 CONFIG_KM_DEF_ENV_BOOTARGS
 CONFIG_KM_DEF_ENV_BOOTPARAMS
-- 
2.25.1