mirror of
https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git
synced 2026-03-14 21:10:27 +01:00
ARM: tegra: don't use CONFIG_SPL_TEXT_BASE when no SPL
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:
parent
373b900341
commit
3cdb5fa08a
1 changed files with 9 additions and 6 deletions
|
|
@ -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)>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue