[PATCH V6 07/10] common: spl: spl: Remove video driver

Nikhil M Jain n-jain1 at ti.com
Tue Jul 18 10:57:33 CEST 2023


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 at ti.com>
Reviewed-by: Devarsh Thakkar <devarsht at ti.com>
---
V6:
- No change.

V5:
- No change.

V4:
- No change.

V3:
- Replace #if defined(CONFIG_SPL_VIDEO_REMOVE) with
  if (IS_ENABLED(CONFIG_SPL_VIDEO_REMOVE).

V2:
- Add Reviewed-by tag.

 common/spl/spl.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index d45dd1c923..f09bb97781 100644
--- 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);
-- 
2.34.1



More information about the U-Boot mailing list