[U-Boot] [PATCH] ARM: rmobile: rcar-gen3: Activate bootm_size

[Marek Vasut]

On 3/5/19 11:13 PM, Eugeniu Rosca wrote:
> v2019.01 commit 07a8060a1277 ("ARM: rmobile: Convert to bootm_size")
> attempted converting to bootm_size of 256 MiB below targets:
>  - include/configs/alt.h
>  - include/configs/gose.h
>  - include/configs/koelsch.h
>  - include/configs/lager.h
>  - include/configs/porter.h
>  - include/configs/rcar-gen3-common.h
>  - include/configs/silk.h
>  - include/configs/stout.h
> 
> The update didn't fully work on R-Car3 due to the
> CONFIG_SYS_BOOTMAPSZ=8MiB definition left by v2016.09 commit
> e525d34b476e ("ARM: rmobile: Add support salvator-x board"),
> which is explained in below README excerpt:
> 
> ----8<----
> CONFIG_SYS_BOOTMAPSZ:
>                 [..] If CONFIG_SYS_BOOTMAPSZ is undefined,
>                 then the value in "bootm_size" will be used instead.
> ----8<----
> 
> Allow the original commit to accomplish its purpose on R-Car3 targets
> by removing the CONFIG_SYS_BOOTMAPSZ definition.
> 
> Fixes: 07a8060a1277 ("ARM: rmobile: Convert to bootm_size")
> Signed-off-by: Eugeniu Rosca <erosca at de.adit-jv.com>
> ---
>  include/configs/rcar-gen3-common.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
> index 06d5d3219ca6..20f982165dd5 100644
> --- a/include/configs/rcar-gen3-common.h
> +++ b/include/configs/rcar-gen3-common.h
> @@ -48,7 +48,6 @@
>  #define CONFIG_SYS_MONITOR_BASE		0x00000000
>  #define CONFIG_SYS_MONITOR_LEN		(256 * 1024)
>  #define CONFIG_SYS_MALLOC_LEN		(1 * 1024 * 1024)
> -#define CONFIG_SYS_BOOTMAPSZ		(8 * 1024 * 1024)
>  #define CONFIG_SYS_BOOTM_LEN		(64 << 20)
>  
>  /* ENV setting */
> 
Applied, thanks.

-- 
Best regards,
Marek Vasut