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:
parent
8aebfd9b26
commit
0e06042f81
|
@ -11,4 +11,4 @@ SPECS += 32bit
|
||||||
#
|
#
|
||||||
CC_OPT += -Wno-psabi
|
CC_OPT += -Wno-psabi
|
||||||
|
|
||||||
include $(call select_from_repositories,mk/spec/32bit.mk)
|
include $(BASE_DIR)/mk/spec/32bit.mk
|
||||||
|
|
|
@ -14,5 +14,5 @@ CC_MARCH += -march=armv6
|
||||||
REP_INC_DIR += include/spec/arm_v6
|
REP_INC_DIR += include/spec/arm_v6
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/arm.mk)
|
include $(BASE_DIR)/mk/spec/arm.mk
|
||||||
|
|
||||||
|
|
|
@ -11,5 +11,5 @@ SPECS += arm
|
||||||
REP_INC_DIR += include/spec/arm_v7
|
REP_INC_DIR += include/spec/arm_v7
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/arm.mk)
|
include $(BASE_DIR)/mk/spec/arm.mk
|
||||||
|
|
||||||
|
|
|
@ -11,5 +11,5 @@ SPECS += arm_v7
|
||||||
REP_INC_DIR += include/spec/arm_v7a
|
REP_INC_DIR += include/spec/arm_v7a
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/arm_v7.mk)
|
include $(BASE_DIR)/mk/spec/arm_v7.mk
|
||||||
|
|
||||||
|
|
|
@ -11,5 +11,5 @@ SPECS += exynos5
|
||||||
REP_INC_DIR += include/spec/arndale
|
REP_INC_DIR += include/spec/arndale
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/exynos5.mk)
|
include $(BASE_DIR)/mk/spec/exynos5.mk
|
||||||
|
|
||||||
|
|
|
@ -23,4 +23,4 @@ REP_INC_DIR += include/spec/cortex_a15
|
||||||
CC_MARCH += -mcpu=cortex-a15
|
CC_MARCH += -mcpu=cortex-a15
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/arm_v7a.mk)
|
include $(BASE_DIR)/mk/spec/arm_v7a.mk
|
||||||
|
|
|
@ -14,4 +14,4 @@ REP_INC_DIR += include/spec/cortex_a8
|
||||||
CC_MARCH += -march=armv7-a -mcpu=cortex-a8
|
CC_MARCH += -march=armv7-a -mcpu=cortex-a8
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/arm_v7a.mk)
|
include $(BASE_DIR)/mk/spec/arm_v7a.mk
|
||||||
|
|
|
@ -14,5 +14,5 @@ REP_INC_DIR += include/spec/cortex_a9
|
||||||
CC_MARCH += -march=armv7-a -mcpu=cortex-a9
|
CC_MARCH += -march=armv7-a -mcpu=cortex-a9
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/arm_v7a.mk)
|
include $(BASE_DIR)/mk/spec/arm_v7a.mk
|
||||||
|
|
||||||
|
|
|
@ -12,4 +12,4 @@ REP_INC_DIR += include/spec/exynos5
|
||||||
REP_INC_DIR += include/spec/exynos
|
REP_INC_DIR += include/spec/exynos
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/cortex_a15.mk)
|
include $(BASE_DIR)/mk/spec/cortex_a15.mk
|
||||||
|
|
|
@ -12,5 +12,5 @@ REP_INC_DIR += include/spec/imx53
|
||||||
REP_INC_DIR += include/spec/imx
|
REP_INC_DIR += include/spec/imx
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/cortex_a8.mk)
|
include $(BASE_DIR)/mk/spec/cortex_a8.mk
|
||||||
|
|
||||||
|
|
|
@ -11,4 +11,4 @@ SPECS += imx53
|
||||||
REP_INC_DIR += include/spec/imx53_qsb
|
REP_INC_DIR += include/spec/imx53_qsb
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/imx53.mk)
|
include $(BASE_DIR)/mk/spec/imx53.mk
|
||||||
|
|
|
@ -14,5 +14,5 @@ REP_INC_DIR += include/spec/imx6
|
||||||
REP_INC_DIR += include/spec/imx
|
REP_INC_DIR += include/spec/imx
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/cortex_a9.mk)
|
include $(BASE_DIR)/mk/spec/cortex_a9.mk
|
||||||
|
|
||||||
|
|
|
@ -15,4 +15,4 @@ REP_INC_DIR += include/spec/exynos4
|
||||||
REP_INC_DIR += include/spec/exynos
|
REP_INC_DIR += include/spec/exynos
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/cortex_a9.mk)
|
include $(BASE_DIR)/mk/spec/cortex_a9.mk
|
||||||
|
|
|
@ -11,5 +11,5 @@ SPECS += exynos5
|
||||||
REP_INC_DIR += include/spec/odroid_xu
|
REP_INC_DIR += include/spec/odroid_xu
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/exynos5.mk)
|
include $(BASE_DIR)/mk/spec/exynos5.mk
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,6 @@ SPECS += arm_v7a
|
||||||
#
|
#
|
||||||
REP_INC_DIR += include/spec/panda
|
REP_INC_DIR += include/spec/panda
|
||||||
|
|
||||||
include $(call select_from_repositories,mk/spec/cortex_a9.mk)
|
include $(BASE_DIR)/mk/spec/cortex_a9.mk
|
||||||
include $(call select_from_repositories,mk/spec/tl16c750.mk)
|
include $(BASE_DIR)/mk/spec/tl16c750.mk
|
||||||
include $(call select_from_repositories,mk/spec/arm_v7a.mk)
|
include $(BASE_DIR)/mk/spec/arm_v7a.mk
|
||||||
|
|
|
@ -13,5 +13,5 @@ SPECS += cortex_a9
|
||||||
#
|
#
|
||||||
REP_INC_DIR += include/spec/pbxa9
|
REP_INC_DIR += include/spec/pbxa9
|
||||||
|
|
||||||
include $(call select_from_repositories,mk/spec/cortex_a9.mk)
|
include $(BASE_DIR)/mk/spec/cortex_a9.mk
|
||||||
include $(call select_from_repositories,mk/spec/pl011.mk)
|
include $(BASE_DIR)/mk/spec/pl011.mk
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
SPECS += 64bit
|
SPECS += 64bit
|
||||||
REP_INC_DIR += include/spec/riscv
|
REP_INC_DIR += include/spec/riscv
|
||||||
|
|
||||||
include $(call select_from_repositories,mk/spec/64bit.mk)
|
include $(BASE_DIR)/mk/spec/64bit.mk
|
||||||
|
|
||||||
|
|
|
@ -11,5 +11,5 @@ SPECS += arm_v6 usb framebuffer gpio
|
||||||
REP_INC_DIR += include/spec/rpi
|
REP_INC_DIR += include/spec/rpi
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/arm_v6.mk)
|
include $(BASE_DIR)/mk/spec/arm_v6.mk
|
||||||
include $(call select_from_repositories,mk/spec/pl011.mk)
|
include $(BASE_DIR)/mk/spec/pl011.mk
|
||||||
|
|
|
@ -11,4 +11,4 @@ SPECS += imx53
|
||||||
REP_INC_DIR += include/spec/usb_armory
|
REP_INC_DIR += include/spec/usb_armory
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/imx53.mk)
|
include $(BASE_DIR)/mk/spec/imx53.mk
|
||||||
|
|
|
@ -11,4 +11,4 @@ SPECS += imx6
|
||||||
REP_INC_DIR += include/spec/wand_quad
|
REP_INC_DIR += include/spec/wand_quad
|
||||||
|
|
||||||
# include implied specs
|
# include implied specs
|
||||||
include $(call select_from_repositories,mk/spec/imx6.mk)
|
include $(BASE_DIR)/mk/spec/imx6.mk
|
||||||
|
|
|
@ -16,5 +16,5 @@ CC_MARCH ?= -march=i686 -m32
|
||||||
LD_MARCH ?= -melf_i386
|
LD_MARCH ?= -melf_i386
|
||||||
AS_MARCH ?= -march=i686 --32
|
AS_MARCH ?= -march=i686 --32
|
||||||
|
|
||||||
include $(call select_from_repositories,mk/spec/32bit.mk)
|
include $(BASE_DIR)/mk/spec/32bit.mk
|
||||||
include $(call select_from_repositories,mk/spec/x86.mk)
|
include $(BASE_DIR)/mk/spec/x86.mk
|
||||||
|
|
|
@ -20,5 +20,5 @@ CC_MARCH ?= -m64
|
||||||
#
|
#
|
||||||
LD_MARCH ?= -melf_x86_64
|
LD_MARCH ?= -melf_x86_64
|
||||||
|
|
||||||
include $(call select_from_repositories,mk/spec/64bit.mk)
|
include $(BASE_DIR)/mk/spec/64bit.mk
|
||||||
include $(call select_from_repositories,mk/spec/x86.mk)
|
include $(BASE_DIR)/mk/spec/x86.mk
|
||||||
|
|
|
@ -5,4 +5,4 @@ SPECS += cortex_a9 arm_v7a
|
||||||
|
|
||||||
REP_INC_DIR += include/spec/zynq
|
REP_INC_DIR += include/spec/zynq
|
||||||
|
|
||||||
include $(call select_from_repositories,mk/spec/cortex_a9.mk)
|
include $(BASE_DIR)/mk/spec/cortex_a9.mk
|
||||||
|
|
|
@ -6,4 +6,4 @@ SPECS += zynq cadence_gem
|
||||||
REP_INC_DIR += include/spec/zynq_qemu
|
REP_INC_DIR += include/spec/zynq_qemu
|
||||||
REP_INC_DIR += include/spec/xilinx
|
REP_INC_DIR += include/spec/xilinx
|
||||||
|
|
||||||
include $(call select_from_repositories,mk/spec/zynq.mk)
|
include $(BASE_DIR)/mk/spec/zynq.mk
|
||||||
|
|
Loading…
Reference in New Issue
Block a user