Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/km/keymile-common.h | 10 +++++----- scripts/config_whitelist.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 720711ac8dde..b33bf3615e4f 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -24,16 +24,16 @@ #define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */
-#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS -#define CONFIG_KM_UBI_PART_BOOT_OPTS "" -#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ +#ifndef CFG_KM_UBI_PART_BOOT_OPTS +#define CFG_KM_UBI_PART_BOOT_OPTS "" +#endif /* CFG_KM_UBI_PART_BOOT_OPTS */
#ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS + CFG_KM_UBI_PART_BOOT_OPTS # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0" #else /* CFG_KM_UBI_PARTITION_NAME_APP */ @@ -42,7 +42,7 @@ /* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS " " \ + CFG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e166916e8f40..e5eeb35bfec4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -85,7 +85,7 @@ CFG_KM_NEW_ENV CFG_KM_UBI_LINUX_MTD CFG_KM_UBI_PARTITION_NAME_APP CFG_KM_UBI_PARTITION_NAME_BOOT -CONFIG_KM_UBI_PART_BOOT_OPTS +CFG_KM_UBI_PART_BOOT_OPTS CONFIG_KM_UIMAGE_NAME CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE