diff --git a/lib/mk/spec/zynq_parallella/bootstrap-hw.mk b/lib/mk/spec/zynq_parallella/bootstrap-hw.mk
index 1de3960..ce5c172 100644
--- a/lib/mk/spec/zynq_parallella/bootstrap-hw.mk
+++ b/lib/mk/spec/zynq_parallella/bootstrap-hw.mk
@@ -8,13 +8,13 @@ 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/pic.cc
-SRC_CC  += bootstrap/spec/zynq_parallella/platform.cc
+SRC_CC  += bootstrap/spec/zynq/platform.cc
 SRC_CC  += hw/spec/arm/arm_v7_cpu.cc
 SRC_CC  += hw/spec/32bit/memory_map.cc
 
-NR_OF_CPUS = 1
+NR_OF_CPUS = 2
 
-vpath bootstrap/spec/zynq_parallella/platform.cc $(REP_DIR)/src/
+vpath bootstrap/spec/zynq/platform.cc $(BASE_HW_DIR)/src/
 
 include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc
 
diff --git a/lib/mk/spec/zynq_parallella/core-hw.mk b/lib/mk/spec/zynq_parallella/core-hw.mk
index 12accab..8cc9ec2 100644
--- a/lib/mk/spec/zynq_parallella/core-hw.mk
+++ b/lib/mk/spec/zynq_parallella/core-hw.mk
@@ -10,7 +10,7 @@ BASE_HW_DIR := $(TMP:%lib/mk/spec/zynq/core-hw.inc=%)
 # add include paths
 INC_DIR += $(REP_DIR)/src/core/include/spec/zynq_parallella
 
-NR_OF_CPUS = 1
+NR_OF_CPUS = 2
 
 # include less specific configuration
 include $(BASE_HW_DIR)/lib/mk/spec/zynq/core-hw.inc
diff --git a/lib/mk/spec/zynq_zc702/bootstrap-hw.mk b/lib/mk/spec/zynq_zc702/bootstrap-hw.mk
index 022fac8..3477815 100644
--- a/lib/mk/spec/zynq_zc702/bootstrap-hw.mk
+++ b/lib/mk/spec/zynq_zc702/bootstrap-hw.mk
@@ -8,13 +8,13 @@ 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/pic.cc
-SRC_CC  += bootstrap/spec/zynq_zc702/platform.cc
+SRC_CC  += bootstrap/spec/zynq/platform.cc
 SRC_CC  += hw/spec/arm/arm_v7_cpu.cc
 SRC_CC  += hw/spec/32bit/memory_map.cc
 
-NR_OF_CPUS = 1
+NR_OF_CPUS = 2
 
-vpath bootstrap/spec/zynq_zc702/platform.cc $(REP_DIR)/src/
+vpath bootstrap/spec/zynq/platform.cc $(BASE_HW_DIR)/src/
 
 include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc
 
diff --git a/lib/mk/spec/zynq_zc702/core-hw.mk b/lib/mk/spec/zynq_zc702/core-hw.mk
index fbc2a0c..dc98362 100644
--- a/lib/mk/spec/zynq_zc702/core-hw.mk
+++ b/lib/mk/spec/zynq_zc702/core-hw.mk
@@ -10,7 +10,7 @@ BASE_HW_DIR := $(TMP:%lib/mk/spec/zynq/core-hw.inc=%)
 # add include paths
 INC_DIR += $(REP_DIR)/src/core/include/spec/zynq_zc702
 
-NR_OF_CPUS = 1
+NR_OF_CPUS = 2
 
 # include less specific configuration
 include $(BASE_HW_DIR)/lib/mk/spec/zynq/core-hw.inc
diff --git a/lib/mk/spec/zynq_zc706/bootstrap-hw.mk b/lib/mk/spec/zynq_zc706/bootstrap-hw.mk
index e2d0cc1..f773b83 100644
--- a/lib/mk/spec/zynq_zc706/bootstrap-hw.mk
+++ b/lib/mk/spec/zynq_zc706/bootstrap-hw.mk
@@ -8,13 +8,13 @@ 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/pic.cc
-SRC_CC  += bootstrap/spec/zynq_zc706/platform.cc
+SRC_CC  += bootstrap/spec/zynq/platform.cc
 SRC_CC  += hw/spec/arm/arm_v7_cpu.cc
 SRC_CC  += hw/spec/32bit/memory_map.cc
 
-NR_OF_CPUS = 1
+NR_OF_CPUS = 2
 
-vpath bootstrap/spec/zynq_zc706/platform.cc $(REP_DIR)/src/
+vpath bootstrap/spec/zynq/platform.cc $(BASE_HW_DIR)/src/
 
 include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc
 
diff --git a/lib/mk/spec/zynq_zc706/core-hw.mk b/lib/mk/spec/zynq_zc706/core-hw.mk
index 6a4f59e..f089b5f 100644
--- a/lib/mk/spec/zynq_zc706/core-hw.mk
+++ b/lib/mk/spec/zynq_zc706/core-hw.mk
@@ -10,7 +10,7 @@ BASE_HW_DIR := $(TMP:%lib/mk/spec/zynq/core-hw.inc=%)
 # add include paths
 INC_DIR += $(REP_DIR)/src/core/include/spec/zynq_zc706
 
-NR_OF_CPUS = 1
+NR_OF_CPUS = 2
 
 # include less specific configuration
 include $(BASE_HW_DIR)/lib/mk/spec/zynq/core-hw.inc
diff --git a/lib/mk/spec/zynq_zedboard/bootstrap-hw.mk b/lib/mk/spec/zynq_zedboard/bootstrap-hw.mk
index c21f03f..4ffd745 100644
--- a/lib/mk/spec/zynq_zedboard/bootstrap-hw.mk
+++ b/lib/mk/spec/zynq_zedboard/bootstrap-hw.mk
@@ -8,13 +8,13 @@ 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/pic.cc
-SRC_CC  += bootstrap/spec/zynq_zedboard/platform.cc
+SRC_CC  += bootstrap/spec/zynq/platform.cc
 SRC_CC  += hw/spec/arm/arm_v7_cpu.cc
 SRC_CC  += hw/spec/32bit/memory_map.cc
 
-NR_OF_CPUS = 1
+NR_OF_CPUS = 2
 
-vpath bootstrap/spec/zynq_zedboard/platform.cc $(REP_DIR)/src/
+vpath bootstrap/spec/zynq/platform.cc $(BASE_HW_DIR)/src/
 
 include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc
 
diff --git a/lib/mk/spec/zynq_zedboard/core-hw.mk b/lib/mk/spec/zynq_zedboard/core-hw.mk
index 5dbd972..d2e5ee7 100644
--- a/lib/mk/spec/zynq_zedboard/core-hw.mk
+++ b/lib/mk/spec/zynq_zedboard/core-hw.mk
@@ -10,7 +10,7 @@ BASE_HW_DIR := $(TMP:%lib/mk/spec/zynq/core-hw.inc=%)
 # add include paths
 INC_DIR += $(REP_DIR)/src/core/include/spec/zynq_zedboard
 
-NR_OF_CPUS = 1
+NR_OF_CPUS = 2
 
 # include less specific configuration
 include $(BASE_HW_DIR)/lib/mk/spec/zynq/core-hw.inc
diff --git a/src/bootstrap/spec/zynq_parallella/platform.cc b/src/bootstrap/spec/zynq_parallella/platform.cc
deleted file mode 100644
index 4602b30..0000000
--- a/src/bootstrap/spec/zynq_parallella/platform.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * \brief   Platform implementations specific for base-hw and Zynq
- * \author  Johannes Schlatow
- * \author  Stefan Kalkowski
- * \date    2014-12-15
- */
-
-/*
- * Copyright (C) 2014-2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-/* core includes */
-#include <platform.h>
-
-using namespace Board;
-
-Bootstrap::Platform::Board::Board()
-: early_ram_regions(Memory_region { RAM_0_BASE + 0x1000,
-                                    RAM_0_SIZE - 0x1000 }),
-  late_ram_regions(Memory_region { RAM_0_BASE, 0x1000 }),
-  core_mmio(Memory_region { CORTEX_A9_PRIVATE_MEM_BASE,
-                            CORTEX_A9_PRIVATE_MEM_SIZE },
-            Memory_region { UART_1_MMIO_BASE,
-                            UART_SIZE },
-            Memory_region { PL310_MMIO_BASE,
-                            PL310_MMIO_SIZE }) { }
-
-
-bool Bootstrap::Cpu::errata(Bootstrap::Cpu::Errata err) {
-	return false; }
diff --git a/src/bootstrap/spec/zynq_zc702/platform.cc b/src/bootstrap/spec/zynq_zc702/platform.cc
deleted file mode 100644
index 4602b30..0000000
--- a/src/bootstrap/spec/zynq_zc702/platform.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * \brief   Platform implementations specific for base-hw and Zynq
- * \author  Johannes Schlatow
- * \author  Stefan Kalkowski
- * \date    2014-12-15
- */
-
-/*
- * Copyright (C) 2014-2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-/* core includes */
-#include <platform.h>
-
-using namespace Board;
-
-Bootstrap::Platform::Board::Board()
-: early_ram_regions(Memory_region { RAM_0_BASE + 0x1000,
-                                    RAM_0_SIZE - 0x1000 }),
-  late_ram_regions(Memory_region { RAM_0_BASE, 0x1000 }),
-  core_mmio(Memory_region { CORTEX_A9_PRIVATE_MEM_BASE,
-                            CORTEX_A9_PRIVATE_MEM_SIZE },
-            Memory_region { UART_1_MMIO_BASE,
-                            UART_SIZE },
-            Memory_region { PL310_MMIO_BASE,
-                            PL310_MMIO_SIZE }) { }
-
-
-bool Bootstrap::Cpu::errata(Bootstrap::Cpu::Errata err) {
-	return false; }
diff --git a/src/bootstrap/spec/zynq_zc706/platform.cc b/src/bootstrap/spec/zynq_zc706/platform.cc
deleted file mode 100644
index 4602b30..0000000
--- a/src/bootstrap/spec/zynq_zc706/platform.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * \brief   Platform implementations specific for base-hw and Zynq
- * \author  Johannes Schlatow
- * \author  Stefan Kalkowski
- * \date    2014-12-15
- */
-
-/*
- * Copyright (C) 2014-2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-/* core includes */
-#include <platform.h>
-
-using namespace Board;
-
-Bootstrap::Platform::Board::Board()
-: early_ram_regions(Memory_region { RAM_0_BASE + 0x1000,
-                                    RAM_0_SIZE - 0x1000 }),
-  late_ram_regions(Memory_region { RAM_0_BASE, 0x1000 }),
-  core_mmio(Memory_region { CORTEX_A9_PRIVATE_MEM_BASE,
-                            CORTEX_A9_PRIVATE_MEM_SIZE },
-            Memory_region { UART_1_MMIO_BASE,
-                            UART_SIZE },
-            Memory_region { PL310_MMIO_BASE,
-                            PL310_MMIO_SIZE }) { }
-
-
-bool Bootstrap::Cpu::errata(Bootstrap::Cpu::Errata err) {
-	return false; }
diff --git a/src/bootstrap/spec/zynq_zedboard/platform.cc b/src/bootstrap/spec/zynq_zedboard/platform.cc
deleted file mode 100644
index 4602b30..0000000
--- a/src/bootstrap/spec/zynq_zedboard/platform.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * \brief   Platform implementations specific for base-hw and Zynq
- * \author  Johannes Schlatow
- * \author  Stefan Kalkowski
- * \date    2014-12-15
- */
-
-/*
- * Copyright (C) 2014-2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-/* core includes */
-#include <platform.h>
-
-using namespace Board;
-
-Bootstrap::Platform::Board::Board()
-: early_ram_regions(Memory_region { RAM_0_BASE + 0x1000,
-                                    RAM_0_SIZE - 0x1000 }),
-  late_ram_regions(Memory_region { RAM_0_BASE, 0x1000 }),
-  core_mmio(Memory_region { CORTEX_A9_PRIVATE_MEM_BASE,
-                            CORTEX_A9_PRIVATE_MEM_SIZE },
-            Memory_region { UART_1_MMIO_BASE,
-                            UART_SIZE },
-            Memory_region { PL310_MMIO_BASE,
-                            PL310_MMIO_SIZE }) { }
-
-
-bool Bootstrap::Cpu::errata(Bootstrap::Cpu::Errata err) {
-	return false; }