leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: tegra: don't use CONFIG_SPL_TEXT_BASE when no SPL

Browse Source 
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>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Stephen Warren
2017-12-19 18:30:34 -07:00
committed by Tom Warren
parent 373b900341
commit 3cdb5fa08a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/dts/tegra-u-boot.dtsi
View File

@@ -1,5 +1,11 @@
#include <config.h> #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 { binman {
multiple-images; multiple-images;
@@ -9,8 +15,7 @@
u-boot-spl { u-boot-spl {
}; };
u-boot { u-boot {
pos = <(CONFIG_SYS_TEXT_BASE - pos = <(U_BOOT_OFFSET)>;
CONFIG_SPL_TEXT_BASE)>;
}; };
}; };
@@ -21,8 +26,7 @@
u-boot-spl { u-boot-spl {
}; };
u-boot { u-boot {
pos = <(CONFIG_SYS_TEXT_BASE - pos = <(U_BOOT_OFFSET)>;
CONFIG_SPL_TEXT_BASE)>;
}; };
}; };
@@ -32,8 +36,7 @@
u-boot-spl { u-boot-spl {
}; };
u-boot-nodtb { u-boot-nodtb {
pos = <(CONFIG_SYS_TEXT_BASE - pos = <(U_BOOT_OFFSET)>;
CONFIG_SPL_TEXT_BASE)>;
}; };
}; };
}; };