common: spl: spl: Remove video driver

Use config SPL_VIDEO_REMOVE to remove video driver at SPL stage before
jumping to next stage, in place of CONFIG_SPL_VIDEO, to allow user to
remove video if required.

Signed-off-by: Nikhil M Jain <n-jain1@ti.com>
Reviewed-by: Devarsh Thakkar <devarsht@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index d45dd1c..f09bb97 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -891,18 +891,18 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                debug("Failed to stash bootstage: err=%d\n", ret);
 #endif
 
-#if defined(CONFIG_SPL_VIDEO)
-       struct udevice *dev;
-       int rc;
-
-       rc = uclass_find_device(UCLASS_VIDEO, 0, &dev);
-       if (!rc && dev) {
-               rc = device_remove(dev, DM_REMOVE_NORMAL);
-               if (rc)
-                       printf("Cannot remove video device '%s' (err=%d)\n",
-                              dev->name, rc);
+       if (IS_ENABLED(CONFIG_SPL_VIDEO_REMOVE)) {
+               struct udevice *dev;
+               int rc;
+
+               rc = uclass_find_device(UCLASS_VIDEO, 0, &dev);
+               if (!rc && dev) {
+                       rc = device_remove(dev, DM_REMOVE_NORMAL);
+                       if (rc)
+                               printf("Cannot remove video device '%s' (err=%d)\n",
+                                      dev->name, rc);
+               }
        }
-#endif
 
        spl_board_prepare_for_boot();
        jump_to_image_no_args(&spl_image);