diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2021-09-27 13:17:49 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-09-28 15:09:01 +0000 |
| commit | 3606b932b63373e6dae7460f1b4cfd61fd50df6d (patch) | |
| tree | 8161d937edd4a27d93c7febe25a4dfdf0e6638e9 | |
| parent | 6978a214f1bfed1975c263f2053760694040bf4f (diff) | |
soc/intel/baytrail: Always handle MRC as ELF file
The current MRC binaries for Bay Trail are always ELF files. Always
adjust the position in CBFS using the ELF header regardless of file
names. Without adjusting the position, the system hangs right after
calling into MRC.
TEST: MRC position in CBFS does not change for bostentech/gbyt4.
Change-Id: I74e1246a5fac3f3649be9842ff13c2fc70f72a20
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57989
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/soc/intel/baytrail/Makefile.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc index 1fabd4f80f..5500da9e44 100644 --- a/src/soc/intel/baytrail/Makefile.inc +++ b/src/soc/intel/baytrail/Makefile.inc @@ -70,16 +70,19 @@ cpu_microcode_bins += 3rdparty/blobs/soc/intel/baytrail/microcode.bin \ CPPFLAGS_common += -Isrc/soc/intel/baytrail/include -# If an MRC file is an ELF file determine the entry address and first loadable +ifeq ($(CONFIG_HAVE_MRC),y) + +# Bay Trail MRC is an ELF file. Determine the entry address and first loadable # section offset in the file. Subtract the offset from the entry address to # determine the final location. mrcelfoffset = $(shell $(READELF_x86_32) -S -W $(CONFIG_MRC_FILE) | sed -e 's/\[ /[0/' | awk '$$3 ~ /PROGBITS/ { print "0x"$$5; exit }' ) mrcelfentry = $(shell $(READELF_x86_32) -h -W $(CONFIG_MRC_FILE) | grep 'Entry point address' | awk '{print $$NF }') # Add memory reference code blob. -cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin +cbfs-files-y += mrc.bin mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE)) -mrc.bin-position := $(if $(findstring elf,$(CONFIG_MRC_FILE)),$(shell printf "0x%x" $$(( $(mrcelfentry) - $(mrcelfoffset) )) ),$(CONFIG_MRC_BIN_ADDRESS)) +mrc.bin-position := $(shell printf "0x%x" $$(( $(mrcelfentry) - $(mrcelfoffset) )) ) mrc.bin-type := mrc endif +endif |