Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34552 )
Change subject: src/mainboard/{cavium,sifive}: Use $(obj) instead of build ......................................................................
src/mainboard/{cavium,sifive}: Use $(obj) instead of build
The build directory might not exist in the src dir.
BUG=b:112267918 TEST=make what-jenkins-does
Change-Id: I2d4fa6cc455592f92070796cd065cd66646d5ba9 Signed-off-by: Raul E Rangel rrangel@chromium.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/34552 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Georgi pgeorgi@google.com --- M src/mainboard/cavium/cn8100_sff_evb/Makefile.inc M src/mainboard/sifive/hifive-unleashed/Makefile.inc 2 files changed, 4 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc b/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc index be35511..7273625 100644 --- a/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc +++ b/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc @@ -29,10 +29,10 @@ MB_DIR = src/mainboard/$(MAINBOARDDIR)
LINUX_DTB = sff8104-linux.dtb -build/$(LINUX_DTB): +$(obj)/$(LINUX_DTB): # FIXME: why isn't this producing the correct size DTB? - dtc -p 4096 -I dts -O dtb -o build/$(LINUX_DTB) -i $(MB_DIR) $(MB_DIR)/$(patsubst %.dtb,%.dts,$(LINUX_DTB)) + dtc -p 4096 -I dts -O dtb -o $(obj)/$(LINUX_DTB) -i $(MB_DIR) $(MB_DIR)/$(patsubst %.dtb,%.dts,$(LINUX_DTB))
cbfs-files-y += $(LINUX_DTB) -$(LINUX_DTB)-file := build/$(LINUX_DTB) +$(LINUX_DTB)-file := $(obj)/$(LINUX_DTB) $(LINUX_DTB)-type := raw diff --git a/src/mainboard/sifive/hifive-unleashed/Makefile.inc b/src/mainboard/sifive/hifive-unleashed/Makefile.inc index 263297e..207898e 100644 --- a/src/mainboard/sifive/hifive-unleashed/Makefile.inc +++ b/src/mainboard/sifive/hifive-unleashed/Makefile.inc @@ -20,7 +20,7 @@ ramstage-y += fixup_fdt.c
-DTB=build/hifive-unleashed.dtb +DTB=$(obj)/hifive-unleashed.dtb DTS=src/mainboard/sifive/hifive-unleashed/hifive-unleashed.dts $(DTB): $(DTS) dtc -I dts -O dtb -o $(DTB) $(DTS)