From 8ceef408e739a2e6745850fb048a98e07c8d6351 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 6 Jul 2021 16:20:09 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56117 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel Reviewed-by: Martin L Roth --- src/mainboard/amd/majolica/Makefile.inc | 2 +- src/mainboard/amd/mandolin/Makefile.inc | 2 +- src/soc/amd/stoneyridge/Makefile.inc | 2 +- src/southbridge/amd/pi/hudson/Makefile.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc index 59bc3cf0dd..dbd3a22442 100644 --- a/src/mainboard/amd/majolica/Makefile.inc +++ b/src/mainboard/amd/majolica/Makefile.inc @@ -13,7 +13,7 @@ APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_DefaultRecovery.bin 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 d9effcef81..1a4740e6c3 100644 --- a/src/mainboard/amd/mandolin/Makefile.inc +++ b/src/mainboard/amd/mandolin/Makefile.inc @@ -19,7 +19,7 @@ endif 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 b2ac43f40b..b6bf4c25b8 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -171,7 +171,7 @@ $(call add_intermediate, add_amdfw, $(obj)/amdfw.rom) 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 9309455c4b..633df04a69 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -157,7 +157,7 @@ ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y) $(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)