[PATCH 05/31] fdt: Drop SPL_BUILD macro

Ilias Apalodimas ilias.apalodimas at linaro.org
Mon Nov 1 08:42:32 CET 2021


Hi Simon,

Seems irrelevant to the current series, but can be sent with patch#1 separately?

On Mon, 1 Nov 2021 at 03:19, Simon Glass <sjg at chromium.org> wrote:
>
> This old macro is not needed anymore since we can use IS_ENABLED() now.
> Drop it.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>  drivers/serial/serial-uclass.c | 3 ++-
>  include/fdtdec.h               | 6 ------
>  2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
> index 30d44214d7d..96a1cb65ba2 100644
> --- a/drivers/serial/serial-uclass.c
> +++ b/drivers/serial/serial-uclass.c
> @@ -104,7 +104,8 @@ static void serial_find_console_or_panic(void)
>                         }
>                 }
>         }
> -       if (!SPL_BUILD || !CONFIG_IS_ENABLED(OF_CONTROL) || !blob) {
> +       if (!IS_ENABLED(CONFIG_SPL_BUILD) || !CONFIG_IS_ENABLED(OF_CONTROL) ||
> +           !blob) {
>                 /*
>                  * Try to use CONFIG_CONS_INDEX if available (it is numbered
>                  * from 1!).
> diff --git a/include/fdtdec.h b/include/fdtdec.h
> index 68a36f10583..24992baed8b 100644
> --- a/include/fdtdec.h
> +++ b/include/fdtdec.h
> @@ -49,12 +49,6 @@ struct fdt_memory {
>
>  struct bd_info;
>
> -#ifdef CONFIG_SPL_BUILD
> -#define SPL_BUILD      1
> -#else
> -#define SPL_BUILD      0
> -#endif
> -
>  /*
>   * Information about a resource. start is the first address of the resource
>   * and end is the last address (inclusive). The length of the resource will
> --
> 2.33.1.1089.g2158813163f-goog
>

Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>


More information about the U-Boot mailing list