Perform a simple rename of CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG_KM_DEF_BOOT_ARGS_CPU
Signed-off-by: Tom Rini trini@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 +- 4 files changed, 5 insertions(+), 5 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 424caa0df977..41ce6b5ee852 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="CONFIG_HOSTNAME "/u-boot.bin\0" \ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index b0a759aa7199..00e4a1f2cb84 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -176,8 +176,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 c10a3366b0c9..b384fc6a6f46 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -15,7 +15,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"