From 0e06042f81fc5a669454859b77342aca74acb905 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 7 Apr 2017 10:48:02 +0200 Subject: [PATCH] base/mk: include sub specs from BASE_DIR Originally, the spec files for less specific SPEC values were include via the 'select_from_repositories' function. This implies that BASE_DIR must always be present in the list of 'REPOSITORIES'. Otherwise the spec files won't be found. By explicitly including sub specs from '$(BASE_DIR)/mk', we lift this restriction. --- repos/base/mk/spec/arm.mk | 2 +- repos/base/mk/spec/arm_v6.mk | 2 +- repos/base/mk/spec/arm_v7.mk | 2 +- repos/base/mk/spec/arm_v7a.mk | 2 +- repos/base/mk/spec/arndale.mk | 2 +- repos/base/mk/spec/cortex_a15.mk | 2 +- repos/base/mk/spec/cortex_a8.mk | 2 +- repos/base/mk/spec/cortex_a9.mk | 2 +- repos/base/mk/spec/exynos5.mk | 2 +- repos/base/mk/spec/imx53.mk | 2 +- repos/base/mk/spec/imx53_qsb.mk | 2 +- repos/base/mk/spec/imx6.mk | 2 +- repos/base/mk/spec/odroid_x2.mk | 2 +- repos/base/mk/spec/odroid_xu.mk | 2 +- repos/base/mk/spec/panda.mk | 6 +++--- repos/base/mk/spec/pbxa9.mk | 4 ++-- repos/base/mk/spec/riscv.mk | 2 +- repos/base/mk/spec/rpi.mk | 4 ++-- repos/base/mk/spec/usb_armory.mk | 2 +- repos/base/mk/spec/wand_quad.mk | 2 +- repos/base/mk/spec/x86_32.mk | 4 ++-- repos/base/mk/spec/x86_64.mk | 4 ++-- repos/base/mk/spec/zynq.mk | 2 +- repos/base/mk/spec/zynq_qemu.mk | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) diff --git a/repos/base/mk/spec/arm.mk b/repos/base/mk/spec/arm.mk index 713985ec1..bb7602b61 100644 --- a/repos/base/mk/spec/arm.mk +++ b/repos/base/mk/spec/arm.mk @@ -11,4 +11,4 @@ SPECS += 32bit # CC_OPT += -Wno-psabi -include $(call select_from_repositories,mk/spec/32bit.mk) +include $(BASE_DIR)/mk/spec/32bit.mk diff --git a/repos/base/mk/spec/arm_v6.mk b/repos/base/mk/spec/arm_v6.mk index ba5af0a2d..8dc12a7a1 100644 --- a/repos/base/mk/spec/arm_v6.mk +++ b/repos/base/mk/spec/arm_v6.mk @@ -14,5 +14,5 @@ CC_MARCH += -march=armv6 REP_INC_DIR += include/spec/arm_v6 # include implied specs -include $(call select_from_repositories,mk/spec/arm.mk) +include $(BASE_DIR)/mk/spec/arm.mk diff --git a/repos/base/mk/spec/arm_v7.mk b/repos/base/mk/spec/arm_v7.mk index d0b7c6ba0..fe4697c50 100644 --- a/repos/base/mk/spec/arm_v7.mk +++ b/repos/base/mk/spec/arm_v7.mk @@ -11,5 +11,5 @@ SPECS += arm REP_INC_DIR += include/spec/arm_v7 # include implied specs -include $(call select_from_repositories,mk/spec/arm.mk) +include $(BASE_DIR)/mk/spec/arm.mk diff --git a/repos/base/mk/spec/arm_v7a.mk b/repos/base/mk/spec/arm_v7a.mk index 489fdcbe7..8e79bc803 100644 --- a/repos/base/mk/spec/arm_v7a.mk +++ b/repos/base/mk/spec/arm_v7a.mk @@ -11,5 +11,5 @@ SPECS += arm_v7 REP_INC_DIR += include/spec/arm_v7a # include implied specs -include $(call select_from_repositories,mk/spec/arm_v7.mk) +include $(BASE_DIR)/mk/spec/arm_v7.mk diff --git a/repos/base/mk/spec/arndale.mk b/repos/base/mk/spec/arndale.mk index ae73340ef..8feb309ab 100644 --- a/repos/base/mk/spec/arndale.mk +++ b/repos/base/mk/spec/arndale.mk @@ -11,5 +11,5 @@ SPECS += exynos5 REP_INC_DIR += include/spec/arndale # include implied specs -include $(call select_from_repositories,mk/spec/exynos5.mk) +include $(BASE_DIR)/mk/spec/exynos5.mk diff --git a/repos/base/mk/spec/cortex_a15.mk b/repos/base/mk/spec/cortex_a15.mk index 7bc9ff09c..ba59f03ad 100644 --- a/repos/base/mk/spec/cortex_a15.mk +++ b/repos/base/mk/spec/cortex_a15.mk @@ -23,4 +23,4 @@ REP_INC_DIR += include/spec/cortex_a15 CC_MARCH += -mcpu=cortex-a15 # include implied specs -include $(call select_from_repositories,mk/spec/arm_v7a.mk) +include $(BASE_DIR)/mk/spec/arm_v7a.mk diff --git a/repos/base/mk/spec/cortex_a8.mk b/repos/base/mk/spec/cortex_a8.mk index c20e1ed6d..05293b665 100644 --- a/repos/base/mk/spec/cortex_a8.mk +++ b/repos/base/mk/spec/cortex_a8.mk @@ -14,4 +14,4 @@ REP_INC_DIR += include/spec/cortex_a8 CC_MARCH += -march=armv7-a -mcpu=cortex-a8 # include implied specs -include $(call select_from_repositories,mk/spec/arm_v7a.mk) +include $(BASE_DIR)/mk/spec/arm_v7a.mk diff --git a/repos/base/mk/spec/cortex_a9.mk b/repos/base/mk/spec/cortex_a9.mk index ac5958a22..199c6af21 100644 --- a/repos/base/mk/spec/cortex_a9.mk +++ b/repos/base/mk/spec/cortex_a9.mk @@ -14,5 +14,5 @@ REP_INC_DIR += include/spec/cortex_a9 CC_MARCH += -march=armv7-a -mcpu=cortex-a9 # include implied specs -include $(call select_from_repositories,mk/spec/arm_v7a.mk) +include $(BASE_DIR)/mk/spec/arm_v7a.mk diff --git a/repos/base/mk/spec/exynos5.mk b/repos/base/mk/spec/exynos5.mk index 90c329060..8152be41d 100644 --- a/repos/base/mk/spec/exynos5.mk +++ b/repos/base/mk/spec/exynos5.mk @@ -12,4 +12,4 @@ REP_INC_DIR += include/spec/exynos5 REP_INC_DIR += include/spec/exynos # include implied specs -include $(call select_from_repositories,mk/spec/cortex_a15.mk) +include $(BASE_DIR)/mk/spec/cortex_a15.mk diff --git a/repos/base/mk/spec/imx53.mk b/repos/base/mk/spec/imx53.mk index 77f6651f2..74c19a94f 100644 --- a/repos/base/mk/spec/imx53.mk +++ b/repos/base/mk/spec/imx53.mk @@ -12,5 +12,5 @@ REP_INC_DIR += include/spec/imx53 REP_INC_DIR += include/spec/imx # include implied specs -include $(call select_from_repositories,mk/spec/cortex_a8.mk) +include $(BASE_DIR)/mk/spec/cortex_a8.mk diff --git a/repos/base/mk/spec/imx53_qsb.mk b/repos/base/mk/spec/imx53_qsb.mk index 9088454fc..78d658854 100644 --- a/repos/base/mk/spec/imx53_qsb.mk +++ b/repos/base/mk/spec/imx53_qsb.mk @@ -11,4 +11,4 @@ SPECS += imx53 REP_INC_DIR += include/spec/imx53_qsb # include implied specs -include $(call select_from_repositories,mk/spec/imx53.mk) +include $(BASE_DIR)/mk/spec/imx53.mk diff --git a/repos/base/mk/spec/imx6.mk b/repos/base/mk/spec/imx6.mk index 26901ef5a..a85cdb415 100644 --- a/repos/base/mk/spec/imx6.mk +++ b/repos/base/mk/spec/imx6.mk @@ -14,5 +14,5 @@ REP_INC_DIR += include/spec/imx6 REP_INC_DIR += include/spec/imx # include implied specs -include $(call select_from_repositories,mk/spec/cortex_a9.mk) +include $(BASE_DIR)/mk/spec/cortex_a9.mk diff --git a/repos/base/mk/spec/odroid_x2.mk b/repos/base/mk/spec/odroid_x2.mk index 7304194ef..24cc06b51 100644 --- a/repos/base/mk/spec/odroid_x2.mk +++ b/repos/base/mk/spec/odroid_x2.mk @@ -15,4 +15,4 @@ REP_INC_DIR += include/spec/exynos4 REP_INC_DIR += include/spec/exynos # include implied specs -include $(call select_from_repositories,mk/spec/cortex_a9.mk) +include $(BASE_DIR)/mk/spec/cortex_a9.mk diff --git a/repos/base/mk/spec/odroid_xu.mk b/repos/base/mk/spec/odroid_xu.mk index 799d7189f..9243bf645 100644 --- a/repos/base/mk/spec/odroid_xu.mk +++ b/repos/base/mk/spec/odroid_xu.mk @@ -11,5 +11,5 @@ SPECS += exynos5 REP_INC_DIR += include/spec/odroid_xu # include implied specs -include $(call select_from_repositories,mk/spec/exynos5.mk) +include $(BASE_DIR)/mk/spec/exynos5.mk diff --git a/repos/base/mk/spec/panda.mk b/repos/base/mk/spec/panda.mk index 911c46621..aaca51c81 100644 --- a/repos/base/mk/spec/panda.mk +++ b/repos/base/mk/spec/panda.mk @@ -13,6 +13,6 @@ SPECS += arm_v7a # REP_INC_DIR += include/spec/panda -include $(call select_from_repositories,mk/spec/cortex_a9.mk) -include $(call select_from_repositories,mk/spec/tl16c750.mk) -include $(call select_from_repositories,mk/spec/arm_v7a.mk) +include $(BASE_DIR)/mk/spec/cortex_a9.mk +include $(BASE_DIR)/mk/spec/tl16c750.mk +include $(BASE_DIR)/mk/spec/arm_v7a.mk diff --git a/repos/base/mk/spec/pbxa9.mk b/repos/base/mk/spec/pbxa9.mk index 6c085f35c..54ae754fb 100644 --- a/repos/base/mk/spec/pbxa9.mk +++ b/repos/base/mk/spec/pbxa9.mk @@ -13,5 +13,5 @@ SPECS += cortex_a9 # REP_INC_DIR += include/spec/pbxa9 -include $(call select_from_repositories,mk/spec/cortex_a9.mk) -include $(call select_from_repositories,mk/spec/pl011.mk) +include $(BASE_DIR)/mk/spec/cortex_a9.mk +include $(BASE_DIR)/mk/spec/pl011.mk diff --git a/repos/base/mk/spec/riscv.mk b/repos/base/mk/spec/riscv.mk index 7d7d7595f..d60c630d9 100644 --- a/repos/base/mk/spec/riscv.mk +++ b/repos/base/mk/spec/riscv.mk @@ -1,5 +1,5 @@ SPECS += 64bit REP_INC_DIR += include/spec/riscv -include $(call select_from_repositories,mk/spec/64bit.mk) +include $(BASE_DIR)/mk/spec/64bit.mk diff --git a/repos/base/mk/spec/rpi.mk b/repos/base/mk/spec/rpi.mk index 83405134a..e1b82818a 100644 --- a/repos/base/mk/spec/rpi.mk +++ b/repos/base/mk/spec/rpi.mk @@ -11,5 +11,5 @@ SPECS += arm_v6 usb framebuffer gpio REP_INC_DIR += include/spec/rpi # include implied specs -include $(call select_from_repositories,mk/spec/arm_v6.mk) -include $(call select_from_repositories,mk/spec/pl011.mk) +include $(BASE_DIR)/mk/spec/arm_v6.mk +include $(BASE_DIR)/mk/spec/pl011.mk diff --git a/repos/base/mk/spec/usb_armory.mk b/repos/base/mk/spec/usb_armory.mk index a96141b11..e2d345741 100644 --- a/repos/base/mk/spec/usb_armory.mk +++ b/repos/base/mk/spec/usb_armory.mk @@ -11,4 +11,4 @@ SPECS += imx53 REP_INC_DIR += include/spec/usb_armory # include implied specs -include $(call select_from_repositories,mk/spec/imx53.mk) +include $(BASE_DIR)/mk/spec/imx53.mk diff --git a/repos/base/mk/spec/wand_quad.mk b/repos/base/mk/spec/wand_quad.mk index 3bbf10146..4ef64a2d0 100644 --- a/repos/base/mk/spec/wand_quad.mk +++ b/repos/base/mk/spec/wand_quad.mk @@ -11,4 +11,4 @@ SPECS += imx6 REP_INC_DIR += include/spec/wand_quad # include implied specs -include $(call select_from_repositories,mk/spec/imx6.mk) +include $(BASE_DIR)/mk/spec/imx6.mk diff --git a/repos/base/mk/spec/x86_32.mk b/repos/base/mk/spec/x86_32.mk index c35cc0c63..631e04c66 100644 --- a/repos/base/mk/spec/x86_32.mk +++ b/repos/base/mk/spec/x86_32.mk @@ -16,5 +16,5 @@ CC_MARCH ?= -march=i686 -m32 LD_MARCH ?= -melf_i386 AS_MARCH ?= -march=i686 --32 -include $(call select_from_repositories,mk/spec/32bit.mk) -include $(call select_from_repositories,mk/spec/x86.mk) +include $(BASE_DIR)/mk/spec/32bit.mk +include $(BASE_DIR)/mk/spec/x86.mk diff --git a/repos/base/mk/spec/x86_64.mk b/repos/base/mk/spec/x86_64.mk index dd7507ec0..0c7c95fdd 100644 --- a/repos/base/mk/spec/x86_64.mk +++ b/repos/base/mk/spec/x86_64.mk @@ -20,5 +20,5 @@ CC_MARCH ?= -m64 # LD_MARCH ?= -melf_x86_64 -include $(call select_from_repositories,mk/spec/64bit.mk) -include $(call select_from_repositories,mk/spec/x86.mk) +include $(BASE_DIR)/mk/spec/64bit.mk +include $(BASE_DIR)/mk/spec/x86.mk diff --git a/repos/base/mk/spec/zynq.mk b/repos/base/mk/spec/zynq.mk index 612230ddf..f8861c57a 100644 --- a/repos/base/mk/spec/zynq.mk +++ b/repos/base/mk/spec/zynq.mk @@ -5,4 +5,4 @@ SPECS += cortex_a9 arm_v7a REP_INC_DIR += include/spec/zynq -include $(call select_from_repositories,mk/spec/cortex_a9.mk) +include $(BASE_DIR)/mk/spec/cortex_a9.mk diff --git a/repos/base/mk/spec/zynq_qemu.mk b/repos/base/mk/spec/zynq_qemu.mk index f47d96df5..f119a39f1 100644 --- a/repos/base/mk/spec/zynq_qemu.mk +++ b/repos/base/mk/spec/zynq_qemu.mk @@ -6,4 +6,4 @@ SPECS += zynq cadence_gem REP_INC_DIR += include/spec/zynq_qemu REP_INC_DIR += include/spec/xilinx -include $(call select_from_repositories,mk/spec/zynq.mk) +include $(BASE_DIR)/mk/spec/zynq.mk