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.
This commit is contained in:
Norman Feske 2017-04-07 10:48:02 +02:00 committed by Christian Helmuth
parent 8aebfd9b26
commit 0e06042f81
24 changed files with 30 additions and 30 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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