Message ID | 20230130151612.212732-123-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show |
Series | None | expand |
This converts 2 usages of this option to the non-SPL form, since there is no SPL_PG_WCOM_UBOOT_BOOTPACKAGE defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- Reviewed-by: Aleksandar Gerasimovski <Aleksandar.gerasimovski@hitachienergy.com> Regards, Aleksandar board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 0252ada93ff..9cf5b71655c 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -79,9 +79,9 @@ int set_km_env(void) } #if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) -#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ +#if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ - (CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ + (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif -- 2.39.1.456.gfc5497dd1b-goog
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 0252ada93ff..9cf5b71655c 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -79,9 +79,9 @@ int set_km_env(void) } #if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) -#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ +#if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ - (CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ + (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif
This converts 2 usages of this option to the non-SPL form, since there is no SPL_PG_WCOM_UBOOT_BOOTPACKAGE defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)