[U-Boot] [PATCH 1/4] ARM: tegra: don't use CONFIG_SPL_TEXT_BASE when no SPL

[Tom Warren]

Stephen,

> -----Original Message-----
> From: Stephen Warren [mailto:swarren at wwwdotorg.org]
> Sent: Tuesday, December 19, 2017 6:31 PM
> To: Tom Warren <TWarren at nvidia.com>
> Cc: Simon Glass <sjg at chromium.org>; Tom Rini <trini at konsulko.com>; u-
> boot at lists.denx.de; Stephen Warren <swarren at nvidia.com>
> Subject: [PATCH 1/4] ARM: tegra: don't use CONFIG_SPL_TEXT_BASE when no
> SPL
> 
> From: Stephen Warren <swarren at nvidia.com>
> 
> 64-bit Tegra don't use SPL, and soon won't define CONFIG_SPL_TEXT_BASE
> when building. Fix the binman .dts file so that it doesn't use undefined values.
> 
> Signed-off-by: Stephen Warren <swarren at nvidia.com>
> ---
>  arch/arm/dts/tegra-u-boot.dtsi | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 

This series: Reviewed-by: Tom Warren <twarren at nvidia.com>

I'll wait a bit for other reviews & apply it to u-boot-tegra today or tomorrow.

Tom
> diff --git a/arch/arm/dts/tegra-u-boot.dtsi b/arch/arm/dts/tegra-u-boot.dtsi
> index cde591c5fca4..4f692ee97572 100644
> --- a/arch/arm/dts/tegra-u-boot.dtsi
> +++ b/arch/arm/dts/tegra-u-boot.dtsi
> @@ -1,5 +1,11 @@
>  #include <config.h>
> 
> +#ifdef CONFIG_SPL_TEXT_BASE
> +#define U_BOOT_OFFSET (CONFIG_SYS_TEXT_BASE -
> CONFIG_SPL_TEXT_BASE)
> +#else #define U_BOOT_OFFSET 0 #endif
> +
>  / {
>  	binman {
>  		multiple-images;
> @@ -9,8 +15,7 @@
>  			u-boot-spl {
>  			};
>  			u-boot {
> -				pos = <(CONFIG_SYS_TEXT_BASE -
> -					CONFIG_SPL_TEXT_BASE)>;
> +				pos = <(U_BOOT_OFFSET)>;
>  			};
>  		};
> 
> @@ -21,8 +26,7 @@
>  			u-boot-spl {
>  			};
>  			u-boot {
> -				pos = <(CONFIG_SYS_TEXT_BASE -
> -					CONFIG_SPL_TEXT_BASE)>;
> +				pos = <(U_BOOT_OFFSET)>;
>  			};
>  		};
> 
> @@ -32,8 +36,7 @@
>  			u-boot-spl {
>  			};
>  			u-boot-nodtb {
> -				pos = <(CONFIG_SYS_TEXT_BASE -
> -					CONFIG_SPL_TEXT_BASE)>;
> +				pos = <(U_BOOT_OFFSET)>;
>  			};
>  		};
>  	};
> --
> 2.15.1
--
nvpublic