ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw: avoid BASE_DIR relative path definitions 

Fix #3728
This commit is contained in:
Stefan Kalkowski 2020-04-08 17:24:34 +02:00 committed by Christian Helmuth
parent 0e49336b96
commit 9f28f4f803
33 changed files with 98 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
repos/base-hw/lib/mk/bootstrap-hw.inc
View File

@ -1,4 +1,5 @@
HW_DIR = $(BASE_DIR)/../base-hw
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)
LIBS = cxx
@ -23,8 +24,8 @@ SRC_CC += lib/base/sleep.cc
SRC_CC += lib/base/sliced_heap.cc
SRC_CC += lib/startup/_main.cc
INC_DIR += $(HW_DIR)/src/bootstrap
INC_DIR += $(HW_DIR)/src/include
INC_DIR += $(BASE_HW_DIR)/src/bootstrap
INC_DIR += $(BASE_HW_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/core/include # for boot_modules.h only
@ -32,10 +33,10 @@ INC_DIR += $(BASE_DIR)/src/core/include # for boot_modules.h only
NR_OF_CPUS ?= 1
CC_OPT += -Wa,--defsym -Wa,NR_OF_CPUS=$(NR_OF_CPUS) -DNR_OF_CPUS=$(NR_OF_CPUS)
vpath base/% $(HW_DIR)/src
vpath bootstrap/% $(HW_DIR)/src
vpath hw/% $(HW_DIR)/src/lib
vpath lib/base/% $(HW_DIR)/src
vpath lib/muen/% $(HW_DIR)/src
vpath base/% $(BASE_HW_DIR)/src
vpath bootstrap/% $(BASE_HW_DIR)/src
vpath hw/% $(BASE_HW_DIR)/src/lib
vpath lib/base/% $(BASE_HW_DIR)/src
vpath lib/muen/% $(BASE_HW_DIR)/src
vpath lib/base/% $(BASE_DIR)/src
vpath lib/startup/% $(BASE_DIR)/src

9
repos/base-hw/lib/mk/core-hw.inc
View File

@ -4,12 +4,15 @@
# \date 2011-12-16
#
TMP := $(call select_from_repositories,lib/mk/core-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/core-hw.inc=%)
LIBS += base-hw-common cxx
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core
INC_DIR += $(BASE_HW_DIR)/src/core
INC_DIR += $(BASE_DIR)/src/core/include
INC_DIR += $(BASE_DIR)/../base-hw/src/include
INC_DIR += $(BASE_HW_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/include
# add C++ sources
@ -73,6 +76,6 @@ NR_OF_CPUS ?= 1
CC_OPT += -Wa,--defsym -Wa,NR_OF_CPUS=$(NR_OF_CPUS) -DNR_OF_CPUS=$(NR_OF_CPUS)
# declare source locations
vpath % $(BASE_DIR)/../base-hw/src/core
vpath % $(BASE_HW_DIR)/src/core
vpath % $(BASE_DIR)/src/core
vpath % $(BASE_DIR)/src/lib/startup

9
repos/base-hw/lib/mk/spec/arm/core-hw.inc
View File

@ -4,8 +4,11 @@
# \date 2011-12-16
#
TMP := $(call select_from_repositories,lib/mk/core-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/core-hw.inc=%)
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/arm
INC_DIR += $(BASE_HW_DIR)/src/core/spec/arm
# add C++ sources
SRC_CC += spec/32bit/memory_map.cc
@ -19,7 +22,7 @@ SRC_CC += spec/arm/platform_support.cc
SRC_S += spec/arm/crt0.s
SRC_S += spec/arm/exception_vector.S
vpath spec/32bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/32bit/memory_map.cc $(BASE_HW_DIR)/src/lib/hw
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/core-hw.inc
include $(BASE_HW_DIR)/lib/mk/core-hw.inc

4
repos/base-hw/lib/mk/spec/arm_v6/bootstrap-hw-rpi.mk
View File

@ -1,8 +1,8 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/rpi
INC_DIR += $(REP_DIR)/src/bootstrap/spec/rpi
SRC_CC += bootstrap/spec/rpi/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v6_cpu.cc
SRC_CC += hw/spec/32bit/memory_map.cc
SRC_S += bootstrap/spec/arm/crt0.s
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

7
repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc
View File

@ -5,8 +5,11 @@
# \date 2012-10-04
#
TMP := $(call select_from_repositories,lib/mk/core-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/core-hw.inc=%)
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/arm_v6
INC_DIR += $(BASE_HW_DIR)/src/core/spec/arm_v6
# add C++ sources
SRC_CC += spec/arm_v6/perf_counter.cc
@ -17,4 +20,4 @@ SRC_CC += kernel/lock.cc
SRC_S += spec/arm/vfpv2.s
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/spec/arm/core-hw.inc
include $(BASE_HW_DIR)/lib/mk/spec/arm/core-hw.inc

7
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc
View File

@ -1,4 +1,7 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/imx53_qsb
TMP := $(call select_from_repositories,lib/mk/core-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/core-hw.inc=%)
INC_DIR += $(BASE_HW_DIR)/src/bootstrap/spec/imx53_qsb
SRC_S += bootstrap/spec/arm/crt0.s
@ -8,4 +11,4 @@ SRC_CC += bootstrap/spec/arm/imx_tzic.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += hw/spec/32bit/memory_map.cc
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc

2
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.mk
View File

@ -1,3 +1,3 @@
SRC_CC += bootstrap/spec/imx53_qsb/platform.cc
include $(BASE_DIR)/../base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc
include $(REP_DIR)/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc

2
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb_tz.mk
View File

@ -1,3 +1,3 @@
SRC_CC += bootstrap/spec/imx53_qsb/platform_trustzone.cc
include $(BASE_DIR)/../base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc
include $(REP_DIR)/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc

4
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx6q_sabrelite.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/imx6q_sabrelite
INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx6q_sabrelite
SRC_S += bootstrap/spec/arm/crt0.s
@ -11,4 +11,4 @@ SRC_CC += hw/spec/32bit/memory_map.cc
NR_OF_CPUS = 4
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

2
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx7d_sabre.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/imx7d_sabre
INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx7d_sabre
SRC_CC += bootstrap/spec/arm/cortex_a15_cpu.cc
SRC_CC += bootstrap/spec/arm/gicv2.cc

4
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-nit6_solox.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/nit6_solox
INC_DIR += $(REP_DIR)/src/bootstrap/spec/nit6_solox
SRC_S += bootstrap/spec/arm/crt0.s
@ -11,4 +11,4 @@ SRC_CC += hw/spec/32bit/memory_map.cc
NR_OF_CPUS = 1
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

4
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-pbxa9.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/pbxa9
INC_DIR += $(REP_DIR)/src/bootstrap/spec/pbxa9
SRC_S += bootstrap/spec/arm/crt0.s
@ -9,4 +9,4 @@ SRC_CC += bootstrap/spec/pbxa9/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += hw/spec/32bit/memory_map.cc
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

4
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-usb_armory.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/usb_armory
INC_DIR += $(REP_DIR)/src/bootstrap/spec/usb_armory
SRC_S += bootstrap/spec/arm/crt0.s
@ -9,4 +9,4 @@ SRC_CC += bootstrap/spec/usb_armory/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += hw/spec/32bit/memory_map.cc
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

4
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-wand_quad.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/wand_quad
INC_DIR += $(REP_DIR)/src/bootstrap/spec/wand_quad
SRC_S += bootstrap/spec/arm/crt0.s
@ -11,4 +11,4 @@ SRC_CC += hw/spec/32bit/memory_map.cc
NR_OF_CPUS = 4
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

4
repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-zynq_qemu.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/zynq_qemu
INC_DIR += $(REP_DIR)/src/bootstrap/spec/zynq_qemu
SRC_S += bootstrap/spec/arm/crt0.s
@ -11,4 +11,4 @@ SRC_CC += hw/spec/32bit/memory_map.cc
NR_OF_CPUS = 1
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

2
repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk
View File

@ -31,4 +31,4 @@ NR_OF_CPUS = 2
CC_MARCH = -mcpu=cortex-a7 -mfpu=vfpv3 -mfloat-abi=softfp
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/spec/cortex_a15/core-hw.inc
include $(REP_DIR)/lib/mk/spec/cortex_a15/core-hw.inc

7
repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc
View File

@ -4,8 +4,11 @@
# \date 2011-12-16
#
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/arm_v7
INC_DIR += $(BASE_HW_DIR)/src/core/spec/arm_v7
# add C++ sources
SRC_CC += spec/arm_v7/perf_counter.cc
@ -13,4 +16,4 @@ SRC_CC += spec/arm_v7/perf_counter.cc
SRC_S += spec/arm/vfpv3-d32.cc
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/spec/arm/core-hw.inc
include $(BASE_HW_DIR)/lib/mk/spec/arm/core-hw.inc

6
repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-imx8q_evk.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/imx8q_evk
INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx8q_evk
SRC_CC += bootstrap/spec/arm/gicv3.cc
SRC_CC += bootstrap/spec/arm_64/cortex_a53_mmu.cc
@ -9,6 +9,6 @@ SRC_S += bootstrap/spec/arm_64/crt0.s
NR_OF_CPUS = 4
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

6
repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-rpi3.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/rpi3
INC_DIR += $(REP_DIR)/src/bootstrap/spec/rpi3
SRC_CC += bootstrap/spec/arm_64/cortex_a53_mmu.cc
SRC_CC += bootstrap/spec/rpi3/platform.cc
@ -6,8 +6,8 @@ SRC_CC += lib/base/arm_64/kernel/interface.cc
SRC_CC += spec/64bit/memory_map.cc
SRC_S += bootstrap/spec/arm_64/crt0.s
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
NR_OF_CPUS = 4
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

2
repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk
View File

@ -7,7 +7,7 @@ SRC_CC += lib/base/arm_64/kernel/interface.cc
SRC_CC += spec/64bit/memory_map.cc
SRC_S += bootstrap/spec/arm_64/crt0.s
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
NR_OF_CPUS = 4

2
repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk
View File

@ -24,7 +24,7 @@ SRC_S += spec/arm_v8/exception_vector.s
SRC_S += spec/arm_v8/crt0.s
SRC_S += spec/arm_v8/virtualization/exception_vector.s
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
NR_OF_CPUS = 4

2
repos/base-hw/lib/mk/spec/arm_v8/core-hw-rpi3.mk
View File

@ -18,7 +18,7 @@ SRC_CC += spec/arm_v8/kernel/thread.cc
SRC_S += spec/arm_v8/exception_vector.s
SRC_S += spec/arm_v8/crt0.s
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
NR_OF_CPUS = 4

2
repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu.mk
View File

@ -24,7 +24,7 @@ SRC_S += spec/arm_v8/exception_vector.s
SRC_S += spec/arm_v8/crt0.s
SRC_S += spec/arm_v8/virtualization/exception_vector.s
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
NR_OF_CPUS = 4

7
repos/base-hw/lib/mk/spec/cortex_a15/core-hw.inc
View File

@ -4,8 +4,11 @@
# \date 2014-09-02
#
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/cortex_a15
INC_DIR += $(BASE_HW_DIR)/src/core/spec/cortex_a15
# add C++ sources
SRC_CC += spec/cortex_a15/cpu.cc
@ -13,4 +16,4 @@ SRC_CC += kernel/cpu_mp.cc
SRC_CC += spec/arm/kernel/lock.cc
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/spec/arm_v7/core-hw.inc
include $(BASE_HW_DIR)/lib/mk/spec/arm_v7/core-hw.inc

7
repos/base-hw/lib/mk/spec/cortex_a8/core-hw.inc
View File

@ -4,8 +4,11 @@
# \date 2014-09-02
#
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/cortex_a8
INC_DIR += $(BASE_HW_DIR)/src/core/spec/cortex_a8
# add C++ sources
SRC_CC += kernel/cpu_up.cc
@ -14,4 +17,4 @@ SRC_CC += kernel/lock.cc
NR_OF_CPUS = 1
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/spec/arm_v7/core-hw.inc
include $(BASE_HW_DIR)/lib/mk/spec/arm_v7/core-hw.inc

7
repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc
View File

@ -4,8 +4,11 @@
# \date 2014-09-02
#
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/cortex_a9
INC_DIR += $(BASE_HW_DIR)/src/core/spec/cortex_a9
# add C++ sources
SRC_CC += spec/cortex_a9/board.cc
@ -17,4 +20,4 @@ SRC_CC += kernel/cpu_mp.cc
SRC_CC += kernel/kernel.cc
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/spec/arm_v7/core-hw.inc
include $(BASE_HW_DIR)/lib/mk/spec/arm_v7/core-hw.inc

6
repos/base-hw/lib/mk/spec/riscv/bootstrap-hw-spike.mk
View File

@ -4,13 +4,13 @@
#
BBL_DIR := $(call select_from_ports,bbl)/src/lib/bbl
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/riscv $(BBL_DIR)
INC_DIR += $(REP_DIR)/src/bootstrap/spec/riscv $(BBL_DIR)
SRC_CC += bootstrap/spec/riscv/platform.cc
SRC_CC += lib/base/riscv/kernel/interface.cc
SRC_CC += spec/64bit/memory_map.cc
SRC_S += bootstrap/spec/riscv/crt0.s
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

2
repos/base-hw/lib/mk/spec/riscv/core-hw-spike.mk
View File

@ -25,7 +25,7 @@ SRC_CC += spec/64bit/memory_map.cc
SRC_S += spec/riscv/exception_vector.s
SRC_S += spec/riscv/crt0.s
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
# include less specific configuration
include $(REP_DIR)/lib/mk/core-hw.inc

4
repos/base-hw/lib/mk/spec/x86_64/bootstrap-hw-muen.mk
View File

@ -1,6 +1,6 @@
REQUIRES = muen
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/x86_64
INC_DIR += $(REP_DIR)/src/bootstrap/spec/x86_64
SRC_CC += bootstrap/spec/x86_64/platform_muen.cc
SRC_CC += lib/muen/sinfo.cc
@ -9,4 +9,4 @@ SRC_CC += hw/spec/64bit/memory_map.cc
SRC_S += bootstrap/spec/x86_64/crt0.s
SRC_S += bootstrap/spec/x86_64/crt0_translation_table_muen.s
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

4
repos/base-hw/lib/mk/spec/x86_64/bootstrap-hw-pc.mk
View File

@ -1,4 +1,4 @@
INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/x86_64
INC_DIR += $(REP_DIR)/src/bootstrap/spec/x86_64
SRC_S += bootstrap/spec/x86_64/crt0.s
SRC_CC += bootstrap/spec/x86_64/platform.cc
@ -8,4 +8,4 @@ SRC_CC += hw/spec/64bit/memory_map.cc
NR_OF_CPUS = 32
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

6
repos/base-hw/lib/mk/spec/x86_64/core-hw-muen.mk
View File

@ -11,7 +11,7 @@ LIBS += sinfo-muen
# add include paths
INC_DIR += $(REP_DIR)/src/core/spec/x86_64/muen
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/x86_64
INC_DIR += $(REP_DIR)/src/core/spec/x86_64
# add assembly sources
SRC_S += spec/x86_64/crt0.s
@ -42,7 +42,7 @@ SRC_CC += vm_session_component.cc
SRC_CC += spec/64bit/memory_map.cc
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/core-hw.inc
include $(REP_DIR)/lib/mk/core-hw.inc

6
repos/base-hw/lib/mk/spec/x86_64/core-hw-pc.mk
View File

@ -6,7 +6,7 @@
#
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/x86_64
INC_DIR += $(REP_DIR)/src/core/spec/x86_64
# add assembly sources
SRC_S += spec/x86_64/crt0.s
@ -34,9 +34,9 @@ SRC_CC += spec/x86_64/platform_support_common.cc
SRC_CC += spec/64bit/memory_map.cc
vpath spec/64bit/memory_map.cc $(BASE_DIR)/../base-hw/src/lib/hw
vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
NR_OF_CPUS = 32
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/core-hw.inc
include $(REP_DIR)/lib/mk/core-hw.inc

7
repos/base-hw/lib/mk/spec/zynq/core-hw.inc
View File

@ -4,11 +4,14 @@
# \date 2014-12-15
#
TMP := $(call select_from_repositories,lib/mk/core-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/core-hw.inc=%)
# add include paths
INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/zynq
INC_DIR += $(BASE_HW_DIR)/src/core/spec/zynq
# add C++ sources
SRC_CC += platform_services.cc
# include less specific configuration
include $(BASE_DIR)/../base-hw/lib/mk/spec/cortex_a9/core-hw.inc
include $(BASE_HW_DIR)/lib/mk/spec/cortex_a9/core-hw.inc