[PATCH v5 12/29] image: Drop IMAGE_BOOT_GET_CMDLINE

Alex G. mr.nuke.me at gmail.com
Tue Oct 5 20:36:10 CEST 2021



On 9/25/21 8:43 PM, Simon Glass wrote:
> This is not needed with Kconfig, since we can use IS_ENABLED() easily
> enough and the board code is now in a separate file. Update the only place
> where this is used and drop it.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Reviewed-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>

> ---
> 
> Changes in v5:
> - Update commit message to indicate that the code is in a separate file
> 
>   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 a9a6011ce02..599d6779df5 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)) {

This would return 0 on a tools build, right?
>   		ret = boot_get_cmdline(lmb, &images->cmdline_start,
>   				       &images->cmdline_end);
>   		if (ret) {
> diff --git a/include/image.h b/include/image.h
> index dc872ef5b24..00a80999584 100644
> --- a/include/image.h
> +++ b/include/image.h
> @@ -49,12 +49,6 @@ struct fdt_region;
>   #include <fdt_support.h>
>   #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
> 


More information about the U-Boot mailing list