summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Żygowski <michal.zygowski@3mdeb.com>2020-09-24 15:09:40 +0200
committerFelix Held <felix-coreboot@felixheld.de>2024-09-06 13:27:18 +0000
commit6c8b0e430f257a0a074500b97f8ff10e2410b3ab (patch)
tree2e911b4918971b24e229eb581c64b8d18b351028
parent19922cb366fb74d4a229b1414a3a8a93365ee14b (diff)
Makefile.mk: compile ECC tools and inject ECC to final image
$ build/cbfstool build/coreboot.rom print FMAP REGION: COREBOOT Name Offset Type Size Comp cbfs_master_header 0x0 cbfs header 32 none fallback/romstage 0x80 stage 18495 LZ4 (30096 decompressed) fallback/ramstage 0x4940 stage 24288 LZMA (61240 decompressed) config 0xa880 raw 1324 LZMA (3308 decompressed) revision 0xae00 raw 726 none build_info 0xb100 raw 122 none (empty) 0xb1c0 null 347108 none header_pointer 0x5fdc0 cbfs header 4 none Change-Id: I8541aa6f1429ed6143830ed11c47c150183ddf0d Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com> Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/67064 Reviewed-by: Paul Menzel <paulepanter@mailbox.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
-rw-r--r--Makefile.mk11
-rw-r--r--src/soc/ibm/power9/Makefile.mk5
2 files changed, 14 insertions, 2 deletions
diff --git a/Makefile.mk b/Makefile.mk
index e7a9ab1bb8..2b67947a43 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -636,7 +636,7 @@ endif
additional-dirs += $(objutil)/cbfstool $(objutil)/ifdtool \
$(objutil)/options $(objutil)/amdfwtool \
- $(objutil)/cbootimage
+ $(objutil)/cbootimage $(objutil)/ffs
export $(COREBOOT_EXPORTS)
@@ -678,6 +678,7 @@ IFITTOOL:=$(objutil)/cbfstool/ifittool
AMDCOMPRESS:=$(objutil)/cbfstool/amdcompress
CSE_FPT:=$(objutil)/cbfstool/cse_fpt
CSE_SERGER:=$(objutil)/cbfstool/cse_serger
+ECCTOOL:=$(objutil)/ffs/ecc/ecc
$(obj)/cbfstool: $(CBFSTOOL)
cp $< $@
@@ -719,6 +720,12 @@ IFDTOOL:=$(objutil)/ifdtool/ifdtool
AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool
AMDFWREAD:=$(objutil)/amdfwtool/amdfwread
+$(ECCTOOL):
+ @printf " Compile ECCTOOL\n"
+ cp -r $(top)/3rdparty/ffs $(objutil)
+ cd $(objutil)/ffs && autoreconf -i && ./configure
+ $(MAKE) -C $(objutil)/ffs
+
APCB_EDIT_TOOL:=$(top)/util/apcb/apcb_edit.py
APCB_V3_EDIT_TOOL:=$(top)/util/apcb/apcb_v3_edit.py
@@ -829,7 +836,7 @@ install-git-commit-clangfmt:
include util/crossgcc/Makefile.mk
.PHONY: tools
-tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo $(CSE_FPT) $(CSE_SERGER) $(AMDFWREAD)
+tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo $(CSE_FPT) $(CSE_SERGER) $(AMDFWREAD) $(ECCTOOL)
###########################################################################
# Common recipes for all stages
diff --git a/src/soc/ibm/power9/Makefile.mk b/src/soc/ibm/power9/Makefile.mk
index 84a40f9a34..f0ce2ead0e 100644
--- a/src/soc/ibm/power9/Makefile.mk
+++ b/src/soc/ibm/power9/Makefile.mk
@@ -14,4 +14,9 @@ ramstage-y += chip.c
ramstage-y += rom_media.c
ramstage-y += timer.c
+files_added:: $(obj)/coreboot.rom.ecc
+
+$(obj)/coreboot.rom.ecc: $(obj)/coreboot.rom | $(ECCTOOL)
+ $(ECCTOOL) --inject $< --output $@ --p8
+
endif