base: remove SPEC variables of boards (fix #3971)

* Remove SPEC declarations from mk/spec
* Remove all board-specific REQUIRE declaratiions left
* Replace [have_spec <board>] run-script declarations with have_board where necessary
* Remove addition of BOARD variable to SPECS in toplevel Makefile
* Move board-specific directories in base-hw out of specs

repos/base-fiasco/etc/specs.conf

@@ -1 +1 @@
-SPECS += fiasco x86_32
+SPECS += fiasco

repos/base-foc/etc/board.conf

@@ -0,0 +1 @@
+BOARD ?= unknown

repos/base-foc/etc/specs.conf

@@ -1,5 +1 @@
 SPECS += foc
-
-ifneq ($(filter x86_%,$(SPECS)),)
-SPECS += pci acpi ps2 vesa framebuffer
-endif

repos/base-foc/lib/import/import-syscall-foc.mk

@@ -1,4 +1,6 @@
-L4_INCLUDE_DIR := $(LIB_CACHE_DIR)/syscall-foc/include
+include $(call select_from_repositories,etc/board.conf)
+
+L4_INCLUDE_DIR := $(LIB_CACHE_DIR)/syscall-foc-$(BOARD)/build/include
 
 ifeq ($(filter-out $(SPECS),x86_32),)
   INC_DIR += $(L4_INCLUDE_DIR)/x86/l4f $(L4_INCLUDE_DIR)/x86

repos/base-foc/lib/mk/kernel-foc.inc

@@ -1,5 +1,4 @@
-BOARD        ?= unknown
+FOC_BUILD_DIR  = $(shell pwd)/build
-FOC_BUILD_DIR = $(shell pwd)/$(BOARD)-build
 FOC            = $(FOC_BUILD_DIR)/foc
 FOC_SRC       := $(call select_from_ports,foc)/src/kernel/foc/kernel/fiasco
 
@@ -30,7 +29,7 @@ $(FOC): $(FOC_BUILD_DIR)
 # library.
 #
 
-LIBS += syscall-foc
+LIBS += syscall-foc-$(BOARD)
 
 PKGS := l4re-core/crtn \
         l4re-core/uclibc-headers \
@@ -42,7 +41,7 @@ PKGS := l4re-core/crtn \
         drivers-frst/include drivers-frst/of drivers-frst/uart \
         bootstrap
 
-L4_BUILD_DIR := $(LIB_CACHE_DIR)/syscall-foc/$(BOARD)-build
+L4_BUILD_DIR := $(LIB_CACHE_DIR)/syscall-foc-$(BOARD)/build
 
 #
 # Supress several warnings especially of the uclibc-minimal

repos/base-foc/lib/mk/kernel-foc.mk

@@ -0,0 +1,3 @@
+include $(REP_DIR)/etc/board.conf
+
+LIBS += kernel-foc-$(BOARD)

repos/base-foc/lib/mk/spec/arm/kernel-foc-imx6q_sabrelite.mk

@@ -0,0 +1,4 @@
+override BOARD := imx6q_sabrelite
+KERNEL_CONFIG  := $(REP_DIR)/config/$(BOARD).kernel
+
+include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/arm/kernel-foc-imx7d_sabre.mk

@@ -0,0 +1,4 @@
+override BOARD := imx7d_sabre
+KERNEL_CONFIG  := $(REP_DIR)/config/$(BOARD).kernel
+
+include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/arm/kernel-foc-pbxa9.mk

@@ -0,0 +1,4 @@
+override BOARD := pbxa9
+KERNEL_CONFIG  := $(REP_DIR)/config/$(BOARD).kernel
+
+include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/arm/kernel-foc-rpi.mk

@@ -0,0 +1,4 @@
+override BOARD := rpi
+KERNEL_CONFIG  := $(REP_DIR)/config/$(BOARD).kernel
+
+include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/arm/syscall-foc-imx6q_sabrelite.mk

@@ -0,0 +1,4 @@
+override BOARD := imx6q_sabrelite
+L4_ARCH        := arm_armv7a
+
+include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc

repos/base-foc/lib/mk/spec/arm/syscall-foc-imx7d_sabre.mk

@@ -0,0 +1,4 @@
+override BOARD := imx7d_sabre
+L4_ARCH        := arm_armv7a
+
+include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc

repos/base-foc/lib/mk/spec/arm/syscall-foc-pbxa9.mk

@@ -0,0 +1,4 @@
+override BOARD := pbxa9
+L4_ARCH        := arm_armv7a
+
+include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc

repos/base-foc/lib/mk/spec/arm/syscall-foc-rpi.mk

@@ -0,0 +1,4 @@
+override BOARD := rpi
+L4_ARCH        := arm_armv6
+
+include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc

repos/base-foc/lib/mk/spec/arm/syscall-foc.inc

@@ -1,6 +1,7 @@
 L4_INC_TARGETS = arm/l4/sys \
                  arm/l4f/l4/sys \
                  arm/l4/vcpu
+L4_CONFIG     := $(call select_from_repositories,config/$(BOARD).user)
 
 CC_OPT += -Iinclude/arm
 

repos/base-foc/lib/mk/spec/arm_64/kernel-foc-rpi3.mk

@@ -0,0 +1,4 @@
+override BOARD := rpi3
+KERNEL_CONFIG  := $(REP_DIR)/config/$(BOARD).kernel
+
+include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/arm_64/syscall-foc-rpi3.mk

@@ -1,6 +1,6 @@
-L4_CONFIG := $(call select_from_repositories,config/rpi3.user)
+override BOARD := rpi3
-
+L4_ARCH        := arm64_armv8a
-L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/rpi3-build/bin/arm64_armv8a
+L4_CONFIG      := $(call select_from_repositories,config/$(BOARD).user)
 
 L4_INC_TARGETS = arm64/l4/sys \
                  arm64/l4f/l4/sys \

repos/base-foc/lib/mk/spec/imx6q_sabrelite/kernel-foc.mk

@@ -1,3 +0,0 @@
-KERNEL_CONFIG := $(REP_DIR)/config/imx6q_sabrelite.kernel
-
-include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/imx6q_sabrelite/syscall-foc.mk

@@ -1,5 +0,0 @@
-L4_CONFIG := $(call select_from_repositories,config/imx6q_sabrelite.user)
-
-L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/imx6q_sabrelite-build/bin/arm_armv7a
-
-include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc

repos/base-foc/lib/mk/spec/imx7d_sabre/kernel-foc.mk

@@ -1,3 +0,0 @@
-KERNEL_CONFIG := $(REP_DIR)/config/imx7.kernel
-
-include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/imx7d_sabre/syscall-foc.mk

@@ -1,5 +0,0 @@
-L4_CONFIG := $(call select_from_repositories,config/imx7.user)
-
-L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/imx7d_sabre-build/bin/arm_armv7a
-
-include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc

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

@@ -1,3 +0,0 @@
-KERNEL_CONFIG := $(REP_DIR)/config/pbxa9.kernel
-
-include $(REP_DIR)/lib/mk/kernel-foc.inc

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

@@ -1,5 +0,0 @@
-L4_CONFIG := $(call select_from_repositories,config/pbxa9.user)
-
-L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/pbxa9-build/bin/arm_armv7a
-
-include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc

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

@@ -1,3 +0,0 @@
-KERNEL_CONFIG := $(REP_DIR)/config/rpi.kernel
-
-include $(REP_DIR)/lib/mk/kernel-foc.inc

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

@@ -1,5 +0,0 @@
-L4_CONFIG := $(call select_from_repositories,config/rpi.user)
-
-L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/rpi-build/bin/arm_armv6
-
-include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc

repos/base-foc/lib/mk/spec/rpi3/kernel-foc.mk

@@ -1,3 +0,0 @@
-KERNEL_CONFIG := $(REP_DIR)/config/rpi3.kernel
-
-include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/x86_32/kernel-foc-pc.mk

@@ -0,0 +1,4 @@
+override BOARD := pc
+KERNEL_CONFIG  := $(REP_DIR)/config/x86_32.kernel
+
+include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/x86_32/kernel-foc.mk

@@ -1,3 +0,0 @@
-KERNEL_CONFIG := $(REP_DIR)/config/x86_32.kernel
-
-include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/x86_32/syscall-foc-pc.mk

@@ -1,11 +1,11 @@
+override BOARD := pc
+L4_ARCH        := x86_586
 L4_CONFIG      := $(call select_from_repositories,config/x86_32.user)
 
 L4_INC_TARGETS := x86/l4/sys x86/l4f/l4/sys x86/l4/vcpu
 
 CC_OPT += -Iinclude/x86
 
-L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/pc-build/bin/x86_586
-
 include $(REP_DIR)/lib/mk/spec/x86/syscall-foc.inc
 
 vpath syscalls_direct.S $(L4_PKG_DIR)/l4sys/lib/src/ARCH-x86

repos/base-foc/lib/mk/spec/x86_64/kernel-foc-pc.mk

@@ -0,0 +1,4 @@
+override BOARD := pc
+KERNEL_CONFIG  := $(REP_DIR)/config/x86_64.kernel
+
+include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/x86_64/kernel-foc.mk

@@ -1,3 +0,0 @@
-KERNEL_CONFIG := $(REP_DIR)/config/x86_64.kernel
-
-include $(REP_DIR)/lib/mk/kernel-foc.inc

repos/base-foc/lib/mk/spec/x86_64/syscall-foc-pc.mk

@@ -1,9 +1,9 @@
+override BOARD := pc
+L4_ARCH        := amd64_K8
 L4_CONFIG      := $(call select_from_repositories,config/x86_64.user)
 
 L4_INC_TARGETS := amd64/l4/sys amd64/l4f/l4/sys amd64/l4/vcpu
 
 CC_OPT += -Iinclude/amd64
 
-L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/pc-build/bin/amd64_K8
-
 include $(REP_DIR)/lib/mk/spec/x86/syscall-foc.inc

repos/base-foc/lib/mk/syscall-foc.inc

@@ -6,9 +6,9 @@
 # userland (L4re) that comes with Fiasco.OC.
 #
 
-BOARD        ?= unknown
 L4_SRC_DIR   := $(call select_from_ports,foc)/src/kernel/foc
-L4_BUILD_DIR := $(shell pwd)/$(BOARD)-build
+L4_BUILD_DIR := $(shell pwd)/build
+L4_BIN_DIR   := $(LIB_CACHE_DIR)/syscall-foc-$(BOARD)/build/bin/$(L4_ARCH)
 
 #
 # Create mirror for architecture-specific L4sys header files

repos/base-foc/lib/mk/syscall-foc.mk

@@ -0,0 +1,4 @@
+include $(REP_DIR)/etc/board.conf
+
+LIBS += syscall-foc-$(BOARD)
+

repos/base-foc/recipes/src/base-foc_content.inc

@@ -26,6 +26,14 @@ src/kernel/foc: src/kernel
 	tar -C $(KERNEL_PORT_DIR)/src/kernel/foc --exclude=.git -cf - . |\
 		tar -C $@ -xf -
 
+content: etc/board.conf remove_other_board_libs
+
+etc/board.conf:
+	echo "BOARD = $(BOARD)" > etc/board.conf
+
+remove_other_board_libs: lib/mk
+	find lib/mk/spec -name kernel-foc-*.mk -o -name syscall-foc-*.mk |\
+		grep -v "foc-$(BOARD).mk" | xargs rm -rf
 
 content:
 	for spec in x86_32 x86_64 arm arm_64; do \
@@ -33,11 +41,3 @@ content:
 	  done;
 	sed -i "s/ld-foc/ld/"           src/lib/ld/foc/target.mk
 	sed -i "s/foc_timer_drv/timer/" src/timer/foc/target.mk
-	sed -i "s/BOARD.*unknown/BOARD = $(BOARD)/" src/core/foc/target.mk
-	sed -i "s/BOARD.*unknown/BOARD = $(BOARD)/" src/kernel/foc/target.mk
-	sed -i "s/BOARD.*unknown/BOARD = $(BOARD)/" lib/mk/syscall-foc.inc
-	sed -i "s/BOARD.*unknown/BOARD = $(BOARD)/" lib/mk/kernel-foc.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += $(BOARD)" >> etc/specs.conf

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

@@ -1,4 +1,5 @@
-BOARD    ?= unknown
+include $(REP_DIR)/etc/board.conf
+
 TARGET   := foc-$(BOARD)
 LIBS     := core-foc
 CORE_OBJ := core-foc-$(BOARD).o

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

@@ -1,8 +1,9 @@
-BOARD ?= unknown
 TARGET = kernel-foc
 LIBS   = kernel-foc
 
+include $(REP_DIR)/etc/board.conf
+
 $(TARGET): $(INSTALL_DIR)/foc-$(BOARD)
 
-$(INSTALL_DIR)/foc-$(BOARD): $(LIB_CACHE_DIR)/kernel-foc/$(BOARD)-build/fiasco
+$(INSTALL_DIR)/foc-$(BOARD): $(LIB_CACHE_DIR)/kernel-foc-$(BOARD)/build/fiasco
 	$(VERBOSE)ln -sf $< $@

repos/base-hw/etc/specs.conf

@@ -1,18 +1 @@
-SPECS += genode hw
+SPECS += hw
-
-ifeq ($(filter-out $(SPECS),x86_64),)
-SPECS += pci ps2 vesa framebuffer
-
-ifneq ($(filter-out $(SPECS),muen),)
-SPECS += acpi
-endif
-endif
-
-ifeq ($(filter-out $(SPECS),imx53_qsb_tz),)
-SPECS += imx53_qsb trustzone
-endif
-
-ifeq ($(filter-out $(SPECS),usb_armory),)
-SPECS += trustzone
-endif
-

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

@@ -1,6 +1,6 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/rpi
+INC_DIR += $(REP_DIR)/src/bootstrap/board/rpi
 
-SRC_CC  += bootstrap/spec/rpi/platform.cc
+SRC_CC  += bootstrap/board/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

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

@@ -5,7 +5,7 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/rpi
+INC_DIR += $(REP_DIR)/src/core/board/rpi
 
 # add C++ sources
 SRC_CC += platform_services.cc

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

@@ -1,7 +1,7 @@
 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
+INC_DIR += $(BASE_HW_DIR)/src/bootstrap/board/imx53_qsb
 
 SRC_S   += bootstrap/spec/arm/crt0.s
 

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

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

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

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

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

@@ -1,4 +1,4 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx6q_sabrelite
+INC_DIR += $(REP_DIR)/src/bootstrap/board/imx6q_sabrelite
 
 SRC_S   += bootstrap/spec/arm/crt0.s
 

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

@@ -1,8 +1,8 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx7d_sabre
+INC_DIR += $(REP_DIR)/src/bootstrap/board/imx7d_sabre
 
 SRC_CC  += bootstrap/spec/arm/cortex_a15_cpu.cc
 SRC_CC  += bootstrap/spec/arm/gicv2.cc
-SRC_CC  += bootstrap/spec/imx7d_sabre/platform.cc
+SRC_CC  += bootstrap/board/imx7d_sabre/platform.cc
 SRC_CC  += bootstrap/spec/arm/arm_v7_cpu.cc
 SRC_CC  += hw/spec/32bit/memory_map.cc
 SRC_S   += bootstrap/spec/arm/crt0.s

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

@@ -1,4 +1,4 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/nit6_solox
+INC_DIR += $(REP_DIR)/src/bootstrap/board/nit6_solox
 
 SRC_S   += bootstrap/spec/arm/crt0.s
 

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

@@ -1,11 +1,11 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/pbxa9
+INC_DIR += $(REP_DIR)/src/bootstrap/board/pbxa9
 
 SRC_S   += bootstrap/spec/arm/crt0.s
 
 SRC_CC  += bootstrap/spec/arm/cpu.cc
 SRC_CC  += bootstrap/spec/arm/cortex_a9_mmu.cc
 SRC_CC  += bootstrap/spec/arm/gicv2.cc
-SRC_CC  += bootstrap/spec/pbxa9/platform.cc
+SRC_CC  += bootstrap/board/pbxa9/platform.cc
 SRC_CC  += bootstrap/spec/arm/arm_v7_cpu.cc
 SRC_CC  += hw/spec/32bit/memory_map.cc
 

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

@@ -1,11 +1,11 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/usb_armory
+INC_DIR += $(REP_DIR)/src/bootstrap/board/usb_armory
 
 SRC_S   += bootstrap/spec/arm/crt0.s
 
+SRC_CC  += bootstrap/board/usb_armory/platform.cc
 SRC_CC  += bootstrap/spec/arm/cortex_a8_mmu.cc
 SRC_CC  += bootstrap/spec/arm/cpu.cc
 SRC_CC  += bootstrap/spec/arm/imx_tzic.cc
-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
 

repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk

@@ -1,9 +1,9 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/virt_qemu
+INC_DIR += $(REP_DIR)/src/bootstrap/board/virt_qemu
 
+SRC_CC  += bootstrap/board/virt_qemu/platform.cc
 SRC_CC  += bootstrap/spec/arm/arm_v7_cpu.cc
 SRC_CC  += bootstrap/spec/arm/cortex_a15_cpu.cc
 SRC_CC  += bootstrap/spec/arm/gicv2.cc
-SRC_CC  += bootstrap/spec/virt_qemu/platform.cc
 SRC_CC  += hw/spec/32bit/memory_map.cc
 SRC_S   += bootstrap/spec/arm/crt0.s
 

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

@@ -1,4 +1,4 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/wand_quad
+INC_DIR += $(REP_DIR)/src/bootstrap/board/wand_quad
 
 SRC_S   += bootstrap/spec/arm/crt0.s
 

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

@@ -1,11 +1,11 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/zynq_qemu
+INC_DIR += $(REP_DIR)/src/bootstrap/board/zynq_qemu
 
 SRC_S   += bootstrap/spec/arm/crt0.s
 
+SRC_CC  += bootstrap/board/zynq_qemu/platform.cc
 SRC_CC  += bootstrap/spec/arm/cpu.cc
 SRC_CC  += bootstrap/spec/arm/cortex_a9_mmu.cc
 SRC_CC  += bootstrap/spec/arm/gicv2.cc
-SRC_CC  += bootstrap/spec/zynq/platform.cc
 SRC_CC  += bootstrap/spec/arm/arm_v7_cpu.cc
 SRC_CC  += hw/spec/32bit/memory_map.cc
 

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

@@ -6,8 +6,7 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/imx53_qsb
+INC_DIR += $(REP_DIR)/src/core/board/imx53_qsb
-INC_DIR += $(REP_DIR)/src/core/spec/imx53
 
 SRC_CC += spec/arm/imx_epit.cc
 SRC_CC += spec/arm/imx_tzic.cc

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

@@ -1,5 +1,4 @@
 INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/trustzone
-INC_DIR += $(REP_DIR)/src/core/spec/imx53/trustzone
 
 SRC_CC += kernel/vm_thread_on.cc
 SRC_CC += spec/arm_v7/trustzone/kernel/vm.cc

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

@@ -7,7 +7,7 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/imx6q_sabrelite
+INC_DIR += $(REP_DIR)/src/core/board/imx6q_sabrelite
 
 # add C++ sources
 SRC_CC += platform_services.cc

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

@@ -5,7 +5,7 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/imx7d_sabre
+INC_DIR += $(REP_DIR)/src/core/board/imx7d_sabre
 INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization
 
 # add C++ sources

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

@@ -7,7 +7,7 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/nit6_solox
+INC_DIR += $(REP_DIR)/src/core/board/nit6_solox
 
 # add C++ sources
 SRC_CC += platform_services.cc

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

@@ -6,7 +6,7 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/pbxa9
+INC_DIR += $(REP_DIR)/src/core/board/pbxa9
 
 # add C++ sources
 SRC_CC += platform_services.cc

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

@@ -5,10 +5,8 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/usb_armory
+INC_DIR += $(REP_DIR)/src/core/board/usb_armory
-INC_DIR += $(REP_DIR)/src/core/spec/imx53
 INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/trustzone
-INC_DIR += $(REP_DIR)/src/core/spec/imx53/trustzone
 
 # add C++ sources
 SRC_CC += kernel/vm_thread_on.cc

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

@@ -1,4 +1,4 @@
-INC_DIR += $(REP_DIR)/src/core/spec/virt_qemu
+INC_DIR += $(REP_DIR)/src/core/board/virt_qemu
 INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization
 
 # add C++ sources

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

@@ -7,7 +7,7 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/wand_quad
+INC_DIR += $(REP_DIR)/src/core/board/wand_quad
 
 # add C++ sources
 SRC_CC += platform_services.cc

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

@@ -5,9 +5,9 @@
 #
 
 # add include paths
-INC_DIR += $(REP_DIR)/src/core/spec/zynq_qemu
+INC_DIR += $(REP_DIR)/src/core/board/zynq_qemu
 
 NR_OF_CPUS = 1
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/spec/zynq/core-hw.inc
+include $(REP_DIR)/lib/mk/spec/arm_v7/core-hw-zynq.inc

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

@@ -1,8 +1,8 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx8q_evk
+INC_DIR += $(REP_DIR)/src/bootstrap/board/imx8q_evk
 
+SRC_CC  += bootstrap/board/imx8q_evk/platform.cc
 SRC_CC  += bootstrap/spec/arm/gicv3.cc
 SRC_CC  += bootstrap/spec/arm_64/cortex_a53_mmu.cc
-SRC_CC  += bootstrap/spec/imx8q_evk/platform.cc
 SRC_CC  += lib/base/arm_64/kernel/interface.cc
 SRC_CC  += spec/64bit/memory_map.cc
 SRC_S   += bootstrap/spec/arm_64/crt0.s

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

@@ -1,7 +1,7 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/rpi3
+INC_DIR += $(REP_DIR)/src/bootstrap/board/rpi3
 
 SRC_CC  += bootstrap/spec/arm_64/cortex_a53_mmu.cc
-SRC_CC  += bootstrap/spec/rpi3/platform.cc
+SRC_CC  += bootstrap/board/rpi3/platform.cc
 SRC_CC  += lib/base/arm_64/kernel/interface.cc
 SRC_CC  += spec/64bit/memory_map.cc
 SRC_S   += bootstrap/spec/arm_64/crt0.s

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

@@ -1,8 +1,8 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/spec/virt_qemu_64
+INC_DIR += $(REP_DIR)/src/bootstrap/board/virt_qemu_64
 
 SRC_CC  += bootstrap/spec/arm/gicv3.cc
 SRC_CC  += bootstrap/spec/arm_64/cortex_a53_mmu.cc
-SRC_CC  += bootstrap/spec/virt_qemu_64/platform.cc
+SRC_CC  += bootstrap/board/virt_qemu_64/platform.cc
 SRC_CC  += lib/base/arm_64/kernel/interface.cc
 SRC_CC  += spec/64bit/memory_map.cc
 SRC_S   += bootstrap/spec/arm_64/crt0.s

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

@@ -1,4 +1,4 @@
-INC_DIR += $(REP_DIR)/src/core/spec/imx8q_evk
+INC_DIR += $(REP_DIR)/src/core/board/imx8q_evk
 INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization
 
 # add C++ sources

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

@@ -1,4 +1,4 @@
-INC_DIR += $(REP_DIR)/src/core/spec/rpi3
+INC_DIR += $(REP_DIR)/src/core/board/rpi3
 
 # add C++ sources
 SRC_CC += kernel/vm_thread_off.cc

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

@@ -1,4 +1,4 @@
-INC_DIR += $(REP_DIR)/src/core/spec/virt_qemu_64
+INC_DIR += $(REP_DIR)/src/core/board/virt_qemu_64
 INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization
 
 # add C++ sources

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

@@ -1,4 +1,4 @@
-REQUIRES = muen
+REQUIRES = x86_64
 
 INC_DIR += $(REP_DIR)/src/bootstrap/spec/x86_64
 

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

@@ -5,7 +5,7 @@
 # \date   2012-10-04
 #
 
-REQUIRES = muen
+REQUIRES = x86_64
 
 LIBS += sinfo-muen
 

repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk

@@ -1,7 +1,3 @@
 BOARD = imx53_qsb
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += imx53_qsb" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk

@@ -1,7 +1,3 @@
 BOARD = imx53_qsb_tz
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += imx53_qsb trustzone" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk

@@ -1,7 +1,3 @@
 BOARD = imx6q_sabrelite
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += imx6q_sabrelite" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk

@@ -1,7 +1,3 @@
 BOARD = imx7d_sabre
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += imx7d_sabre" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk

@@ -1,7 +1,3 @@
 BOARD = imx8q_evk
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += imx8q_evk" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-muen/content.mk

@@ -2,12 +2,3 @@ BOARD = muen
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
 
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += muen" >> etc/specs.conf
-
-content: src/acpi/target.mk
-src/acpi/target.mk:
-	mkdir $(dir $@)
-	cp $(REP_DIR)/recipes/src/base-hw-muen/acpi_target_mk $@
-

repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk

@@ -1,7 +1,3 @@
 BOARD = nit6_solox
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += nit6_solox" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-pbxa9/content.mk

@@ -1,7 +1,3 @@
 BOARD = pbxa9
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += pbxa9" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-rpi/content.mk

@@ -1,7 +1,3 @@
 BOARD = rpi
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += rpi" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-rpi3/content.mk

@@ -1,7 +1,3 @@
 BOARD = rpi3
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += rpi3" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk

@@ -1,7 +1,3 @@
 BOARD = virt_qemu
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += virt_qemu" >> etc/specs.conf

repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk

@@ -1,7 +1,3 @@
 BOARD = zynq_qemu
 
 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
-
-content: enable_board_spec
-enable_board_spec: etc/specs.conf
-	echo "SPECS += zynq_qemu" >> etc/specs.conf