base-hw: remove cortex spec directories

For consistency reasons, remove the cortex_a8, cortex_a9, and cortex_a15 spec directories. Such SPEC variables do not exist since a while. Also rename remaining translation_table.h header to page_table.h to stay consistent with the class names inside. Fix genodelabs/genode#5253
2025-01-18 02:40:08 +00:00 · 2024-06-20 13:39:47 +02:00 · 2024-06-20 13:39:47 +02:00 · d9d2a7584e
commit d9d2a7584e
parent 0105494223
22 changed files with 26 additions and 108 deletions
--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-cortex_a15.inc
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-cortex_a15.inc
@ -5,7 +5,7 @@
 #

 # add C++ sources
-SRC_CC += spec/cortex_a15/cpu.cc
+SRC_CC += spec/arm/cortex_a15_cpu.cc
 SRC_CC += kernel/cpu_mp.cc
 SRC_CC += spec/arm/kernel/lock.cc

--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-cortex_a9.inc
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-cortex_a9.inc
@ -5,8 +5,8 @@
 #

 # add C++ sources
-SRC_CC += spec/cortex_a9/board.cc
-SRC_CC += spec/cortex_a9/cpu.cc
+SRC_CC += spec/arm/cortex_a9_board.cc
+SRC_CC += spec/arm/cortex_a9_cpu.cc
 SRC_CC += spec/arm/cortex_a9_global_timer.cc
 SRC_CC += spec/arm/gicv2.cc
 SRC_CC += spec/arm/kernel/lock.cc
--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-pbxa9.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-pbxa9.mk
@ -12,4 +12,4 @@ REP_INC_DIR += src/core/board/pbxa9
 SRC_CC += platform_services.cc

 # include less specific configuration
-include $(call select_from_repositories,lib/mk/spec/cortex_a9/core-hw.inc)
+include $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw-cortex_a9.inc)
--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu_arm_v7a.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu_arm_v7a.mk
@ -16,4 +16,4 @@ SRC_S += spec/arm_v7/virtualization/exception_vector.s

 CC_MARCH = -march=armv7ve -mtune=cortex-a15 -mfpu=vfpv3 -mfloat-abi=softfp

-include $(call select_from_repositories,lib/mk/spec/cortex_a15/core-hw.inc)
+include $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw-cortex_a15.inc)
--- a/repos/base-hw/recipes/src/base-hw_content.inc
+++ b/repos/base-hw/recipes/src/base-hw_content.inc
@ -24,7 +24,7 @@ BOARD := $(patsubst base-hw-%,%,$(_BOARD))
 #

 LIB_MK_SPECS(arm_v6)  := arm arm_v6
-LIB_MK_SPECS(arm_v7a) := arm arm_v7 cortex_a9 cortex_a15
+LIB_MK_SPECS(arm_v7a) := arm arm_v7
 LIB_MK_SPECS(arm_v8a) := arm_64 arm_v8
 LIB_MK_SPECS(x86_64)  := x86_64
 LIB_MK_SPECS(riscv)   := riscv
@ -36,7 +36,7 @@ SRC_BOOTSTRAP_SPECS(x86_64)  := x86_64
 SRC_BOOTSTRAP_SPECS(riscv)   := riscv

 SRC_CORE_SPECS(arm_v6)  := arm arm_v6
-SRC_CORE_SPECS(arm_v7a) := arm arm_v7 cortex_a8 cortex_a9 cortex_a15
+SRC_CORE_SPECS(arm_v7a) := arm arm_v7
 SRC_CORE_SPECS(arm_v8a) := arm arm_v8
 SRC_CORE_SPECS(x86_64)  := x86 x86_64
 SRC_CORE_SPECS(riscv)   := riscv
@ -136,6 +136,7 @@ LIB_MK_FILES := base-common.inc base-hw-common.mk \
                base.inc base-hw.inc base-hw.mk \
                bootstrap-hw.inc bootstrap-hw-$(BOARD).inc bootstrap-hw-$(BOARD).mk \
                core-hw.inc core-hw-$(BOARD).inc core-hw-$(BOARD).mk \
+                core-hw-cortex_a9.inc core-hw-cortex_a15.inc \
                startup.inc startup-hw.mk \
                timeout-hw.mk cxx.mk ld-hw.mk syscall-hw.mk

--- a/repos/base-hw/src/core/board/pbxa9/board.h
+++ b/repos/base-hw/src/core/board/pbxa9/board.h
@ -20,7 +20,7 @@

 /* base-hw core includes */
 #include <spec/arm/cortex_a9_global_timer.h>
-#include <spec/cortex_a9/cpu.h>
+#include <spec/arm/cortex_a9_cpu.h>

 namespace Board {

--- a/repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h
+++ b/repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h
@ -19,7 +19,7 @@
 #include <spec/arm/virtualization/gicv2.h>
 #include <spec/arm/generic_timer.h>
 #include <spec/arm/virtualization/board.h>
-#include <spec/cortex_a15/cpu.h>
+#include <spec/arm/cortex_a15_cpu.h>
 #include <spec/arm/cpu/vcpu_state_virtualization.h>

 namespace Kernel { class Cpu; }
--- a/repos/base-hw/src/core/spec/arm/cortex_a15_cpu.cc
+++ b/repos/base-hw/src/core/spec/arm/cortex_a15_cpu.cc
@ -13,7 +13,7 @@

 /* base-hw core includes */
 #include <kernel/thread.h>
-#include <spec/cortex_a15/cpu.h>
+#include <spec/arm/cortex_a15_cpu.h>

 using namespace Core;

--- a/repos/base-hw/src/core/spec/arm/cortex_a15_cpu.h
+++ b/repos/base-hw/src/core/spec/arm/cortex_a15_cpu.h
@ -17,7 +17,7 @@

 /* base-hw core includes */
 #include <spec/arm_v7/cpu_support.h>
-#include <spec/cortex_a15/translation_table.h>
+#include <hw/spec/arm/lpae.h>

 namespace Core { class Cpu; }

--- a/repos/base-hw/src/core/spec/cortex_a8/translation_table.h
+++ b/repos/base-hw/src/core/spec/cortex_a8/translation_table.h
@ -12,8 +12,8 @@
 * under the terms of the GNU Affero General Public License version 3.
 */

-#ifndef _CORE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_
-#define _CORE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_
+#ifndef _CORE__SPEC__CORTEX_A8__PAGE_TABLE_H_
+#define _CORE__SPEC__CORTEX_A8__PAGE_TABLE_H_

 /* base-hw internal includes */
 #include <hw/spec/arm/page_table.h>
@ -41,4 +41,4 @@ void Hw::Page_table::_table_changed(unsigned long addr, unsigned long size)
 	Core::Arm_cpu::cache_clean_data_region(addr, size);
 }

-#endif /* _CORE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ */
+#endif /* _CORE__SPEC__CORTEX_A8__PAGE_TABLE_H_ */
--- a/repos/base-hw/src/core/spec/arm/cortex_a9_board.cc
+++ b/repos/base-hw/src/core/spec/arm/cortex_a9_board.cc
--- a/repos/base-hw/src/core/spec/arm/cortex_a9_cpu.cc
+++ b/repos/base-hw/src/core/spec/arm/cortex_a9_cpu.cc
@ -13,7 +13,7 @@
 */

 /* base-hw core includes */
-#include <spec/cortex_a9/cpu.h>
+#include <spec/arm/cortex_a9_cpu.h>
 #include <board.h>


--- a/repos/base-hw/src/core/spec/arm/cortex_a9_cpu.h
+++ b/repos/base-hw/src/core/spec/arm/cortex_a9_cpu.h
@ -17,7 +17,7 @@

 /* base-hw core includes */
 #include <spec/arm_v7/cpu_support.h>
-#include <spec/cortex_a9/translation_table.h>
+#include <spec/arm/cortex_a9_page_table.h>

 namespace Core { struct Cpu; }

--- a/repos/base-hw/src/core/spec/cortex_a9/translation_table.h
+++ b/repos/base-hw/src/core/spec/cortex_a9/translation_table.h
@ -12,8 +12,8 @@
 * under the terms of the GNU Affero General Public License version 3.
 */

-#ifndef _CORE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_
-#define _CORE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_
+#ifndef _CORE__SPEC__ARM__CORTEX_A9_PAGE_TABLE_H_
+#define _CORE__SPEC__ARM__CORTEX_A9_PAGE_TABLE_H_

 #include <hw/spec/arm/page_table.h>

@ -27,4 +27,4 @@ constexpr bool Hw::Page_table::Descriptor_base::_smp() { return true; }

 void Hw::Page_table::_table_changed(unsigned long, unsigned long) { }

-#endif /* _CORE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_ */
+#endif /* _CORE__SPEC__ARM__CORTEX_A9_PAGE_TABLE_H_ */
--- a/repos/base-hw/src/core/spec/arm_v6/cpu.h
+++ b/repos/base-hw/src/core/spec/arm_v6/cpu.h
@ -17,7 +17,7 @@

 /* base-hw core includes */
 #include <spec/arm/cpu_support.h>
-#include <spec/arm_v6/translation_table.h>
+#include <spec/arm_v6/page_table.h>

 namespace Core { struct Cpu; }

--- a/repos/base-hw/src/core/spec/arm_v6/translation_table.h
+++ b/repos/base-hw/src/core/spec/arm_v6/translation_table.h
@ -12,8 +12,8 @@
 * under the terms of the GNU Affero General Public License version 3.
 */

-#ifndef _CORE__SPEC__ARM_V6__TRANSLATION_TABLE_H_
-#define _CORE__SPEC__ARM_V6__TRANSLATION_TABLE_H_
+#ifndef _CORE__SPEC__ARM_V6__PAGE_TABLE_H_
+#define _CORE__SPEC__ARM_V6__PAGE_TABLE_H_

 #include <hw/spec/arm/page_table.h>
 #include <spec/arm/cpu_support.h>
@ -32,4 +32,4 @@ void Hw::Page_table::_table_changed(unsigned long addr, unsigned long size)
 	Core::Arm_cpu::cache_clean_data_region(addr, size);
 }

-#endif /* _CORE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ */
+#endif /* _CORE__SPEC__ARM_V6__PAGE_TABLE_H_ */
--- a/repos/base-hw/src/core/spec/arm_v8/cpu.h
+++ b/repos/base-hw/src/core/spec/arm_v8/cpu.h
@ -27,7 +27,7 @@
 /* base-hw internal includes */
 #include <hw/spec/arm_64/cpu.h>
 #include <spec/arm_v8/address_space_id_allocator.h>
-#include <spec/arm_v8/translation_table.h>
+#include <hw/spec/arm/lpae.h>

 namespace Kernel { struct Thread_fault; }

--- a/repos/base-hw/src/core/spec/arm_v8/translation_table.h
+++ b/repos/base-hw/src/core/spec/arm_v8/translation_table.h
@ -1,20 +0,0 @@
-/*
- * \brief  Translation table definitions for core
- * \author Stefan Kalkowski
- * \date   2019-05-10
- */
-
-/*
- * Copyright (C) 2019 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.
- */
-
-#ifndef _CORE__SPEC__ARM_V8__TRANSLATION_TABLE_H_
-#define _CORE__SPEC__ARM_V8__TRANSLATION_TABLE_H_
-
-/* core includes */
-#include <hw/spec/arm/lpae.h>
-
-#endif /* _CORE__SPEC__ARM_V8__TRANSLATION_TABLE_H_ */
--- a/repos/base-hw/src/core/spec/cortex_a15/translation_table.h
+++ b/repos/base-hw/src/core/spec/cortex_a15/translation_table.h
@ -1,20 +0,0 @@
-/*
- * \brief  Translation table definitions for core
- * \author Stefan Kalkowski
- * \date   2015-01-30
- */
-
-/*
- * Copyright (C) 2015-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.
- */
-
-#ifndef _CORE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_
-#define _CORE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_
-
-/* core includes */
-#include <hw/spec/arm/lpae.h>
-
-#endif /* _CORE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_ */
--- a/repos/base-hw/src/core/spec/cortex_a8/cpu.h
+++ b/repos/base-hw/src/core/spec/cortex_a8/cpu.h
@ -1,24 +0,0 @@
-/*
- * \brief  ARM Cortex A8 CPU driver for core
- * \author Martin stein
- * \author Stefan Kalkowski
- * \date   2011-11-03
- */
-
-/*
- * Copyright (C) 2011-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.
- */
-
-#ifndef _CORE__SPEC__CORTEX_A8__CPU_H_
-#define _CORE__SPEC__CORTEX_A8__CPU_H_
-
-/* base-hw core includes */
-#include <spec/arm_v7/cpu_support.h>
-#include <spec/cortex_a8/translation_table.h>
-
-namespace Core { using Cpu = Arm_v7_cpu; }
-
-#endif /* _CORE__SPEC__CORTEX_A8__CPU_H_ */
--- a/repos/base-hw/src/core/spec/x86_64/cpu.h
+++ b/repos/base-hw/src/core/spec/x86_64/cpu.h
@ -31,7 +31,7 @@
 #include <types.h>
 #include <spec/x86_64/fpu.h>
 #include <spec/x86_64/address_space_id_allocator.h>
-#include <spec/x86_64/translation_table.h>
+#include <hw/spec/x86_64/page_table.h>

 namespace Kernel { struct Thread_fault; }

--- a/repos/base-hw/src/core/spec/x86_64/translation_table.h
+++ b/repos/base-hw/src/core/spec/x86_64/translation_table.h
@ -1,19 +0,0 @@
-/*
- * \brief  x86_64 translation table definitions for core
- * \author Adrian-Ken Rueegsegger
- * \date   2015-02-06
- */
-
-/*
- * Copyright (C) 2015-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.
- */
-
-#ifndef _CORE__SPEC__X86_64__TRANSLATION_TABLE_H_
-#define _CORE__SPEC__X86_64__TRANSLATION_TABLE_H_
-
-#include <hw/spec/x86_64/page_table.h>
-
-#endif /* _CORE__SPEC__X86_64__TRANSLATION_TABLE_H_ */