summaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-28 23:46:36 +0200
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2017-08-26 07:40:36 +0900
commitf40ad66fa066c7eacbcbb11c2e2f251bb82426e0 (patch)
treef956d0de1adb05e0e5f421953f2b1e5209583e9c /arch/sh
parent90340c87e5eed344f6f947661ff170c8369635db (diff)
arch/sh: don't bring common/env_embedded.o into the link
The linker script for SuperH brings the .ppcenv and .ppcenvr section of common/env_embedded.o into the .text section. However, the .ppcenv section is only ever filled in by env_embedded.o when CONFIG_SYS_USE_PPCENV is defined, but no platforms in mainline U-Boot use this. In addition, common/env_embedded.o is not always built (when you use CONFIG_ENV_IS_NOWHERE for example), which causes the following build failure: Fixes: LD u-boot /home/thomas/sh4aeb-linux-musl/bin/sh4aeb-linux-ld.bfd: cannot find common/env_embedded.o We fix this by no longer adding the .ppcenv and .ppcenvr sections from common/env_embedded.o into the .text section. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/cpu/u-boot.lds4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds
index bd4fde9f2c..2f2bdb5b83 100644
--- a/arch/sh/cpu/u-boot.lds
+++ b/arch/sh/cpu/u-boot.lds
@@ -38,10 +38,6 @@ SECTIONS
KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text))
KEEP(*(.spiboot2.text))
. = ALIGN(8192);
- env/embedded.o (.ppcenv)
- . = ALIGN(8192);
- env/embedded.o (.ppcenvr)
- . = ALIGN(8192);
*(.text)
. = ALIGN(4);
} >ram =0xFF