Eric Lee / smarc-uboot

12
Download as
Browse Code ยป

Commit f4dc714aaa2d86b84724ec01fb848da63aa63666

Authored by Scott Wood
Committed by Albert ARIBAUD
1 parent 8137af19e7
Exists in master and in 50 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

arm64: Turn u-boot.bin back into an ELF file after relocate-rela 

While performing relocations on u-boot.bin should be good enough for
booting on real hardware, some simulators insist on booting an ELF file
(and yet don't perform ELF relocations), so convert the relocated
binary back into an ELF file.  This can go away in the future if we
change relocate-rela to operate directly on the ELF file, or if and
when we stop caring about a simulator with this restriction.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Feng <fenghua@phytium.com.cn>

Showing 1 changed file with 13 additions and 0 deletions Side-by-side Diff

... ... @@ -358,6 +358,7 @@
358 358 ifneq ($(CONFIG_SPL_TARGET),)
359 359 ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET))
360 360 endif
  361 +ALL-$(CONFIG_REMAKE_ELF) += $(obj)u-boot.elf
361 362  
362 363 # enable combined SPL/u-boot/dtb rules for tegra
363 364 ifneq ($(CONFIG_TEGRA),)
... ... @@ -527,6 +528,18 @@
527 528 dd if=$(obj)u-boot.img of=$(obj)u-boot-pad.img \
528 529 conv=notrunc 2>/dev/null
529 530 cat $(obj)u-boot-pad.img $(obj)spl/u-boot-spl.bin > $@
  531 +
  532 +# Create a new ELF from a raw binary file. This is useful for arm64
  533 +# where static relocation needs to be performed on the raw binary,
  534 +# but certain simulators only accept an ELF file (but don't do the
  535 +# relocation).
  536 +# FIXME refactor dts/Makefile to share target/arch detection
  537 +$(obj)u-boot.elf: $(obj)u-boot.bin
  538 + @$(OBJCOPY) -B aarch64 -I binary -O elf64-littleaarch64 \
  539 + $< $(obj)u-boot-elf.o
  540 + @$(LD) $(obj)u-boot-elf.o -o $@ \
  541 + --defsym=_start=$(CONFIG_SYS_TEXT_BASE) \
  542 + -Ttext=$(CONFIG_SYS_TEXT_BASE)
530 543  
531 544 ifeq ($(CONFIG_SANDBOX),y)
532 545 GEN_UBOOT = \