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

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>
This commit is contained in:
Thomas Petazzoni 2017-07-28 23:46:36 +02:00 committed by Nobuhiro Iwamatsu
parent 90340c87e5
commit f40ad66fa0
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/cpu/u-boot.lds
View File

@ -38,10 +38,6 @@ SECTIONS
KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text))
KEEP(*(.spiboot2.text)) KEEP(*(.spiboot2.text))
. = ALIGN(8192); . = ALIGN(8192);
env/embedded.o (.ppcenv)
. = ALIGN(8192);
env/embedded.o (.ppcenvr)
. = ALIGN(8192);
*(.text) *(.text)
. = ALIGN(4); . = ALIGN(4);
} >ram =0xFF } >ram =0xFF