| Message ID | 20171220013037.24485-1-swarren@wwwdotorg.org |
|---|---|
| State | Accepted |
| Commit | 3cdb5fa08a226a64e3486f7c2a32d044bdfada7d |
| Delegated to: | Tom Warren |
| Headers | show |
| Series | [U-Boot,1/4] ARM: tegra: don't use CONFIG_SPL_TEXT_BASE when no SPL | expand |
On 19 December 2017 at 18:30, Stephen Warren <swarren@wwwdotorg.org> wrote: > From: Stephen Warren <swarren@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@nvidia.com> > --- > arch/arm/dts/tegra-u-boot.dtsi | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 01/03/2018 03:43 PM, Tom Warren wrote: > Stephen, > > -----Original Message----- > From: sjg@google.com [mailto:sjg@google.com] On Behalf Of Simon Glass > Sent: Thursday, December 28, 2017 8:14 PM > To: Stephen Warren <swarren@wwwdotorg.org> > Cc: Tom Warren <TWarren@nvidia.com>; Tom Rini <trini@konsulko.com>; U-Boot Mailing List <u-boot@lists.denx.de>; Stephen Warren <swarren@nvidia.com> > Subject: Re: [PATCH 1/4] ARM: tegra: don't use CONFIG_SPL_TEXT_BASE when no SPL > > On 19 December 2017 at 18:30, Stephen Warren <swarren@wwwdotorg.org> wrote: >> From: Stephen Warren <swarren@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@nvidia.com> >> --- >> arch/arm/dts/tegra-u-boot.dtsi | 15 +++++++++------ >> 1 file changed, 9 insertions(+), 6 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> > > I've applied this series to u-boot-tegra/master. I'll wait a bit to see how your new series (RAM bank/mem parsing) is received and then I'll apply it, too, and post a PR. > I assume you expect the Linux kernel image header patches to go in thru TomR? I think it's best to push them all through the Tegra path, since there will be a stream of common and Tegra patches all intermixed.
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)>; }; }; };