GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.inc: Use `additional-dirs` for $(objcbfs), $(objgenerated) 

We use `additional-dirs` for a single `mkdir -p` invocation for all
directiories. I don't see why these two, $(objcbfs) and $(objgenerated),
should be an exception.

Fixes clean builds for targets that don't include the phony `coreboot`
target, e.g. `make qemu`.

Change-Id: I85abaa74cddefd2bd669e2b5c8934352775070fe
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51318
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Nico Huber 2021-03-06 13:12:34 +01:00
parent 84ec70312e
commit 10a879e65b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,6 +13,8 @@ objutil ?= $(obj)/util
objk := $(objutil)/kconfig objk := $(objutil)/kconfig
absobj := $(abspath $(obj)) absobj := $(abspath $(obj))
additional-dirs :=
VBOOT_HOST_BUILD ?= $(abspath $(objutil)/vboot_lib) VBOOT_HOST_BUILD ?= $(abspath $(objutil)/vboot_lib)
COREBOOT_EXPORTS := COREBOOT_EXPORTS COREBOOT_EXPORTS := COREBOOT_EXPORTS

13
Makefile.inc
View File

@ -42,6 +42,7 @@ COREBOOT_EXPORTS += MAINBOARDDIR VARIANT_DIR CARRIER_DIR
## rom image file, are placed under $(objcbfs). ## rom image file, are placed under $(objcbfs).
## These typically have suffixes .debug .elf .bin and .map ## These typically have suffixes .debug .elf .bin and .map
objcbfs := $(obj)/cbfs/$(CONFIG_CBFS_PREFIX) objcbfs := $(obj)/cbfs/$(CONFIG_CBFS_PREFIX)
additional-dirs += $(objcbfs)
COREBOOT_EXPORTS += objcbfs COREBOOT_EXPORTS += objcbfs
## Based on the active configuration, Makefile conditionally collects ## Based on the active configuration, Makefile conditionally collects
@ -49,6 +50,7 @@ COREBOOT_EXPORTS += objcbfs
## Such files that do not have a clear one-to-one relation to a source ## Such files that do not have a clear one-to-one relation to a source
## file under src/ are placed and built under $(objgenerated) ## file under src/ are placed and built under $(objgenerated)
objgenerated := $(obj)/generated objgenerated := $(obj)/generated
additional-dirs += $(objgenerated)
COREBOOT_EXPORTS += objgenerated COREBOOT_EXPORTS += objgenerated
## CCACHE_EXTRAFILES can be set by individual rules to help CCACHE ## CCACHE_EXTRAFILES can be set by individual rules to help CCACHE
@ -58,7 +60,7 @@ COREBOOT_EXPORTS += CCACHE_EXTRAFILES
####################################################################### #######################################################################
# root rule to resolve if in build mode (ie. configuration exists) # root rule to resolve if in build mode (ie. configuration exists)
real-target: $(obj)/config.h coreboot files_added real-target: $(obj)/config.h coreboot files_added
coreboot: build-dirs $(obj)/coreboot.rom $(obj)/cbfstool $(obj)/rmodtool $(obj)/ifwitool coreboot: $(obj)/coreboot.rom $(obj)/cbfstool $(obj)/rmodtool $(obj)/ifwitool
# This target can be used in site local to run scripts or additional # This target can be used in site local to run scripts or additional
# targets after the build completes by creating a Makefile.inc in the # targets after the build completes by creating a Makefile.inc in the
@ -73,7 +75,7 @@ files_added:: build_complete
####################################################################### #######################################################################
# our phony targets # our phony targets
PHONY+= clean-abuild coreboot check-style build-dirs build_complete PHONY+= clean-abuild coreboot check-style build_complete
####################################################################### #######################################################################
# root source directories of coreboot # root source directories of coreboot
@ -508,7 +510,7 @@ ifeq ($(CONFIG_DEBUG_ADA_CODE),y)
ADAFLAGS_common += -gnata ADAFLAGS_common += -gnata
endif endif
additional-dirs := $(objutil)/cbfstool $(objutil)/ifdtool \ additional-dirs += $(objutil)/cbfstool $(objutil)/ifdtool \
$(objutil)/options $(objutil)/amdfwtool \ $(objutil)/options $(objutil)/amdfwtool \
$(objutil)/cbootimage $(objutil)/cbootimage
@ -536,9 +538,6 @@ $(build_h): $$(shell $$(build_h_check))
@printf " GEN build.h\n" @printf " GEN build.h\n"
mv $< $@ mv $< $@
build-dirs $(objcbfs) $(objgenerated):
mkdir -p $(objcbfs) $(objgenerated)
$(obj)/build_info: $(obj)/build_info:
@echo 'COREBOOT_VERSION: $(call strip_quotes,$(KERNELVERSION))' > $@.tmp @echo 'COREBOOT_VERSION: $(call strip_quotes,$(KERNELVERSION))' > $@.tmp
@echo 'MAINBOARD_VENDOR: $(call strip_quotes,$(CONFIG_MAINBOARD_VENDOR))' >> $@.tmp @echo 'MAINBOARD_VENDOR: $(call strip_quotes,$(CONFIG_MAINBOARD_VENDOR))' >> $@.tmp
@ -770,7 +769,7 @@ $(objcbfs)/bootblock.raw.bin: $(objcbfs)/bootblock.raw.elf
$(OBJCOPY_bootblock) -O binary $< $@ $(OBJCOPY_bootblock) -O binary $< $@
ifneq ($(CONFIG_HAVE_BOOTBLOCK),y) ifneq ($(CONFIG_HAVE_BOOTBLOCK),y)
$(objcbfs)/bootblock.bin: $(objcbfs) $(objcbfs)/bootblock.bin:
dd if=/dev/zero of=$@ bs=64 count=1 dd if=/dev/zero of=$@ bs=64 count=1
endif endif