coreboot-gerrit July 2021

coreboot-gerrit@coreboot.org

1 participants
5824 discussions

Change in coreboot[master]: Makefile.inc: Drop the cbfs master header from non-X86
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Attention is currently required from: Martin Roth. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56120 ) Change subject: Makefile.inc: Drop the cbfs master header from non-X86 ...................................................................... Makefile.inc: Drop the cbfs master header from non-X86 The pointer to the header has a x86 top mmaped address even though the boot medium is not mapped that way. If no pointer is used to find the header FMAP is needed. If FMAP is used anyway there is no need for a cbfs master header. Change-Id: I6d693bdd4ddaf4c9b3cffb4ea9879c761200aca9 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M Makefile.inc M src/arch/x86/Makefile.inc 2 files changed, 7 insertions(+), 16 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/56120/1 diff --git a/Makefile.inc b/Makefile.inc index 3fedca3..340dc31 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1122,28 +1122,15 @@ $(eval INTERMEDIATE+=$(1)) $(eval PHONY+=$(1)) ifneq ($(CONFIG_UPDATE_IMAGE),y) -$(call add_intermediate, update_master_header, add_bootblock add_cbfs_ptr) - printf " CBFS Updating master header\n" - $(CBFSTOOL) $< add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS) - ifneq ($(CONFIG_ARCH_X86),y) -$(call add_intermediate, add_cbfs_ptr, add_bootblock) - printf "ptr_" > $@.tmp - $(CBFSTOOL) $< add \ - -f $@.tmp \ - -n "header pointer" \ - -t "cbfs header" \ - -b -4 \ - $(CBFSTOOL_ADD_CMD_OPTIONS) - rm $@.tmp - $(call add_intermediate, add_bootblock, $(objcbfs)/bootblock.bin) printf " FMAP BOOTBLOCK adding bootblock\n" $(CBFSTOOL) $< write -u \ -r BOOTBLOCK \ -f $(objcbfs)/bootblock.bin -else -$(call add_intermediate, add_cbfs_ptr, add_bootblock) + +# The master header is not used on non-X86 +$(call add_intermediate, update_master_header, add_bootblock) true endif # ARCH_X86 endif # UPDATE_IMAGE diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 54731ea..6f94511 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -86,6 +86,10 @@ bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c ifneq ($(CONFIG_UPDATE_IMAGE),y) +$(call add_intermediate, update_master_header, add_bootblock) + printf " CBFS Updating master header\n" + $(CBFSTOOL) $< add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS) + $(call add_intermediate, add_bootblock, $(objcbfs)/bootblock.bin) $(CBFSTOOL) $< add \ -f $(objcbfs)/bootblock.bin \ -- To view, visit https://review.coreboot.org/c/coreboot/+/56120 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6d693bdd4ddaf4c9b3cffb4ea9879c761200aca9 Gerrit-Change-Number: 56120 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: security/intel/cbnt/Makefile.inc: Improve build flow
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56119 ) Change subject: security/intel/cbnt/Makefile.inc: Improve build flow ...................................................................... security/intel/cbnt/Makefile.inc: Improve build flow Now that adding all files to cbfs is a distinct Makefile target in the buildprocess called "add_prebuild_files", it can be used to streamline setting up cbnt. Using 'files_added::' is not needed any longer. Change-Id: I22aa140202f0665b7095a01cb138af4986aa9ac3 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/security/intel/cbnt/Makefile.inc 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/56119/1 diff --git a/src/security/intel/cbnt/Makefile.inc b/src/security/intel/cbnt/Makefile.inc index cc18b20..7bbe612 100644 --- a/src/security/intel/cbnt/Makefile.inc +++ b/src/security/intel/cbnt/Makefile.inc @@ -47,11 +47,11 @@ ifeq ($(CONFIG_INTEL_CBNT_GENERATE_BPM),y) ifeq ($(CONFIG_INTEL_CBNT_CBNT_PROV_BPM_USE_CFG_FILE),y) -$(obj)/bpm_unsigned.bin: $(obj)/coreboot.rom $(CBNT_PROV) $(CBNT_CFG) +$(obj)/bpm_unsigned.bin: $(obj)/coreboot.pre $(CBNT_PROV) $(CBNT_CFG) add_prebuild_files printf " CBNT_PROV creating unsigned BPM using config file\n" $(CBNT_PROV) bpm-gen $@ $< --config=$(CBNT_CFG) --cut else -$(obj)/bpm_unsigned.bin: $(obj)/coreboot.rom $(CBNT_PROV) +$(obj)/bpm_unsigned.bin: $(obj)/coreboot.pre $(CBNT_PROV) add_prebuild_files printf " CBNT_PROV creating unsigned BPM\n" $(CBNT_PROV) bpm-gen $@ $< --revision=$(CONFIG_INTEL_CBNT_BPM_REVISION) \ --svn=$(CONFIG_INTEL_CBNT_BPM_SVN) \ @@ -86,11 +86,12 @@ $(CBNT_PROV) bpm-sign $< $@ $(CONFIG_INTEL_CBNT_BPM_PRIV_KEY_FILE) "" # Add BPM at the end of the build when all files have been added -files_added:: $(obj)/bpm.bin +$(call add_intermediate, add_bpm, $(obj)/bpm.bin) printf " CBNT Adding BPM\n" - $(CBFSTOOL) $(obj)/coreboot.rom add -f $< -n boot_policy_manifest.bin -a 0x10 -t raw + $(CBFSTOOL) $< add -f $(obj)/bpm.bin -n boot_policy_manifest.bin -a 0x10 -t raw +$(call add_intermediate, fit_bpm, add_bpm) printf " IFITTOOL Adding BPM\n" - $(IFITTOOL) -r COREBOOT -a -n boot_policy_manifest.bin -t 12 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $(obj)/coreboot.rom + $(IFITTOOL) -r COREBOOT -a -n boot_policy_manifest.bin -t 12 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $< endif # CONFIG_INTEL_CBNT_BPM_ONLY_UNSIGNED -- To view, visit https://review.coreboot.org/c/coreboot/+/56119 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I22aa140202f0665b7095a01cb138af4986aa9ac3 Gerrit-Change-Number: 56119 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: soc/intel/common/block/fast_spi/Makefile.inc: Improve cosmetics
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Attention is currently required from: Patrick Rudolph. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56118 ) Change subject: soc/intel/common/block/fast_spi/Makefile.inc: Improve cosmetics ...................................................................... soc/intel/common/block/fast_spi/Makefile.inc: Improve cosmetics Change-Id: I41bbdabf7b846386651e64f4afb5b7b9fb38e1cb Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/soc/intel/common/block/fast_spi/Makefile.inc 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/56118/1 diff --git a/src/soc/intel/common/block/fast_spi/Makefile.inc b/src/soc/intel/common/block/fast_spi/Makefile.inc index 4fe6163..623afa8 100644 --- a/src/soc/intel/common/block/fast_spi/Makefile.inc +++ b/src/soc/intel/common/block/fast_spi/Makefile.inc @@ -41,8 +41,7 @@ # region within the SPI flash crosses this boundary, then the check complains # and exits. -$(call add_intermediate, check-fmap-16mib-crossing) -check-fmap-16mib-crossing: $(obj)/fmap_config.h +$(call add_intermediate, check-fmap-16mib-crossing, $(obj)/fmap_config.h) fmap_get() { awk "/$$1/ { print \$$NF }" < $<; }; \ \ flash_offset=$$(fmap_get FMAP_SECTION_FLASH_START); \ -- To view, visit https://review.coreboot.org/c/coreboot/+/56118 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I41bbdabf7b846386651e64f4afb5b7b9fb38e1cb Gerrit-Change-Number: 56118 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: ec/hp/kbc1126/Makefile.inc: Update add_intermediate deps
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56116 ) Change subject: ec/hp/kbc1126/Makefile.inc: Update add_intermediate deps ...................................................................... ec/hp/kbc1126/Makefile.inc: Update add_intermediate deps Change-Id: Ie6ecfdc2c208063f0b3382119523416fd1aae3ef Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/ec/hp/kbc1126/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/56116/1 diff --git a/src/ec/hp/kbc1126/Makefile.inc b/src/ec/hp/kbc1126/Makefile.inc index 4d7d46d..6980828 100644 --- a/src/ec/hp/kbc1126/Makefile.inc +++ b/src/ec/hp/kbc1126/Makefile.inc @@ -16,7 +16,7 @@ ecfw2.bin-type := raw endif -$(call add_intermediate, kbc1126_ec_insert) +$(call add_intermediate, kbc1126_ec_insert, add_prebuild_files) ifeq ($(CONFIG_KBC1126_FIRMWARE),y) printf " Building kbc1126_ec_insert.\n" $(MAKE) -C util/kbc1126 -- To view, visit https://review.coreboot.org/c/coreboot/+/56116 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie6ecfdc2c208063f0b3382119523416fd1aae3ef Gerrit-Change-Number: 56116 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: soc/amd/*/Makefile.inc: Do some cosmetics
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Attention is currently required from: Jason Glenesk, Marshall Dawson, Felix Held. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56117 ) Change subject: soc/amd/*/Makefile.inc: Do some cosmetics ...................................................................... soc/amd/*/Makefile.inc: Do some cosmetics The first target for the add_intermediate targets is always $(obj)/coreboot.pre. Change-Id: Iea2322ca1abd43900f3631b7965f07fed4235ca0 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/mainboard/amd/majolica/Makefile.inc M src/mainboard/amd/mandolin/Makefile.inc M src/soc/amd/stoneyridge/Makefile.inc M src/southbridge/amd/pi/hudson/Makefile.inc 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/56117/1 diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc index 23e9dd1..6779b92 100644 --- a/src/mainboard/amd/majolica/Makefile.inc +++ b/src/mainboard/amd/majolica/Makefile.inc @@ -12,7 +12,7 @@ ifeq ($(CONFIG_MAJOLICA_HAVE_MCHP_FW),y) $(call add_intermediate, add_mchp_fw) - $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_MAJOLICA_MCHP_FW_FILE) --fill-upward + $(CBFSTOOL) $< write -r EC -f $(CONFIG_MAJOLICA_MCHP_FW_FILE) --fill-upward else files_added:: warn_no_mchp endif # CONFIG_MAJOLICA_HAVE_MCHP_FW diff --git a/src/mainboard/amd/mandolin/Makefile.inc b/src/mainboard/amd/mandolin/Makefile.inc index d9effce..1a4740e 100644 --- a/src/mainboard/amd/mandolin/Makefile.inc +++ b/src/mainboard/amd/mandolin/Makefile.inc @@ -19,7 +19,7 @@ ifeq ($(CONFIG_MANDOLIN_HAVE_MCHP_FW),y) $(call add_intermediate, add_mchp_fw) - $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_MANDOLIN_MCHP_FW_FILE) --fill-upward + $(CBFSTOOL) $< write -r EC -f $(CONFIG_MANDOLIN_MCHP_FW_FILE) --fill-upward else files_added:: warn_no_mchp diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index c3ca69d..3b552e9 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -168,7 +168,7 @@ printf " DD Adding AMD Firmware at ROM offset 0x%x\n" \ "$(STONEYRIDGE_FWM_ROM_POSITION)" dd if=$(obj)/amdfw.rom \ - of=$(obj)/coreboot.pre conv=notrunc bs=1 \ + of=$< conv=notrunc bs=1 \ seek=$(STONEYRIDGE_FWM_ROM_POSITION) >/dev/null 2>&1 else # ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y) diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index fe78723..7994a6a 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -160,7 +160,7 @@ $(call add_intermediate, add_amdfw, $(obj)/amdfw.rom) printf " DD Adding AMD Firmware\n" dd if=$(obj)/amdfw.rom \ - of=$(obj)/coreboot.pre conv=notrunc bs=1 seek=131072 >/dev/null 2>&1 + of=$< conv=notrunc bs=1 seek=131072 >/dev/null 2>&1 else # ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y) -- To view, visit https://review.coreboot.org/c/coreboot/+/56117 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iea2322ca1abd43900f3631b7965f07fed4235ca0 Gerrit-Change-Number: 56117 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: cpu/intel/fit/Makefile.inc: Update add_intermediate deps
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Attention is currently required from: Patrick Rudolph. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56115 ) Change subject: cpu/intel/fit/Makefile.inc: Update add_intermediate deps ...................................................................... cpu/intel/fit/Makefile.inc: Update add_intermediate deps Change-Id: I590c8c2ec6b2e318426d59e717b65104d9379942 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/cpu/intel/fit/Makefile.inc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/56115/1 diff --git a/src/cpu/intel/fit/Makefile.inc b/src/cpu/intel/fit/Makefile.inc index b4926ba..0567542 100644 --- a/src/cpu/intel/fit/Makefile.inc +++ b/src/cpu/intel/fit/Makefile.inc @@ -11,7 +11,7 @@ intel_fit-type := raw intel_fit-align := 16 -$(call add_intermediate, set_fit_ptr, $(IFITTOOL)) +$(call add_intermediate, set_fit_ptr, $(IFITTOOL) add_prebuild_files) @printf " UPDATE-FIT set FIT pointer to table\n" $(IFITTOOL) -f $< -F -n intel_fit -r COREBOOT @@ -28,7 +28,7 @@ # Second FIT in TOP_SWAP bootblock ifeq ($(CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK),y) -$(call add_intermediate, set_ts_fit_ptr, $(IFITTOOL)) +$(call add_intermediate, set_ts_fit_ptr, $(IFITTOOL) add_prebuild_files) @printf " UPDATE-FIT Top Swap: set FIT pointer to table\n" $(IFITTOOL) -f $< -F -n intel_fit_ts -r COREBOOT $(TS_OPTIONS) -- To view, visit https://review.coreboot.org/c/coreboot/+/56115 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I590c8c2ec6b2e318426d59e717b65104d9379942 Gerrit-Change-Number: 56115 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: Makefile.inc: Split of image generation in multiple targets
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Attention is currently required from: Martin Roth. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56114 ) Change subject: Makefile.inc: Split of image generation in multiple targets ...................................................................... Makefile.inc: Split of image generation in multiple targets The big '$(obj)/coreboot.pre' target did a lot of things and made the build process inflexible. Split of much of the functionality in INTERMEDIATE targets that can have proper dependencies. Change-Id: If36aee0bd2f75f3941b3bc424a7ec6c775eb1353 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M Makefile.inc M src/arch/x86/Makefile.inc 2 files changed, 46 insertions(+), 29 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/56114/1 diff --git a/Makefile.inc b/Makefile.inc index 66af076..3fedca3 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -830,7 +830,7 @@ # add commands with any additional arguments for cbfstool. # Example: --ext-win-base <base> --ext-win-size <size> define cbfs-add-cmd-for-region - $(CBFSTOOL) $@.tmp \ + $(CBFSTOOL) $(obj)/coreboot.pre \ add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if \ $(filter payload,$(call extract_nth,3,$(1))),-payload)$(if \ $(filter flat-binary,$(call extract_nth,3,$(1))),-flat-binary) \ @@ -857,7 +857,7 @@ # non-empty if file removal requested) define cbfs-add-cmd printf " CBFS $(call extract_nth,2,$(1))\n" - $(if $(3),-$(CBFSTOOL) $@.tmp remove -n $(call extract_nth,2,$(file)) 2>/dev/null) + $(if $(3),-$(CBFSTOOL) $(obj)/coreboot.pre remove -n $(call extract_nth,2,$(1)) 2>/dev/null) $(call cbfs-add-cmd-for-region,$(1),$(2)) endef @@ -1090,34 +1090,10 @@ endif ifneq ($(CONFIG_UPDATE_IMAGE),y) +# Add all cbfs files and bootblock as deps to make sure the cbfs image gets rebuild $(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $(obj)/fmap.fmap $(obj)/fmap.desc + @printf " CBFS Creating new image\n" $(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap -r $(shell cat $(obj)/fmap.desc) -ifeq ($(CONFIG_ARCH_X86),y) - $(CBFSTOOL) $@.tmp add \ - -f $(objcbfs)/bootblock.bin \ - -n bootblock \ - -t bootblock \ - $(TXTIBB) \ - -b -$(call file-size,$(objcbfs)/bootblock.bin) $(cbfs-autogen-attributes) \ - $(TS_OPTIONS) \ - $(CBFSTOOL_ADD_CMD_OPTIONS) -else # ifeq ($(CONFIG_ARCH_X86),y) - $(CBFSTOOL) $@.tmp write -u \ - -r BOOTBLOCK \ - -f $(objcbfs)/bootblock.bin - # make space for the CBFS master header pointer. "ptr_" is just - # arbitrary 4 bytes that will be overwritten by add-master-header. - printf "ptr_" > $@.tmp.2 - $(CBFSTOOL) $@.tmp add \ - -f $@.tmp.2 \ - -n "header pointer" \ - -t "cbfs header" \ - -b -4 \ - $(CBFSTOOL_ADD_CMD_OPTIONS) - rm -f $@.tmp.2 -endif # ifeq ($(CONFIG_ARCH_X86),y) - $(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS) - $(prebuild-files) true mv $@.tmp $@ else # ifneq ($(CONFIG_UPDATE_IMAGE),y) .PHONY: $(obj)/coreboot.pre @@ -1126,7 +1102,6 @@ (echo "Error: You have UPDATE_IMAGE set in Kconfig, but have no existing image to update." && \ echo "Exiting." && \ false) - $(prebuild-files) true mv $@.tmp $@ endif # ifneq ($(CONFIG_UPDATE_IMAGE),y) @@ -1146,6 +1121,36 @@ $(1): $(obj)/coreboot.pre $(2) \ $(eval INTERMEDIATE+=$(1)) $(eval PHONY+=$(1)) +ifneq ($(CONFIG_UPDATE_IMAGE),y) +$(call add_intermediate, update_master_header, add_bootblock add_cbfs_ptr) + printf " CBFS Updating master header\n" + $(CBFSTOOL) $< add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS) + +ifneq ($(CONFIG_ARCH_X86),y) +$(call add_intermediate, add_cbfs_ptr, add_bootblock) + printf "ptr_" > $@.tmp + $(CBFSTOOL) $< add \ + -f $@.tmp \ + -n "header pointer" \ + -t "cbfs header" \ + -b -4 \ + $(CBFSTOOL_ADD_CMD_OPTIONS) + rm $@.tmp + +$(call add_intermediate, add_bootblock, $(objcbfs)/bootblock.bin) + printf " FMAP BOOTBLOCK adding bootblock\n" + $(CBFSTOOL) $< write -u \ + -r BOOTBLOCK \ + -f $(objcbfs)/bootblock.bin +else +$(call add_intermediate, add_cbfs_ptr, add_bootblock) + true +endif # ARCH_X86 +endif # UPDATE_IMAGE + +$(call add_intermediate, add_prebuild_files, $$(prebuilt-files) update_master_header) + $(prebuild-files) true + $(obj)/coreboot.rom: $(obj)/coreboot.pre $(CBFSTOOL) $$(INTERMEDIATE) @printf " CBFS $(subst $(obj)/,,$(@))\n" # The full ROM may be larger than the CBFS part, so create an empty diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 3949e3a..54731ea 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -85,6 +85,18 @@ bootblock-y += id.S bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c +ifneq ($(CONFIG_UPDATE_IMAGE),y) +$(call add_intermediate, add_bootblock, $(objcbfs)/bootblock.bin) + $(CBFSTOOL) $< add \ + -f $(objcbfs)/bootblock.bin \ + -n bootblock \ + -t bootblock \ + $(TXTIBB) \ + -b -$(call file-size,$(objcbfs)/bootblock.bin) $(cbfs-autogen-attributes) \ + $(TS_OPTIONS) \ + $(CBFSTOOL_ADD_CMD_OPTIONS) +endif + $(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32),y) -- To view, visit https://review.coreboot.org/c/coreboot/+/56114 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If36aee0bd2f75f3941b3bc424a7ec6c775eb1353 Gerrit-Change-Number: 56114 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: Makefile.inc: Remove the $(INTERMEDIATE) dependency
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Attention is currently required from: Martin Roth. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56113 ) Change subject: Makefile.inc: Remove the $(INTERMEDIATE) dependency ...................................................................... Makefile.inc: Remove the $(INTERMEDIATE) dependency This makes it possible to have interdependencies between targets added with add_intermediate. Change-Id: I5e8d84c32f242ff3309ced3a1b5f3dc4565d3387 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/56113/1 diff --git a/Makefile.inc b/Makefile.inc index 9abcfbe..66af076 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1143,7 +1143,7 @@ endif add_intermediate = \ - $(1): $(obj)/coreboot.pre $(2) | $(INTERMEDIATE) \ + $(1): $(obj)/coreboot.pre $(2) \ $(eval INTERMEDIATE+=$(1)) $(eval PHONY+=$(1)) $(obj)/coreboot.rom: $(obj)/coreboot.pre $(CBFSTOOL) $$(INTERMEDIATE) -- To view, visit https://review.coreboot.org/c/coreboot/+/56113 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5e8d84c32f242ff3309ced3a1b5f3dc4565d3387 Gerrit-Change-Number: 56113 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: Makefile.inc: Remove unused IFITTOOL dependency
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Attention is currently required from: Martin Roth. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56112 ) Change subject: Makefile.inc: Remove unused IFITTOOL dependency ...................................................................... Makefile.inc: Remove unused IFITTOOL dependency Updating FIT is now done somewhere else. Change-Id: I88c9fc19cca0c72e80d3218dbcc76b89b04feacf Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/56112/1 diff --git a/Makefile.inc b/Makefile.inc index 96374a9..9abcfbe 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1090,7 +1090,7 @@ endif ifneq ($(CONFIG_UPDATE_IMAGE),y) -$(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $(IFITTOOL) $$(cpu_ucode_cbfs_file) $(obj)/fmap.fmap $(obj)/fmap.desc +$(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $(obj)/fmap.fmap $(obj)/fmap.desc $(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap -r $(shell cat $(obj)/fmap.desc) ifeq ($(CONFIG_ARCH_X86),y) $(CBFSTOOL) $@.tmp add \ -- To view, visit https://review.coreboot.org/c/coreboot/+/56112 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I88c9fc19cca0c72e80d3218dbcc76b89b04feacf Gerrit-Change-Number: 56112 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: Makefile.inc: Remove explicit ramstage dependency for coreboot.rom
by Arthur Heymans (Code Review) 06 Jul '21

06 Jul '21

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56111 ) Change subject: Makefile.inc: Remove explicit ramstage dependency for coreboot.rom ...................................................................... Makefile.inc: Remove explicit ramstage dependency for coreboot.rom This is already handled in $(prebuild-files). Change-Id: I648f97198772d30d6d267ab9d6f7fa8d1d5d0e91 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/56111/1 diff --git a/Makefile.inc b/Makefile.inc index eb505e5..96374a9 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1146,7 +1146,7 @@ $(1): $(obj)/coreboot.pre $(2) | $(INTERMEDIATE) \ $(eval INTERMEDIATE+=$(1)) $(eval PHONY+=$(1)) -$(obj)/coreboot.rom: $(obj)/coreboot.pre $(RAMSTAGE) $(CBFSTOOL) $$(INTERMEDIATE) +$(obj)/coreboot.rom: $(obj)/coreboot.pre $(CBFSTOOL) $$(INTERMEDIATE) @printf " CBFS $(subst $(obj)/,,$(@))\n" # The full ROM may be larger than the CBFS part, so create an empty # file (filled with \377 = 0xff) and copy the CBFS image over it. -- To view, visit https://review.coreboot.org/c/coreboot/+/56111 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I648f97198772d30d6d267ab9d6f7fa8d1d5d0e91 Gerrit-Change-Number: 56111 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2021