[PATCH v2 33/50] image: Drop IMAGE_BOOT_GET_CMDLINE

Simon Glass sjg at chromium.org
Thu May 6 16:24:21 CEST 2021


This is not needed with Kconfig, since we can use IS_ENABLED() easily
enough. Update the only place where this is used and drop it.

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

(no changes since v1)

 common/image-board.c | 2 +-
 include/image.h      | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/common/image-board.c b/common/image-board.c
index 0b9809c3f6b..1a3b0bc7efc 100644
--- a/common/image-board.c
+++ b/common/image-board.c
@@ -898,7 +898,7 @@ int image_setup_linux(bootm_headers_t *images)
 	if (CONFIG_IS_ENABLED(OF_LIBFDT))
 		boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree);
 
-	if (IMAGE_BOOT_GET_CMDLINE) {
+	if (IS_ENABLED(CONFIG_SYS_BOOT_GET_CMDLINE)) {
 		ret = boot_get_cmdline(lmb, &images->cmdline_start,
 				       &images->cmdline_end);
 		if (ret) {
diff --git a/include/image.h b/include/image.h
index f4b8dd7dd0f..122fc25e1b4 100644
--- a/include/image.h
+++ b/include/image.h
@@ -49,12 +49,6 @@ struct fdt_region;
 
 #endif /* FIT */
 
-#ifdef CONFIG_SYS_BOOT_GET_CMDLINE
-# define IMAGE_BOOT_GET_CMDLINE		1
-#else
-# define IMAGE_BOOT_GET_CMDLINE		0
-#endif
-
 #ifdef CONFIG_OF_BOARD_SETUP
 # define IMAGE_OF_BOARD_SETUP		1
 #else
-- 
2.31.1.607.g51e8a6a459-goog



More information about the U-Boot mailing list