summaryrefslogtreecommitdiffstats
path: root/Makefile.inc
diff options
context:
space:
mode:
authorZheng Bao <fishbaozi@gmail.com>2022-03-11 14:47:07 +0800
committerFelix Held <felix-coreboot@felixheld.de>2022-03-25 19:25:18 +0000
commit1ddf1b6422d6c3c39b82021c8bd4d16a2550f12d (patch)
treeb5e052f6ddde62c203edfe0b75a810d03280f545 /Makefile.inc
parent4ce453ce444c6458196b51f6e677def1613df621 (diff)
downloadcoreboot-1ddf1b6422d6c3c39b82021c8bd4d16a2550f12d.tar.gz
coreboot-1ddf1b6422d6c3c39b82021c8bd4d16a2550f12d.tar.bz2
coreboot-1ddf1b6422d6c3c39b82021c8bd4d16a2550f12d.zip
$top/Makefile.inc: Move common folder before other sibling ones
Putting src/soc/*/common before src/soc/*/*, and src/superio/common before src/superio/*,(which is already moved but with duplicated folder "common") can make the variables in common Makefile get the expected value before they are used in other subdirs. The later "*" also contains "common", which needs to be eliminated by "filter-out". Then we can put some common variables from all the subdir Makefile.inc to the common Makefile.inc to reduce code redundancy. Change-Id: I99597af22cac6d12aaef348789664cd7db02ba06 Signed-off-by: Zheng Bao <fishbaozi@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/62750 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'Makefile.inc')
-rw-r--r--Makefile.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index ec2d097b2dda..929c236dd623 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -81,8 +81,9 @@ PHONY+= clean-abuild coreboot check-style build_complete
# root source directories of coreboot
subdirs-y := src/lib src/commonlib/ src/console src/device src/acpi src/superio/common
subdirs-y += src/ec/acpi $(wildcard src/ec/*/*) $(wildcard src/southbridge/*/*)
-subdirs-y += $(wildcard src/soc/*) $(wildcard src/soc/*/*) $(wildcard src/northbridge/*/*)
-subdirs-y += $(wildcard src/superio/*) $(wildcard src/superio/*/*)
+subdirs-y += $(wildcard src/soc/*) $(wildcard src/soc/*/common) $(filter-out $(wildcard src/soc/*/common),$(wildcard src/soc/*/*))
+subdirs-y += $(wildcard src/northbridge/*/*)
+subdirs-y += $(filter-out src/superio/common,$(wildcard src/superio/*)) $(wildcard src/superio/*/*)
subdirs-y += $(wildcard src/drivers/*) $(wildcard src/drivers/*/*) $(wildcard src/drivers/*/*/*)
subdirs-y += src/cpu src/vendorcode
subdirs-y += util/cbfstool util/sconfig util/nvramtool util/pgtblgen util/amdfwtool