[U-Boot] [PATCH 4/5] spl: fdt: support for fdt fixup for falcon boot

[Lukasz Majewski]

Hi Ravi,

> Adding support for fdt fixup to update the
> memory node in device tree for falcon boot.
> 
> This is needed for single stage or falcon
> bootmode, to pass memory configuration to
> kernel through DT memory node.
> 
> Signed-off-by: Ravi Babu <ravibabu at ti.com>
> ---
>  arch/arm/lib/Makefile    | 1 +
>  arch/arm/lib/bootm-fdt.c | 7 ++++++-
>  common/Makefile          | 2 +-
>  3 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
> index 6e96cfb..53d4ed2 100644
> --- a/arch/arm/lib/Makefile
> +++ b/arch/arm/lib/Makefile
> @@ -33,6 +33,7 @@ obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
>  else
>  obj-$(CONFIG_SPL_FRAMEWORK) += spl.o
>  obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o
> +obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
>  endif
>  obj-$(CONFIG_$(SPL_)USE_ARCH_MEMSET) += memset.o
>  obj-$(CONFIG_$(SPL_)USE_ARCH_MEMCPY) += memcpy.o
> diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
> index d84789c..eaa817b 100644
> --- a/arch/arm/lib/bootm-fdt.c
> +++ b/arch/arm/lib/bootm-fdt.c
> @@ -27,8 +27,10 @@ DECLARE_GLOBAL_DATA_PTR;
>  
>  int arch_fixup_fdt(void *blob)
>  {
> +	int ret = 0;
> +#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_OF_LIBFDT)
>  	bd_t *bd = gd->bd;
> -	int bank, ret;
> +	int bank;
>  	u64 start[CONFIG_NR_DRAM_BANKS];
>  	u64 size[CONFIG_NR_DRAM_BANKS];
>  
> @@ -42,9 +44,11 @@ int arch_fixup_fdt(void *blob)
>  #endif
>  	}
>  
> +#ifdef CONFIG_OF_LIBFDT
>  	ret = fdt_fixup_memory_banks(blob, start, size,
> CONFIG_NR_DRAM_BANKS); if (ret)
>  		return ret;
> +#endif
>  
>  #ifdef CONFIG_ARMV8_SPIN_TABLE
>  	ret = spin_table_update_dt(blob);
> @@ -58,6 +62,7 @@ int arch_fixup_fdt(void *blob)
>  	if (ret)
>  		return ret;
>  #endif
> +#endif
>  
>  	return 0;
>  }
> diff --git a/common/Makefile b/common/Makefile
> index 86225f1..bcd2486 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -95,7 +95,7 @@ obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
>  obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
>  obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
>  obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
> -obj-$(CONFIG_SPL_OF_TRANSLATE) += fdt_support.o
> +obj-$(CONFIG_SPL_OF_LIBFDT) += fdt_support.o
>  ifdef CONFIG_SPL_USB_HOST_SUPPORT
>  obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
>  obj-$(CONFIG_USB_STORAGE) += usb_storage.o

Reviewed-by: Lukasz Majewski <lukma at denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de