Correct SPL uses of VIDEO

This converts 2 usages of this option to the non-SPL form, since there is
no SPL_VIDEO defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/cls.c b/cmd/cls.c
index 18643ec0243176d99a7f9c704a0e873542a15298..787c7edbee3fa5f35dd8526168dd359d237da921 100644 (file)
--- a/cmd/cls.c
+++ b/cmd/cls.c
@@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc,
 
        /*  Send clear screen and home */
        printf(CSI "2J" CSI "1;1H");
-       if (CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) {
+       if (IS_ENABLED(CONFIG_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) {
                if (uclass_first_device_err(UCLASS_VIDEO, &dev))
                        return CMD_RET_FAILURE;
                if (video_clear(dev))

diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c
index 71d4c8fde903d1f3342f82a5527716728b4f67c5..282c34fe0b9c86257fa728490f1633454801cee5 100644 (file)
--- a/common/fdt_simplefb.c
+++ b/common/fdt_simplefb.c
@@ -82,7 +82,7 @@ int fdt_simplefb_enable_existing_node(void *blob)
        return fdt_simplefb_configure_node(blob, off);
 }
 
-#if CONFIG_IS_ENABLED(VIDEO)
+#if IS_ENABLED(CONFIG_VIDEO)
 int fdt_simplefb_enable_and_mem_rsv(void *blob)
 {
        struct fdt_memory mem;