Currently only board/vendor/$(BOARD)/config.mk is supported, add the additional usecase of having a vendor generic config.mk for adding functionality like platform-specific build targets.
Additionally, fix the ifdef to correctly check for $(BOARDDIR) rather than $(BOARD) since that's what is actually used in the include path. Signed-off-by: Casey Connolly <[email protected]> --- config.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index abed9cb65c6f..22c21c0d3b2d 100644 --- a/config.mk +++ b/config.mk @@ -46,17 +46,21 @@ sinclude $(srctree)/$(CPUDIR)/config.mk # include CPU specific rules ifdef SOC sinclude $(srctree)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules endif ifneq ($(BOARD),) -ifdef VENDOR +ifneq ($(VENDOR),) BOARDDIR = $(VENDOR)/$(BOARD) ENVDIR=${vendor}/env else BOARDDIR = $(BOARD) ENVDIR=${board}/env endif endif -ifdef BOARD + +ifneq ($(VENDOR),) +sinclude $(srctree)/board/$(VENDOR)/config.mk # include vendor specific rules +endif +ifdef BOARDDIR sinclude $(srctree)/board/$(BOARDDIR)/config.mk # include board specific rules endif ifdef FTRACE -- 2.53.0
