exynos: Install the BL1 and set the checksum in the Makefile.
Install the BL1 and set up the checksum in the Makefile instead of relying on post processing. Import the exynos checksum script, split it in two and simplify it significantly. Stop putting the CBFS header in the midst of the bootblock so that it can be checksummed before CBFS is put together. Stop saving space for it and leaving an anchor in the bootblock which nobody looks for. Change-Id: Icbb5a5914ece60b2827433b6dc29d80db996ea6c Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://chromium-review.googlesource.com/179229 Reviewed-by: Ronald Minnich <rminnich@chromium.org> Commit-Queue: Gabe Black <gabeblack@chromium.org> Tested-by: Gabe Black <gabeblack@chromium.org> (cherry picked from commit aa3a416705517c0a6ddfdeb19905ac8cafb33df1) Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6834 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
committed by
Isaac Christensen
parent
063c410a54
commit
b6b1077eec
@@ -31,17 +31,7 @@
|
||||
|
||||
.section ".start", "a", %progbits
|
||||
.globl _start
|
||||
_start: b reset
|
||||
.balignl 16,0xdeadbeef
|
||||
|
||||
_cbfs_master_header:
|
||||
/* The CBFS master header is inserted by cbfstool at the first
|
||||
* aligned offset after the above anchor string is found.
|
||||
* Hence, we leave some space for it.
|
||||
*/
|
||||
.skip 128 @ Assumes 64-byte alignment
|
||||
|
||||
reset:
|
||||
_start:
|
||||
/*
|
||||
* Set the cpu to System mode with IRQ and FIQ disabled. Prefetch/Data
|
||||
* aborts may happen early and crash before the abort handlers are
|
||||
|
@@ -15,21 +15,22 @@ if CPU_SAMSUNG_EXYNOS5250
|
||||
#
|
||||
# 0x0000: vendor-provided BL1 (8k).
|
||||
# 0x2000: bootblock
|
||||
# 0x2010-0x2090: reserved for CBFS master header.
|
||||
# 0xA000: Free for CBFS data.
|
||||
# 0x9FFC-0xA000: BL2 checksum
|
||||
# 0xA000-0xA080: reserved for CBFS master header.
|
||||
# 0xA080: Free for CBFS data.
|
||||
|
||||
config BOOTBLOCK_ROM_OFFSET
|
||||
hex
|
||||
default 0x2000
|
||||
default 0
|
||||
|
||||
config CBFS_HEADER_ROM_OFFSET
|
||||
hex "offset of master CBFS header in ROM"
|
||||
default 0x2010
|
||||
default 0x9F80
|
||||
|
||||
config CBFS_ROM_OFFSET
|
||||
# Calculated by BOOTBLOCK_ROM_OFFSET + max bootblock size.
|
||||
hex "offset of CBFS data in ROM"
|
||||
default 0x0A000
|
||||
default 0x0A080
|
||||
|
||||
config SYS_SDRAM_BASE
|
||||
hex
|
||||
|
@@ -50,13 +50,10 @@ ramstage-y += fb.c
|
||||
ramstage-y += usb.c
|
||||
ramstage-y += cbmem.c
|
||||
|
||||
# Run an intermediate step when producing coreboot.rom
|
||||
# that adds additional components to the final firmware
|
||||
# image outside of CBFS
|
||||
.PHONY: exynos5250_add_bl1
|
||||
$(obj)/coreboot.rom: exynos5250_add_bl1
|
||||
exynos5250_add_bl1: $(obj)/coreboot.pre
|
||||
printf " DD Adding Samsung Exynos5250 BL1\n"
|
||||
# TODO(hungte) Change this 'cpu' to soc when build scripts are changed.
|
||||
dd if=3rdparty/cpu/samsung/exynos5250/bl1.bin \
|
||||
of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
|
||||
$(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
|
||||
cp $< $@
|
||||
|
||||
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin
|
||||
@printf " BL1, CKSUM $(subst $(obj)/,,$(@))\n"
|
||||
util/exynos/fixed_cksum.py $< $<.cksum 32768
|
||||
cat 3rdparty/cpu/samsung/exynos5250/bl1.bin $<.cksum > $@
|
||||
|
@@ -17,16 +17,16 @@ if CPU_SAMSUNG_EXYNOS5420
|
||||
# 0x0000: vendor-provided BL1 (8k).
|
||||
# 0x2000: variable length bootblock checksum header
|
||||
# 0x2010: bootblock
|
||||
# 0x2020-0x20A0: reserved for CBFS master header.
|
||||
# 0x9F80-0xA000: reserved for CBFS master header.
|
||||
# 0xA000: Free for CBFS data.
|
||||
|
||||
config BOOTBLOCK_ROM_OFFSET
|
||||
hex
|
||||
default 0x2010
|
||||
default 0
|
||||
|
||||
config CBFS_HEADER_ROM_OFFSET
|
||||
hex "offset of master CBFS header in ROM"
|
||||
default 0x2020
|
||||
default 0x9F80
|
||||
|
||||
config CBFS_ROM_OFFSET
|
||||
# Calculated by BOOTBLOCK_ROM_OFFSET + max bootblock size.
|
||||
|
@@ -50,13 +50,10 @@ ramstage-y += dp.c dp_lowlevel.c fimd.c
|
||||
ramstage-y += usb.c
|
||||
ramstage-y += cbmem.c
|
||||
|
||||
# Run an intermediate step when producing coreboot.rom
|
||||
# that adds additional components to the final firmware
|
||||
# image outside of CBFS
|
||||
.PHONY: exynos5420_add_bl1
|
||||
$(obj)/coreboot.rom: exynos5420_add_bl1
|
||||
exynos5420_add_bl1: $(obj)/coreboot.pre
|
||||
printf " DD Adding Samsung Exynos5420 BL1\n"
|
||||
# TODO(hungte) Change this 'cpu' to soc when build scripts are changed.
|
||||
dd if=3rdparty/cpu/samsung/exynos5420/bl1.bin \
|
||||
of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
|
||||
$(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
|
||||
cp $< $@
|
||||
|
||||
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin
|
||||
@printf " BL1, CKSUM $(subst $(obj)/,,$(@))\n"
|
||||
util/exynos/variable_cksum.py $< $<.cksum
|
||||
cat 3rdparty/cpu/samsung/exynos5420/bl1.bin $<.cksum > $@
|
||||
|
Reference in New Issue
Block a user