From 135bc3652ed7cfd86b5594e6d86b5aa3e7a537c0 Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Tue, 23 Jul 2019 16:58:53 -0600 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/34552 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/cavium/cn8100_sff_evb/Makefile.inc | 6 +++--- src/mainboard/sifive/hifive-unleashed/Makefile.inc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc b/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc index be35511cff..72736255f8 100644 --- a/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc +++ b/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc @@ -29,10 +29,10 @@ verstage-y += memlayout.ld 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 263297eb74..207898e973 100644 --- a/src/mainboard/sifive/hifive-unleashed/Makefile.inc +++ b/src/mainboard/sifive/hifive-unleashed/Makefile.inc @@ -20,7 +20,7 @@ ramstage-y += memlayout.ld 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)