Introduce 'spec' subdirectories to outline aspects

Instead of holding SPEC-variable dependent files and directories inline
within the repository structure, move them into 'spec' subdirectories
at the corresponding levels, e.g.:

  repos/base/include/spec
  repos/base/mk/spec
  repos/base/lib/mk/spec
  repos/base/src/core/spec
  ...

Moreover, this commit removes the 'platform' directories. That term was
used in an overloaded sense. All SPEC-relative 'platform' directories are
now named 'spec'. Other files, like for instance those related to the
kernel/architecture specific startup library, where moved from 'platform'
directories to explicit, more meaningful places like e.g.: 'src/lib/startup'.

Fix #1673

repos/base-fiasco/lib/mk/base-common.mk

@@ -26,6 +26,6 @@ SRC_CC += thread/context_allocator.cc
 INC_DIR +=  $(REP_DIR)/src/base/lock
 INC_DIR += $(BASE_DIR)/src/base/thread
 
-vpath cap_copy.cc $(BASE_DIR)/src/platform
+vpath cap_copy.cc $(BASE_DIR)/src/lib/startup
 vpath %.cc        $(REP_DIR)/src/base
 vpath %.cc        $(BASE_DIR)/src/base

repos/base-fiasco/mk/spec-platform_imx.mk

@@ -1,16 +0,0 @@
-#
-# Specifics for Freescale i.MX21 platform
-#
-
-RAM_BASE = 0xc0000000
-
-#
-# Configure target CPU for gcc
-#
-CC_OPT += -march=armv5
-
-#
-# Defines for L4/sys headers
-#
-CC_OPT += -DCPUTYPE_imx
-L4SYS_ARM_CPU = arm_imx

repos/base-fiasco/mk/spec-platform_integrator.mk

@@ -1,14 +0,0 @@
-#
-# Specifics for ARM integrator platform
-#
-
-#
-# Configure target CPU for gcc
-#
-CC_OPT += -march=armv5
-
-#
-# Defines for L4/sys headers
-#
-CC_OPT += -DCPUTYPE_int
-L4SYS_ARM_CPU = arm_int

repos/base-fiasco/mk/spec-platform_mmsp2.mk

@@ -1,14 +0,0 @@
-#
-# Specifics for MagicEyes Digital’s Multimedia Signal Processor
-#
-
-#
-# Configure target CPU for gcc
-#
-CC_OPT += -march=armv4t
-
-#
-# Defines for L4/sys headers
-#
-CC_OPT += -DCPUTYPE_mmsp2
-L4SYS_ARM_CPU = arm_mmsp2

repos/base-fiasco/mk/spec/fiasco_x86.mk

@@ -19,7 +19,7 @@ LD_TEXT_ADDR ?= 0x01000000
 #
 # Also include less-specific configuration last
 #
-include $(call select_from_repositories,mk/spec-x86_32.mk)
-include $(call select_from_repositories,mk/spec-fiasco.mk)
+include $(call select_from_repositories,mk/spec/x86_32.mk)
+include $(call select_from_repositories,mk/spec/fiasco.mk)
 
 INC_DIR      += $(L4_INC_DIR)

repos/base-fiasco/src/core/spec/x86/target.mk

@@ -0,0 +1,8 @@
+include $(PRG_DIR)/../../target.inc
+
+REQUIRES += x86
+SRC_CC   += platform_x86.cc
+
+vpath io_port_session_component.cc $(GEN_CORE_DIR)/spec/x86
+vpath platform_services.cc         $(GEN_CORE_DIR)/spec/x86
+

repos/base-fiasco/src/core/x86/target.mk

@@ -1,8 +0,0 @@
-include $(PRG_DIR)/../target.inc
-
-REQUIRES += x86
-SRC_CC   += platform_x86.cc
-
-vpath io_port_session_component.cc $(GEN_CORE_DIR)/x86
-vpath platform_services.cc         $(GEN_CORE_DIR)/x86
-

repos/base-fiasco/src/kernel/spec/x86/target.mk

@@ -1,4 +1,4 @@
 REQUIRES      = x86 32bit
 KERNEL_CONFIG = $(REP_DIR)/config/kernel-config.x86
 
--include $(PRG_DIR)/../target.inc
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/lib/mk/spec/arndale/platform.mk

@@ -3,4 +3,4 @@
 #
 L4_CONFIG = $(call select_from_repositories,config/arndale.user)
 
-include $(REP_DIR)/lib/mk/arm/platform.inc
+include $(REP_DIR)/lib/mk/spec/arm/platform.inc

repos/base-foc/lib/mk/spec/imx53/platform.mk

@@ -3,4 +3,4 @@
 #
 L4_CONFIG = $(call select_from_repositories,config/imx53.user)
 
-include $(REP_DIR)/lib/mk/arm/platform.inc
+include $(REP_DIR)/lib/mk/spec/arm/platform.inc

repos/base-foc/lib/mk/spec/odroid_x2/platform.mk

@@ -3,4 +3,4 @@
 #
 L4_CONFIG = $(call select_from_repositories,config/odroid_x2.user)
 
-include $(REP_DIR)/lib/mk/arm/platform.inc
+include $(REP_DIR)/lib/mk/spec/arm/platform.inc

repos/base-foc/lib/mk/spec/panda/platform.mk

@@ -3,4 +3,4 @@
 #
 L4_CONFIG = $(call select_from_repositories,config/panda.user)
 
-include $(REP_DIR)/lib/mk/arm/platform.inc
+include $(REP_DIR)/lib/mk/spec/arm/platform.inc

repos/base-foc/lib/mk/spec/pbxa9/platform.mk

@@ -3,4 +3,4 @@
 #
 L4_CONFIG = $(call select_from_repositories,config/pbxa9.user)
 
-include $(REP_DIR)/lib/mk/arm/platform.inc
+include $(REP_DIR)/lib/mk/spec/arm/platform.inc

repos/base-foc/lib/mk/spec/rpi/platform.mk

@@ -3,4 +3,4 @@
 #
 L4_CONFIG = $(call select_from_repositories,config/rpi.user)
 
-include $(REP_DIR)/lib/mk/arm/platform.inc
+include $(REP_DIR)/lib/mk/spec/arm/platform.inc

repos/base-foc/mk/spec-foc_arndale.mk

@@ -1,5 +0,0 @@
-SPECS += foc_arm platform_arndale
-
-include $(call select_from_repositories,mk/spec-fpu_vfpv3.mk)
-include $(call select_from_repositories,mk/spec-platform_arndale.mk)
-include $(call select_from_repositories,mk/spec-foc_arm.mk)

repos/base-foc/mk/spec-foc_imx53.mk

@@ -1,6 +0,0 @@
-SPECS += foc_arm platform_imx53
-
-REP_INC_DIR += include/platform/imx53_qsb
-
-include $(call select_from_repositories,mk/spec-platform_imx53.mk)
-include $(call select_from_repositories,mk/spec-foc_arm.mk)

repos/base-foc/mk/spec-foc_odroid_x2.mk

@@ -1,4 +0,0 @@
-SPECS += foc_arm platform_odroid_x2
-
-include $(call select_from_repositories,mk/spec-platform_odroid_x2.mk)
-include $(call select_from_repositories,mk/spec-foc_arm.mk)

repos/base-foc/mk/spec-foc_panda.mk

@@ -1,4 +0,0 @@
-SPECS += foc_arm platform_panda
-
-include $(call select_from_repositories,mk/spec-platform_panda.mk)
-include $(call select_from_repositories,mk/spec-foc_arm.mk)

repos/base-foc/mk/spec-foc_pbxa9.mk

@@ -1,4 +0,0 @@
-SPECS += foc_arm platform_pbxa9
-
-include $(call select_from_repositories,mk/spec-platform_pbxa9.mk)
-include $(call select_from_repositories,mk/spec-foc_arm.mk)

repos/base-foc/mk/spec-foc_rpi.mk

@@ -1,4 +0,0 @@
-SPECS += foc_arm platform_rpi
-
-include $(call select_from_repositories,mk/spec-platform_rpi.mk)
-include $(call select_from_repositories,mk/spec-foc_arm.mk)

repos/base-foc/mk/spec/foc_arm.mk

@@ -15,11 +15,6 @@ LD_TEXT_ADDR ?= 0x01000000
 L4_INC_DIR  = $(BUILD_BASE_DIR)/include/arm
 L4F_INC_DIR = $(BUILD_BASE_DIR)/include/arm/l4f
 
-#
-# Support for Fiasco.OC's ARM-specific atomic functions
-#
-REP_INC_DIR += include/arm
-
 #
 # Defines for L4/sys headers
 #
@@ -32,6 +27,6 @@ L4_INC_TARGETS = arm/l4/sys \
                  arm/l4f/l4/sys \
                  arm/l4/vcpu
 
-include $(call select_from_repositories,mk/spec-foc.mk)
+include $(call select_from_repositories,mk/spec/foc.mk)
 
 INC_DIR += $(L4F_INC_DIR) $(L4_INC_DIR)

repos/base-foc/mk/spec/foc_arndale.mk

@@ -0,0 +1,5 @@
+SPECS += foc_arm arndale
+
+include $(call select_from_repositories,mk/spec/fpu_vfpv3.mk)
+include $(call select_from_repositories,mk/spec/arndale.mk)
+include $(call select_from_repositories,mk/spec/foc_arm.mk)

repos/base-foc/mk/spec/foc_imx53.mk

@@ -0,0 +1,7 @@
+SPECS += foc_arm imx53 imx53_qsb
+
+# add repository relative include paths
+REP_INC_DIR += include/spec/imx53_qsb
+
+include $(call select_from_repositories,mk/spec/imx53.mk)
+include $(call select_from_repositories,mk/spec/foc_arm.mk)

repos/base-foc/mk/spec/foc_odroid_x2.mk

@@ -0,0 +1,4 @@
+SPECS += foc_arm odroid_x2
+
+include $(call select_from_repositories,mk/spec/odroid_x2.mk)
+include $(call select_from_repositories,mk/spec/foc_arm.mk)

repos/base-foc/mk/spec/foc_panda.mk

@@ -0,0 +1,4 @@
+SPECS += foc_arm panda
+
+include $(call select_from_repositories,mk/spec/panda.mk)
+include $(call select_from_repositories,mk/spec/foc_arm.mk)

repos/base-foc/mk/spec/foc_pbxa9.mk

@@ -0,0 +1,4 @@
+SPECS += foc_arm pbxa9
+
+include $(call select_from_repositories,mk/spec/pbxa9.mk)
+include $(call select_from_repositories,mk/spec/foc_arm.mk)

repos/base-foc/mk/spec/foc_rpi.mk

@@ -0,0 +1,4 @@
+SPECS += foc_arm rpi
+
+include $(call select_from_repositories,mk/spec/rpi.mk)
+include $(call select_from_repositories,mk/spec/foc_arm.mk)

repos/base-foc/mk/spec/foc_x86_32.mk

@@ -19,7 +19,7 @@ L4F_INC_DIR = $(BUILD_BASE_DIR)/include/x86/l4f
 #
 # Also include less-specific configuration last
 #
-include $(call select_from_repositories,mk/spec-x86_32.mk)
-include $(call select_from_repositories,mk/spec-foc.mk)
+include $(call select_from_repositories,mk/spec/x86_32.mk)
+include $(call select_from_repositories,mk/spec/foc.mk)
 
 INC_DIR += $(L4F_INC_DIR) $(L4_INC_DIR)

repos/base-foc/mk/spec/foc_x86_64.mk

@@ -24,7 +24,7 @@ CC_OPT += -m64
 #
 # Also include less-specific configuration last
 #
-include $(call select_from_repositories,mk/spec-x86_64.mk)
-include $(call select_from_repositories,mk/spec-foc.mk)
+include $(call select_from_repositories,mk/spec/x86_64.mk)
+include $(call select_from_repositories,mk/spec/foc.mk)
 
 INC_DIR += $(L4F_INC_DIR) $(L4_INC_DIR)

repos/base-foc/src/core/rpi/target.mk

@@ -1,5 +0,0 @@
-REQUIRES += foc_rpi
-LD_TEXT_ADDR ?= 0x800000
-
-include $(REP_DIR)/src/core/arm/target.inc
-

repos/base-foc/src/core/spec/arm/target.inc

@@ -1,6 +1,6 @@
 REQUIRES += arm
-SRC_CC   += arm/platform_arm.cc \
-            arm/ipc_pager.cc
+SRC_CC   += spec/arm/platform_arm.cc \
+            spec/arm/ipc_pager.cc
 
 include $(REP_DIR)/src/core/target.inc
 

repos/base-foc/src/core/spec/arndale/target.mk

@@ -1,4 +1,4 @@
 LD_TEXT_ADDR = 0x80100000
 REQUIRES    += foc_arndale
 
-include $(REP_DIR)/src/core/arm/target.inc
+include $(REP_DIR)/src/core/spec/arm/target.inc

repos/base-foc/src/core/spec/imx53/target.mk

@@ -1,4 +1,4 @@
 LD_TEXT_ADDR = 0x70140000
 REQUIRES    += foc_imx53
 
-include $(REP_DIR)/src/core/arm/target.inc
+include $(REP_DIR)/src/core/spec/arm/target.inc

repos/base-foc/src/core/spec/odroid_x2/target.mk

@@ -1,4 +1,4 @@
 LD_TEXT_ADDR = 0x80100000
 REQUIRES += foc_odroid_x2
 
-include $(REP_DIR)/src/core/arm/target.inc
+include $(REP_DIR)/src/core/spec/arm/target.inc

repos/base-foc/src/core/spec/panda/target.mk

@@ -1,4 +1,4 @@
 LD_TEXT_ADDR = 0x80140000
 REQUIRES    += foc_panda
 
-include $(REP_DIR)/src/core/arm/target.inc
+include $(REP_DIR)/src/core/spec/arm/target.inc

repos/base-foc/src/core/spec/pbxa9/target.mk

@@ -1,4 +1,4 @@
 LD_TEXT_ADDR = 0x70490000
 REQUIRES    += foc_pbxa9
 
-include $(REP_DIR)/src/core/arm/target.inc
+include $(REP_DIR)/src/core/spec/arm/target.inc

repos/base-foc/src/core/spec/rpi/target.mk

@@ -0,0 +1,5 @@
+REQUIRES += foc_rpi
+LD_TEXT_ADDR ?= 0x800000
+
+include $(REP_DIR)/src/core/spec/arm/target.inc
+

repos/base-foc/src/core/spec/x86/target.inc

@@ -0,0 +1,10 @@
+LD_TEXT_ADDR = 0x500000
+REQUIRES    += x86
+SRC_CC      += io_port_session_component.cc \
+               spec/x86/ipc_pager.cc \
+               spec/x86/platform.cc
+
+vpath io_port_session_component.cc $(BASE_DIR)/src/core/spec/x86
+vpath platform_services.cc         $(BASE_DIR)/src/core/spec/x86
+
+include $(REP_DIR)/src/core/target.inc

repos/base-foc/src/core/spec/x86_32/target.mk

@@ -0,0 +1,4 @@
+REQUIRES += foc_x86_32
+SRC_CC   += spec/x86_32/ipc_pager.cc
+
+include $(REP_DIR)/src/core/spec/x86/target.inc

repos/base-foc/src/core/spec/x86_64/target.mk

@@ -0,0 +1,4 @@
+REQUIRES += foc_x86_64
+SRC_CC   += spec/x86_64/ipc_pager.cc
+
+include $(REP_DIR)/src/core/spec/x86/target.inc

repos/base-foc/src/core/x86/target.inc

@@ -1,10 +0,0 @@
-LD_TEXT_ADDR = 0x500000
-REQUIRES    += x86
-SRC_CC      += io_port_session_component.cc \
-               x86/ipc_pager.cc \
-               x86/platform.cc
-
-vpath io_port_session_component.cc $(BASE_DIR)/src/core/x86
-vpath platform_services.cc         $(BASE_DIR)/src/core/x86
-
-include $(REP_DIR)/src/core/target.inc

repos/base-foc/src/core/x86_32/target.mk

@@ -1,4 +0,0 @@
-REQUIRES += foc_x86_32
-SRC_CC   += x86_32/ipc_pager.cc
-
-include $(REP_DIR)/src/core/x86/target.inc

repos/base-foc/src/core/x86_64/target.mk

@@ -1,4 +0,0 @@
-REQUIRES += foc_x86_64
-SRC_CC   += x86_64/ipc_pager.cc
-
-include $(REP_DIR)/src/core/x86/target.inc

repos/base-foc/src/kernel/imx53/target.mk

@@ -1,4 +0,0 @@
-REQUIRES      = platform_imx53
-KERNEL_CONFIG = $(REP_DIR)/config/imx53.kernel
-
--include $(PRG_DIR)/../target.inc

repos/base-foc/src/kernel/pbxa9/target.mk

@@ -1,4 +0,0 @@
-REQUIRES      = platform_pbxa9
-KERNEL_CONFIG = $(REP_DIR)/config/pbxa9.kernel
-
--include $(PRG_DIR)/../target.inc

repos/base-foc/src/kernel/spec/arndale/target.mk

@@ -1,5 +1,5 @@
-REQUIRES       = platform_arndale
+REQUIRES       = arndale
 FIASCO_DIR    := $(call select_from_ports,foc)/src/kernel/foc/kernel/fiasco
 KERNEL_CONFIG  = $(REP_DIR)/config/arndale.kernel
 
--include $(PRG_DIR)/../target.inc
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/src/kernel/spec/imx53/target.mk

@@ -0,0 +1,4 @@
+REQUIRES      = imx53
+KERNEL_CONFIG = $(REP_DIR)/config/imx53.kernel
+
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/src/kernel/spec/odroid_x2/target.mk

@@ -1,5 +1,5 @@
-REQUIRES       = platform_odroid_x2
+REQUIRES       = odroid_x2
 FIASCO_DIR    := $(call select_from_ports,foc)/src/kernel/foc/kernel/fiasco
 KERNEL_CONFIG  = $(REP_DIR)/config/odroid_x2.kernel
 
--include $(PRG_DIR)/../target.inc
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/src/kernel/spec/panda/target.mk

@@ -1,5 +1,5 @@
-REQUIRES       = platform_panda
+REQUIRES       = panda
 FIASCO_DIR    := $(call select_from_ports,foc)/src/kernel/foc/kernel/fiasco
 KERNEL_CONFIG  = $(REP_DIR)/config/panda.kernel
 
--include $(PRG_DIR)/../target.inc
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/src/kernel/spec/pbxa9/target.mk

@@ -0,0 +1,4 @@
+REQUIRES      = pbxa9
+KERNEL_CONFIG = $(REP_DIR)/config/pbxa9.kernel
+
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/src/kernel/spec/rpi/target.mk

@@ -1,5 +1,5 @@
-REQUIRES       = platform_rpi
+REQUIRES       = rpi
 FIASCO_DIR    := $(call select_from_ports,foc)/src/kernel/foc/kernel/fiasco
 KERNEL_CONFIG  = $(REP_DIR)/config/rpi.kernel
 
--include $(PRG_DIR)/../target.inc
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/src/kernel/spec/x86_32/target.mk

@@ -1,4 +1,4 @@
 REQUIRES      = x86 32bit
 KERNEL_CONFIG = $(REP_DIR)/config/x86_32.kernel
 
--include $(PRG_DIR)/../target.inc
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/src/kernel/spec/x86_64/target.mk

@@ -1,4 +1,4 @@
 REQUIRES      = x86 64bit
 KERNEL_CONFIG = $(REP_DIR)/config/x86_64.kernel
 
--include $(PRG_DIR)/../target.inc
+-include $(PRG_DIR)/../../target.inc

repos/base-foc/src/lib/startup/_main_parent_cap.h

@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PLATFORM__MAIN_PARENT_CAP_H_
-#define _PLATFORM__MAIN_PARENT_CAP_H_
+#ifndef _LIB__STARTUP___MAIN_PARENT_CAP_H_
+#define _LIB__STARTUP___MAIN_PARENT_CAP_H_
 
 #include <base/native_types.h>
 
@@ -41,4 +41,4 @@ namespace Genode {
 	}
 }
 
-#endif /* _PLATFORM__MAIN_PARENT_CAP_H_ */
+#endif /* _LIB__STARTUP___MAIN_PARENT_CAP_H_ */

repos/base-hw/include/spec/arndale/vm_state.h

@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PLATFORM__ARNDALE__VM_STATE_H_
-#define _INCLUDE__PLATFORM__ARNDALE__VM_STATE_H_
+#ifndef _INCLUDE__SPEC__ARNDALE__VM_STATE_H_
+#define _INCLUDE__SPEC__ARNDALE__VM_STATE_H_
 
 /* Genode includes */
 #include <cpu/cpu_state.h>
@@ -77,4 +77,4 @@ struct Genode::Vm_state : Genode::Cpu_state_modes
 	unsigned         gic_irq;
 };
 
-#endif /* _INCLUDE__PLATFORM__ARNDALE__VM_STATE_H_ */
+#endif /* _INCLUDE__SPEC__ARNDALE__VM_STATE_H_ */

repos/base-hw/include/spec/imx53/vm_state.h

@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PLATFORM__IMX53__VM_STATE_H_
-#define _INCLUDE__PLATFORM__IMX53__VM_STATE_H_
+#ifndef _INCLUDE__SPEC__IMX53__VM_STATE_H_
+#define _INCLUDE__SPEC__IMX53__VM_STATE_H_
 
 /* Genode includes */
 #include <cpu/cpu_state.h>
@@ -33,4 +33,4 @@ struct Genode::Vm_state : Genode::Cpu_state_modes
 	Genode::addr_t ttbrc;
 };
 
-#endif /* _INCLUDE__PLATFORM__IMX53__VM_STATE_H_ */
+#endif /* _INCLUDE__SPEC__IMX53__VM_STATE_H_ */

repos/base-hw/lib/mk/core.inc

@@ -15,7 +15,7 @@ INC_DIR +=  $(REP_DIR)/src/core/include
 INC_DIR += $(BASE_DIR)/src/core/include
 INC_DIR += $(BASE_DIR)/src/base/include
 INC_DIR += $(BASE_DIR)/src/base/thread
-INC_DIR += $(BASE_DIR)/src/platform
+INC_DIR += $(BASE_DIR)/src/lib/startup
 
 # add C++ sources
 SRC_CC += console.cc
@@ -77,4 +77,4 @@ vpath boot_modules.s $(BOOT_MODULES_VPATH)
 # declare source locations
 vpath %  $(REP_DIR)/src/core
 vpath % $(BASE_DIR)/src/core
-vpath % $(BASE_DIR)/src/platform
+vpath % $(BASE_DIR)/src/lib/startup

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

@@ -17,4 +17,4 @@ SRC_CC += spec/arm_v6/cpu.cc
 SRC_S += spec/arm_v6/mode_transition.s
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/arm/core.inc
+include $(REP_DIR)/lib/mk/spec/arm/core.inc

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

@@ -14,4 +14,4 @@ SRC_CC += spec/arm_v7/cpu.cc
 SRC_S += spec/arm_v7/mode_transition.s
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/arm/core.inc
+include $(REP_DIR)/lib/mk/spec/arm/core.inc

repos/base-hw/lib/mk/spec/arndale/core.mk

@@ -21,4 +21,4 @@ SRC_CC += spec/arm_v7/virtualization/vm_session_component.cc
 SRC_S += spec/arm_v7/virtualization/mode_transition.s
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/exynos5/core.inc
+include $(REP_DIR)/lib/mk/spec/exynos5/core.inc

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

@@ -12,4 +12,4 @@ INC_DIR += $(REP_DIR)/src/core/include/spec/arm_gic
 SRC_CC += spec/cortex_a15/cpu.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/arm_v7/core.inc
+include $(REP_DIR)/lib/mk/spec/arm_v7/core.inc

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

@@ -12,4 +12,4 @@ SRC_CC += spec/arm/cpu.cc
 SRC_CC += spec/arm/kernel/cpu_context.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/arm_v7/core.inc
+include $(REP_DIR)/lib/mk/spec/arm_v7/core.inc

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

@@ -15,4 +15,4 @@ SRC_CC += spec/arm/kernel/cpu_context.cc
 SRC_CC += kernel/vm_thread.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/arm_v7/core.inc
+include $(REP_DIR)/lib/mk/spec/arm_v7/core.inc

repos/base-hw/lib/mk/spec/exynos5/core.inc

@@ -12,4 +12,4 @@ SRC_CC += spec/exynos5/platform_support.cc
 SRC_CC += spec/exynos5/cpu.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/cortex_a15/core.inc
+include $(REP_DIR)/lib/mk/spec/cortex_a15/core.inc

repos/base-hw/lib/mk/spec/imx53/core-trustzone.inc

@@ -10,4 +10,4 @@ INC_DIR += $(REP_DIR)/src/core/include/spec/imx53
 INC_DIR += $(REP_DIR)/src/core/include/spec/imx
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/cortex_a8/core.inc
+include $(REP_DIR)/lib/mk/spec/cortex_a8/core.inc

repos/base-hw/lib/mk/spec/imx53/core-trustzone_off.mk

@@ -12,5 +12,5 @@ SRC_CC += spec/imx53/pic.cc
 SRC_CC += platform_services.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/platform_imx53/core-trustzone.inc
+include $(REP_DIR)/lib/mk/spec/imx53/core-trustzone.inc
 include $(REP_DIR)/lib/mk/core-trustzone.inc

repos/base-hw/lib/mk/spec/imx53/core-trustzone_on.mk

@@ -22,5 +22,5 @@ SRC_CC += spec/arm_v7/trustzone/vm_session_component.cc
 SRC_S += spec/arm_v7/trustzone/mode_transition.s
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/platform_imx53/core-trustzone.inc
+include $(REP_DIR)/lib/mk/spec/imx53/core-trustzone.inc
 include $(REP_DIR)/lib/mk/core-trustzone.inc

repos/base-hw/lib/mk/spec/imx6/core.mk

@@ -15,4 +15,4 @@ SRC_CC += platform_services.cc
 SRC_CC += spec/imx6/platform_support.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/cortex_a9/core.inc
+include $(REP_DIR)/lib/mk/spec/cortex_a9/core.inc

repos/base-hw/lib/mk/spec/odroid_xu/core.mk

@@ -12,4 +12,4 @@ SRC_CC += kernel/vm_thread.cc
 SRC_CC += spec/arm/kernel/cpu_context.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/exynos5/core.inc
+include $(REP_DIR)/lib/mk/spec/exynos5/core.inc

repos/base-hw/lib/mk/spec/panda/core.mk

@@ -14,4 +14,4 @@ SRC_CC += platform_services.cc
 SRC_CC += spec/panda/platform_support.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/cortex_a9/core.inc
+include $(REP_DIR)/lib/mk/spec/cortex_a9/core.inc

repos/base-hw/lib/mk/spec/pbxa9/core.mk

@@ -14,4 +14,4 @@ SRC_CC += platform_services.cc
 SRC_CC += spec/pbxa9/platform_support.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/cortex_a9/core.inc
+include $(REP_DIR)/lib/mk/spec/cortex_a9/core.inc

repos/base-hw/lib/mk/spec/rpi/core.mk

@@ -13,4 +13,4 @@ SRC_CC += platform_services.cc
 SRC_CC += spec/rpi/platform_support.cc
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/arm_v6/core.inc
+include $(REP_DIR)/lib/mk/spec/arm_v6/core.inc