diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-22 17:09:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-26 22:55:53 -0500 |
| commit | a6d6812a212cf2ac263b23e68e6cbf719e64ac20 (patch) | |
| tree | 98e84a0687c1adfdf5b2b18916a55dbcf768c526 /scripts | |
| parent | 0da90255083681a02b24528f80da9d4062ff634a (diff) | |
| download | u-boot-a6d6812a212cf2ac263b23e68e6cbf719e64ac20.zip u-boot-a6d6812a212cf2ac263b23e68e6cbf719e64ac20.tar.gz u-boot-a6d6812a212cf2ac263b23e68e6cbf719e64ac20.tar.bz2 | |
PowerPC: Stop re-using CONFIG_SPL_TEXT_BASE for TPL
Rather than checking for CONFIG_TPL_BUILD and then re-defining
CONFIG_SPL_TEXT_BASE make use of CONFIG_TPL_TEXT_BASE directly.
Cc: York Sun <york.sun@nxp.com>
Cc: Po Liu <po.liu@nxp.com>
Cc: Qiang Zhao <qiang.zhao@nxp.com>
Cc: Timur Tabi <timur@tabi.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index e5b604e..24ee927 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -321,14 +321,9 @@ LDFLAGS_$(SPL_BIN) += -T u-boot-spl.lds $(LDFLAGS_FINAL) # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards. LDFLAGS_$(SPL_BIN) += $(call ld-option, --no-dynamic-linker) -# First try the best-match (i.e. SPL_TEXT_BASE for SPL, TPL_TEXT_BASE for TPL) +# Pick the best-match (i.e. SPL_TEXT_BASE for SPL, TPL_TEXT_BASE for TPL) ifneq ($(CONFIG_$(SPL_TPL_)TEXT_BASE),) LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_$(SPL_TPL_)TEXT_BASE) -else -# And then fall back to just testing for SPL_TEXT_BASE, even if in TPL mode -ifneq ($(CONFIG_SPL_TEXT_BASE),) -LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) -endif endif ifdef CONFIG_TARGET_SOCFPGA_ARRIA10 |