From 63f8a38b5aeba0a5b2b778c499a04db2de422f46 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Mon, 9 Feb 2015 10:08:54 +0100 Subject: [PATCH] hw: default boot-modules vpath is generic Ref #1404 --- repos/base-hw/lib/mk/arm/core.inc | 3 --- repos/base-hw/lib/mk/core.inc | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/repos/base-hw/lib/mk/arm/core.inc b/repos/base-hw/lib/mk/arm/core.inc index f87d78bf66..5bfd4ecb3c 100644 --- a/repos/base-hw/lib/mk/arm/core.inc +++ b/repos/base-hw/lib/mk/arm/core.inc @@ -13,8 +13,5 @@ SRC_CC += spec/arm/kernel/thread_base.cc # add assembly sources SRC_S += spec/arm/crt0.s -# use dummy boot-modules per default -BOOT_MODULES_VPATH = $(REP_DIR)/src/core/spec/arm - # include less specific configuration include $(REP_DIR)/lib/mk/core.inc diff --git a/repos/base-hw/lib/mk/core.inc b/repos/base-hw/lib/mk/core.inc index f23f039f14..c6f4eb5767 100644 --- a/repos/base-hw/lib/mk/core.inc +++ b/repos/base-hw/lib/mk/core.inc @@ -62,10 +62,13 @@ SRC_S += boot_modules.s # provide Genode version information include $(BASE_DIR)/src/core/version.inc -# switch to specific boot-modules if further images shall be available +# switch to build-specific boot-modules if further images shall be available ifneq ($(wildcard $(BUILD_BASE_DIR)/boot_modules.s),) BOOT_MODULES_VPATH = $(BUILD_BASE_DIR) INC_DIR += $(BOOT_MODULES_VPATH) +else + # use dummy boot-modules per default + BOOT_MODULES_VPATH = $(REP_DIR)/src/core/ endif vpath boot_modules.s $(BOOT_MODULES_VPATH)