[PATCH v6 24/25] fdt: Drop remaining preprocessor macros in fdtdec_setup()

[Ilias Apalodimas]

Hi Simon,

On Thu, 2 Dec 2021 at 18:00, Simon Glass <sjg at chromium.org> wrote:
>
> We only have two choices for obtaining the devicetree. Simplify the code
> to make that clear.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> (no changes since v1)
>
>  lib/fdtdec.c | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/lib/fdtdec.c b/lib/fdtdec.c
> index 5b31064cee2..a7f62123a94 100644
> --- a/lib/fdtdec.c
> +++ b/lib/fdtdec.c
> @@ -1624,15 +1624,17 @@ static void setup_multi_dtb_fit(void)
>  int fdtdec_setup(void)
>  {
>         int ret;
> -#ifdef CONFIG_OF_EMBED
> -       /* Get a pointer to the FDT */
> -       gd->fdt_blob = dtb_dt_embedded();
> -#elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
> -       /* Allow the board to override the fdt address. */
> -       gd->fdt_blob = board_fdt_blob_setup(&ret);
> -       if (ret)
> -               return ret;
> -#endif
> +
> +       /* The devicetree is typically appended to U-Boot */
> +       if (IS_ENABLED(CONFIG_OF_SEPARATE) || IS_ENABLED(CONFIG_OF_BOARD)) {
> +               /* Allow the board to override the fdt address. */
> +               gd->fdt_blob = board_fdt_blob_setup(&ret);
> +               if (ret)
> +                       return ret;
> +       } else { /* embed dtb in ELF file for testing / development */
> +               gd->fdt_blob = dtb_dt_embedded();
> +       }
> +
>         if (!IS_ENABLED(CONFIG_SPL_BUILD)) {
>                 /* Allow the early environment to override the fdt address */
>                 gd->fdt_blob = map_sysmem(env_get_ulong("fdtcontroladdr", 16,
> --
> 2.34.0.rc2.393.gf8c9666880-goog
>

In case you need to resend this can you change the commit message a bit?
This doesn't really simplify the logic, just replaces ifdefs with IS_ENABLED

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