Patrick Georgi submitted this change.

View Change

sb/intel/common/firmware/Makefile.inc: use ifdtool --output flag

Use the ifdtool --output flag to modify coreboot.pre inplace, instead
of using the `mv` command to get the same result. In this way the stdout
will make more sense in the build context.

Change-Id: I6dacc8b39052801c770c02fa2aa1b526747ae496
Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39275
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
M src/southbridge/intel/common/firmware/Makefile.inc
1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/southbridge/intel/common/firmware/Makefile.inc b/src/southbridge/intel/common/firmware/Makefile.inc
index 5f3212f..2352636 100644
--- a/src/southbridge/intel/common/firmware/Makefile.inc
+++ b/src/southbridge/intel/common/firmware/Makefile.inc
@@ -55,8 +55,8 @@
 	$(objutil)/ifdtool/ifdtool \
 		$(IFDTOOL_USE_CHIPSET) \
 		-i ME:$(CONFIG_ME_BIN_PATH) \
+		-O $(obj)/coreboot.pre \
 		$(obj)/coreboot.pre
-	mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
 endif
 ifeq ($(CONFIG_CHECK_ME),y)
 	util/me_cleaner/me_cleaner.py -c $(obj)/coreboot.pre > /dev/null
@@ -72,36 +72,39 @@
 	$(objutil)/ifdtool/ifdtool \
 		$(IFDTOOL_USE_CHIPSET) \
 		-i GbE:$(CONFIG_GBE_BIN_PATH) \
+		-O $(obj)/coreboot.pre \
 		$(obj)/coreboot.pre
-	mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
 endif
 ifeq ($(CONFIG_HAVE_EC_BIN),y)
 	printf "    IFDTOOL    ec.bin -> coreboot.pre\n"
 	$(objutil)/ifdtool/ifdtool \
 		$(IFDTOOL_USE_CHIPSET) \
 		-i EC:$(CONFIG_EC_BIN_PATH) \
+		-O $(obj)/coreboot.pre \
 		$(obj)/coreboot.pre
-	mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
 endif
 
 ifeq ($(CONFIG_LOCK_MANAGEMENT_ENGINE),y)
 	printf "    IFDTOOL    Locking Management Engine\n"
 	$(objutil)/ifdtool/ifdtool \
-		$(IFDTOOL_USE_CHIPSET) -l $(obj)/coreboot.pre
-	mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
+		$(IFDTOOL_USE_CHIPSET) -l \
+		-O $(obj)/coreboot.pre \
+		$(obj)/coreboot.pre
 endif
 ifeq ($(CONFIG_UNLOCK_FLASH_REGIONS),y)
 	printf "    IFDTOOL    Unlocking Management Engine\n"
 	$(objutil)/ifdtool/ifdtool \
-	$(IFDTOOL_USE_CHIPSET) -u $(obj)/coreboot.pre
-	mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
+	$(IFDTOOL_USE_CHIPSET) -u \
+	-O $(obj)/coreboot.pre \
+	$(obj)/coreboot.pre
 endif
 
 ifeq ($(CONFIG_EM100),y)
 	printf "    IFDTOOL    Setting EM100 mode\n"
 	$(objutil)/ifdtool/ifdtool \
-		$(IFDTOOL_USE_CHIPSET) --em100 $(obj)/coreboot.pre
-	mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
+		$(IFDTOOL_USE_CHIPSET) --em100 \
+		-O $(obj)/coreboot.pre \
+		$(obj)/coreboot.pre
 endif
 
 warn_intel_firmware:

To view, visit change 39275. To unsubscribe, or for help writing mail filters, visit settings.