From d4a75ed9bbbc71cc3ea98324adf8972da402cf13 Mon Sep 17 00:00:00 2001 From: Johannes Schlatow Date: Thu, 14 Dec 2017 14:07:30 +0100 Subject: [PATCH] base-hw: move spec/zynq files to zynq_qemu This is necessary because in contrast to the zynq boards (see specs in genode-world), only zynq_qemu uses UART_0. These files should thus fall under the zynq_qemu spec. Fixes #2615 --- repos/base-hw/lib/mk/spec/zynq_qemu/bootstrap-hw.mk | 4 ++-- repos/base-hw/src/bootstrap/spec/{zynq => zynq_qemu}/board.h | 0 .../src/bootstrap/spec/{zynq => zynq_qemu}/platform.cc | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename repos/base-hw/src/bootstrap/spec/{zynq => zynq_qemu}/board.h (100%) rename repos/base-hw/src/bootstrap/spec/{zynq => zynq_qemu}/platform.cc (100%) diff --git a/repos/base-hw/lib/mk/spec/zynq_qemu/bootstrap-hw.mk b/repos/base-hw/lib/mk/spec/zynq_qemu/bootstrap-hw.mk index cfec2c59b..4bb70cad7 100644 --- a/repos/base-hw/lib/mk/spec/zynq_qemu/bootstrap-hw.mk +++ b/repos/base-hw/lib/mk/spec/zynq_qemu/bootstrap-hw.mk @@ -1,11 +1,11 @@ -INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/zynq +INC_DIR += $(BASE_DIR)/../base-hw/src/bootstrap/spec/zynq_qemu 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/platform.cc +SRC_CC += bootstrap/spec/zynq_qemu/platform.cc SRC_CC += hw/spec/arm/arm_v7_cpu.cc SRC_CC += hw/spec/32bit/memory_map.cc diff --git a/repos/base-hw/src/bootstrap/spec/zynq/board.h b/repos/base-hw/src/bootstrap/spec/zynq_qemu/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/zynq/board.h rename to repos/base-hw/src/bootstrap/spec/zynq_qemu/board.h diff --git a/repos/base-hw/src/bootstrap/spec/zynq/platform.cc b/repos/base-hw/src/bootstrap/spec/zynq_qemu/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/zynq/platform.cc rename to repos/base-hw/src/bootstrap/spec/zynq_qemu/platform.cc