From 935abb55b7d5fbf677a84ffa0167bd2c96d64366 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Thu, 21 Mar 2019 11:41:34 +0100 Subject: [PATCH] hw: move `src/lib/hw` header to `src/include/hw` * Remove bad style of using `src/lib` as include path Fix #3244 --- repos/base-hw/lib/mk/bootstrap-hw.inc | 1 - repos/base-hw/lib/mk/core-hw.inc | 1 - repos/base-hw/src/{lib => include}/hw/acpi_rsdp.h | 0 repos/base-hw/src/{lib => include}/hw/array.h | 0 repos/base-hw/src/{lib => include}/hw/assert.h | 0 repos/base-hw/src/{lib => include}/hw/boot_info.h | 0 repos/base-hw/src/{lib => include}/hw/framebuffer.h | 0 repos/base-hw/src/{lib => include}/hw/mapping.h | 0 repos/base-hw/src/{lib => include}/hw/memory_map.h | 0 repos/base-hw/src/{lib => include}/hw/memory_region.h | 0 repos/base-hw/src/{lib => include}/hw/page_flags.h | 0 repos/base-hw/src/{lib => include}/hw/page_table_allocator.h | 0 repos/base-hw/src/{lib => include}/hw/spec/arm/cortex_a15.h | 0 repos/base-hw/src/{lib => include}/hw/spec/arm/cortex_a9.h | 0 repos/base-hw/src/{lib => include}/hw/spec/arm/cpu.h | 0 repos/base-hw/src/{lib => include}/hw/spec/arm/imx_tzic.h | 0 repos/base-hw/src/{lib => include}/hw/spec/arm/lpae.h | 0 repos/base-hw/src/{lib => include}/hw/spec/arm/page_table.h | 0 .../src/{lib => include}/hw/spec/arm/panda_trustzone_firmware.h | 0 repos/base-hw/src/{lib => include}/hw/spec/arm/pic.h | 0 repos/base-hw/src/{lib => include}/hw/spec/arm/pl310.h | 0 .../base-hw/src/{lib => include}/hw/spec/arm/register_macros.h | 0 repos/base-hw/src/{lib => include}/hw/spec/riscv/cpu.h | 0 repos/base-hw/src/{lib => include}/hw/spec/riscv/machine_call.h | 0 repos/base-hw/src/{lib => include}/hw/spec/riscv/page_table.h | 0 .../src/{lib => include}/hw/spec/riscv/register_macros.h | 0 repos/base-hw/src/{lib => include}/hw/spec/riscv/uart.h | 0 repos/base-hw/src/{lib => include}/hw/spec/x86_64/acpi.h | 0 repos/base-hw/src/{lib => include}/hw/spec/x86_64/cpu.h | 0 repos/base-hw/src/{lib => include}/hw/spec/x86_64/page_table.h | 0 .../src/{lib => include}/hw/spec/x86_64/register_macros.h | 0 repos/base-hw/src/{lib => include}/hw/spec/x86_64/x86_64.h | 0 repos/base-hw/src/{lib => include}/hw/util.h | 0 repos/base-hw/src/test/cpu_scheduler/target.mk | 2 +- 34 files changed, 1 insertion(+), 3 deletions(-) rename repos/base-hw/src/{lib => include}/hw/acpi_rsdp.h (100%) rename repos/base-hw/src/{lib => include}/hw/array.h (100%) rename repos/base-hw/src/{lib => include}/hw/assert.h (100%) rename repos/base-hw/src/{lib => include}/hw/boot_info.h (100%) rename repos/base-hw/src/{lib => include}/hw/framebuffer.h (100%) rename repos/base-hw/src/{lib => include}/hw/mapping.h (100%) rename repos/base-hw/src/{lib => include}/hw/memory_map.h (100%) rename repos/base-hw/src/{lib => include}/hw/memory_region.h (100%) rename repos/base-hw/src/{lib => include}/hw/page_flags.h (100%) rename repos/base-hw/src/{lib => include}/hw/page_table_allocator.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/cortex_a15.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/cortex_a9.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/cpu.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/imx_tzic.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/lpae.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/page_table.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/panda_trustzone_firmware.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/pic.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/pl310.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/arm/register_macros.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/riscv/cpu.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/riscv/machine_call.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/riscv/page_table.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/riscv/register_macros.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/riscv/uart.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/x86_64/acpi.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/x86_64/cpu.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/x86_64/page_table.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/x86_64/register_macros.h (100%) rename repos/base-hw/src/{lib => include}/hw/spec/x86_64/x86_64.h (100%) rename repos/base-hw/src/{lib => include}/hw/util.h (100%) diff --git a/repos/base-hw/lib/mk/bootstrap-hw.inc b/repos/base-hw/lib/mk/bootstrap-hw.inc index 1c3a74bbd..d570a3cdd 100644 --- a/repos/base-hw/lib/mk/bootstrap-hw.inc +++ b/repos/base-hw/lib/mk/bootstrap-hw.inc @@ -23,7 +23,6 @@ SRC_CC += lib/base/sliced_heap.cc SRC_CC += lib/startup/_main.cc INC_DIR += $(HW_DIR)/src/bootstrap -INC_DIR += $(HW_DIR)/src/lib INC_DIR += $(HW_DIR)/src/include INC_DIR += $(BASE_DIR)/src/include INC_DIR += $(BASE_DIR)/src/core/include # for boot_modules.h only diff --git a/repos/base-hw/lib/mk/core-hw.inc b/repos/base-hw/lib/mk/core-hw.inc index d06c203d7..7517c011a 100644 --- a/repos/base-hw/lib/mk/core-hw.inc +++ b/repos/base-hw/lib/mk/core-hw.inc @@ -11,7 +11,6 @@ INC_DIR += $(BASE_DIR)/../base-hw/src/core INC_DIR += $(BASE_DIR)/src/core/include INC_DIR += $(BASE_DIR)/../base-hw/src/include INC_DIR += $(BASE_DIR)/src/include -INC_DIR += $(BASE_DIR)/../base-hw/src/lib # add C++ sources SRC_CC += cpu_session_component.cc diff --git a/repos/base-hw/src/lib/hw/acpi_rsdp.h b/repos/base-hw/src/include/hw/acpi_rsdp.h similarity index 100% rename from repos/base-hw/src/lib/hw/acpi_rsdp.h rename to repos/base-hw/src/include/hw/acpi_rsdp.h diff --git a/repos/base-hw/src/lib/hw/array.h b/repos/base-hw/src/include/hw/array.h similarity index 100% rename from repos/base-hw/src/lib/hw/array.h rename to repos/base-hw/src/include/hw/array.h diff --git a/repos/base-hw/src/lib/hw/assert.h b/repos/base-hw/src/include/hw/assert.h similarity index 100% rename from repos/base-hw/src/lib/hw/assert.h rename to repos/base-hw/src/include/hw/assert.h diff --git a/repos/base-hw/src/lib/hw/boot_info.h b/repos/base-hw/src/include/hw/boot_info.h similarity index 100% rename from repos/base-hw/src/lib/hw/boot_info.h rename to repos/base-hw/src/include/hw/boot_info.h diff --git a/repos/base-hw/src/lib/hw/framebuffer.h b/repos/base-hw/src/include/hw/framebuffer.h similarity index 100% rename from repos/base-hw/src/lib/hw/framebuffer.h rename to repos/base-hw/src/include/hw/framebuffer.h diff --git a/repos/base-hw/src/lib/hw/mapping.h b/repos/base-hw/src/include/hw/mapping.h similarity index 100% rename from repos/base-hw/src/lib/hw/mapping.h rename to repos/base-hw/src/include/hw/mapping.h diff --git a/repos/base-hw/src/lib/hw/memory_map.h b/repos/base-hw/src/include/hw/memory_map.h similarity index 100% rename from repos/base-hw/src/lib/hw/memory_map.h rename to repos/base-hw/src/include/hw/memory_map.h diff --git a/repos/base-hw/src/lib/hw/memory_region.h b/repos/base-hw/src/include/hw/memory_region.h similarity index 100% rename from repos/base-hw/src/lib/hw/memory_region.h rename to repos/base-hw/src/include/hw/memory_region.h diff --git a/repos/base-hw/src/lib/hw/page_flags.h b/repos/base-hw/src/include/hw/page_flags.h similarity index 100% rename from repos/base-hw/src/lib/hw/page_flags.h rename to repos/base-hw/src/include/hw/page_flags.h diff --git a/repos/base-hw/src/lib/hw/page_table_allocator.h b/repos/base-hw/src/include/hw/page_table_allocator.h similarity index 100% rename from repos/base-hw/src/lib/hw/page_table_allocator.h rename to repos/base-hw/src/include/hw/page_table_allocator.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/cortex_a15.h b/repos/base-hw/src/include/hw/spec/arm/cortex_a15.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/cortex_a15.h rename to repos/base-hw/src/include/hw/spec/arm/cortex_a15.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/cortex_a9.h b/repos/base-hw/src/include/hw/spec/arm/cortex_a9.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/cortex_a9.h rename to repos/base-hw/src/include/hw/spec/arm/cortex_a9.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/cpu.h b/repos/base-hw/src/include/hw/spec/arm/cpu.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/cpu.h rename to repos/base-hw/src/include/hw/spec/arm/cpu.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/imx_tzic.h b/repos/base-hw/src/include/hw/spec/arm/imx_tzic.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/imx_tzic.h rename to repos/base-hw/src/include/hw/spec/arm/imx_tzic.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/lpae.h b/repos/base-hw/src/include/hw/spec/arm/lpae.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/lpae.h rename to repos/base-hw/src/include/hw/spec/arm/lpae.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/page_table.h b/repos/base-hw/src/include/hw/spec/arm/page_table.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/page_table.h rename to repos/base-hw/src/include/hw/spec/arm/page_table.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/panda_trustzone_firmware.h b/repos/base-hw/src/include/hw/spec/arm/panda_trustzone_firmware.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/panda_trustzone_firmware.h rename to repos/base-hw/src/include/hw/spec/arm/panda_trustzone_firmware.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/pic.h b/repos/base-hw/src/include/hw/spec/arm/pic.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/pic.h rename to repos/base-hw/src/include/hw/spec/arm/pic.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/pl310.h b/repos/base-hw/src/include/hw/spec/arm/pl310.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/pl310.h rename to repos/base-hw/src/include/hw/spec/arm/pl310.h diff --git a/repos/base-hw/src/lib/hw/spec/arm/register_macros.h b/repos/base-hw/src/include/hw/spec/arm/register_macros.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/arm/register_macros.h rename to repos/base-hw/src/include/hw/spec/arm/register_macros.h diff --git a/repos/base-hw/src/lib/hw/spec/riscv/cpu.h b/repos/base-hw/src/include/hw/spec/riscv/cpu.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/riscv/cpu.h rename to repos/base-hw/src/include/hw/spec/riscv/cpu.h diff --git a/repos/base-hw/src/lib/hw/spec/riscv/machine_call.h b/repos/base-hw/src/include/hw/spec/riscv/machine_call.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/riscv/machine_call.h rename to repos/base-hw/src/include/hw/spec/riscv/machine_call.h diff --git a/repos/base-hw/src/lib/hw/spec/riscv/page_table.h b/repos/base-hw/src/include/hw/spec/riscv/page_table.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/riscv/page_table.h rename to repos/base-hw/src/include/hw/spec/riscv/page_table.h diff --git a/repos/base-hw/src/lib/hw/spec/riscv/register_macros.h b/repos/base-hw/src/include/hw/spec/riscv/register_macros.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/riscv/register_macros.h rename to repos/base-hw/src/include/hw/spec/riscv/register_macros.h diff --git a/repos/base-hw/src/lib/hw/spec/riscv/uart.h b/repos/base-hw/src/include/hw/spec/riscv/uart.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/riscv/uart.h rename to repos/base-hw/src/include/hw/spec/riscv/uart.h diff --git a/repos/base-hw/src/lib/hw/spec/x86_64/acpi.h b/repos/base-hw/src/include/hw/spec/x86_64/acpi.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/x86_64/acpi.h rename to repos/base-hw/src/include/hw/spec/x86_64/acpi.h diff --git a/repos/base-hw/src/lib/hw/spec/x86_64/cpu.h b/repos/base-hw/src/include/hw/spec/x86_64/cpu.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/x86_64/cpu.h rename to repos/base-hw/src/include/hw/spec/x86_64/cpu.h diff --git a/repos/base-hw/src/lib/hw/spec/x86_64/page_table.h b/repos/base-hw/src/include/hw/spec/x86_64/page_table.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/x86_64/page_table.h rename to repos/base-hw/src/include/hw/spec/x86_64/page_table.h diff --git a/repos/base-hw/src/lib/hw/spec/x86_64/register_macros.h b/repos/base-hw/src/include/hw/spec/x86_64/register_macros.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/x86_64/register_macros.h rename to repos/base-hw/src/include/hw/spec/x86_64/register_macros.h diff --git a/repos/base-hw/src/lib/hw/spec/x86_64/x86_64.h b/repos/base-hw/src/include/hw/spec/x86_64/x86_64.h similarity index 100% rename from repos/base-hw/src/lib/hw/spec/x86_64/x86_64.h rename to repos/base-hw/src/include/hw/spec/x86_64/x86_64.h diff --git a/repos/base-hw/src/lib/hw/util.h b/repos/base-hw/src/include/hw/util.h similarity index 100% rename from repos/base-hw/src/lib/hw/util.h rename to repos/base-hw/src/include/hw/util.h diff --git a/repos/base-hw/src/test/cpu_scheduler/target.mk b/repos/base-hw/src/test/cpu_scheduler/target.mk index d3e893114..9512f86d3 100644 --- a/repos/base-hw/src/test/cpu_scheduler/target.mk +++ b/repos/base-hw/src/test/cpu_scheduler/target.mk @@ -6,7 +6,7 @@ TARGET = test-cpu_scheduler SRC_CC = test.cc cpu_scheduler.cc double_list.cc -INC_DIR = $(REP_DIR)/src/core $(REP_DIR)/src/lib $(BASE_DIR)/src/include +INC_DIR += $(REP_DIR)/src/core $(REP_DIR)/src/include $(BASE_DIR)/src/include LIBS = base vpath test.cc $(PRG_DIR)