[PATCH 04/14] spl: Remove remaining #ifdef in spl_parse_image_header()
Sean Anderson
seanga2 at gmail.com
Sat Jul 20 17:36:18 CEST 2024
On 7/20/24 02:16, Simon Glass wrote:
> Define spl_set_header_raw_uboot() always so we can drop the last #ifdef
> in this function.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> common/spl/spl.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index 02567e766f1..745efdd9b28 100644
> --- a/common/spl/spl.c
> +++ b/common/spl/spl.c
> @@ -245,7 +245,6 @@ __weak struct legacy_img_hdr *spl_get_load_buffer(ssize_t offset, size_t size)
> return map_sysmem(CONFIG_TEXT_BASE + offset, 0);
> }
>
> -#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT
> void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
> {
> ulong u_boot_pos = spl_get_image_pos();
> @@ -273,7 +272,6 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
> spl_image->os = IH_OS_U_BOOT;
> spl_image->name = "U-Boot";
> }
> -#endif
>
> __weak int spl_parse_board_header(struct spl_image_info *spl_image,
> const struct spl_boot_device *bootdev,
> @@ -357,16 +355,19 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
> sizeof(*header)))
> return 0;
>
> -#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT
> + if (IS_ENABLED(CONFIG_SPL_RAW_IMAGE_SUPPORT)) {
> /* Signature not found - assume u-boot.bin */
> debug("mkimage signature not found - ih_magic = %x\n",
> - header->ih_magic);
> + header->ih_magic);
> spl_set_header_raw_uboot(spl_image);
> -#else
> - /* RAW image not supported, proceed to other boot methods. */
> + } else {
> + /*
> + * RAW image not supported, proceed to other boot
> + * methods
> + */
nit: leave this comment as-is, since it is under 80 columns
> debug("Raw boot image support not enabled, proceeding to other boot methods\n");
> return -EINVAL;
> -#endif
> + }
>
> return 0;
> }
Reviewed-by: Sean Anderson <seanga2 at gmail.com>
More information about the U-Boot
mailing list