minor cosmetics

Author: andre-richter

12_integrated_testing/kernel/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.12.0"
 authors = ["Andre Richter <[email protected]>"]
 edition = "2021"
 
-
 [features]
 default = []
 bsp_rpi3 = ["tock-registers"]

13_exceptions_part2_peripheral_IRQs/kernel/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.13.0"
 authors = ["Andre Richter <[email protected]>"]
 edition = "2021"
 
-
 [features]
 default = []
 bsp_rpi3 = ["tock-registers"]

14_virtual_mem_part2_mmio_remap/kernel/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.14.0"
 authors = ["Andre Richter <[email protected]>"]
 edition = "2021"
 
-
 [features]
 default = []
 bsp_rpi3 = ["tock-registers"]

15_virtual_mem_part3_precomputed_tables/Makefile

@@ -71,13 +71,16 @@ KERNEL_MANIFEST      = kernel/Cargo.toml
 KERNEL_LINKER_SCRIPT = kernel.ld
 LAST_BUILD_CONFIG    = target/$(BSP).build_config
 
-TT_TOOL_PATH = tools/translation_table_tool
-
 KERNEL_ELF_RAW      = target/$(TARGET)/release/kernel
 # This parses cargo's dep-info file.
 # https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
 KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
 
+##------------------------------------------------------------------------------
+## Translation tables
+##------------------------------------------------------------------------------
+TT_TOOL_PATH = tools/translation_table_tool
+
 KERNEL_ELF_TTABLES      = target/$(TARGET)/release/kernel+ttables
 KERNEL_ELF_TTABLES_DEPS = $(KERNEL_ELF_RAW) $(wildcard $(TT_TOOL_PATH)/*)
 

15_virtual_mem_part3_precomputed_tables/README.md

@@ -1837,35 +1837,38 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/kernel/tests/04_exception_irq_sanity.r
 diff -uNr 14_virtual_mem_part2_mmio_remap/Makefile 15_virtual_mem_part3_precomputed_tables/Makefile
 --- 14_virtual_mem_part2_mmio_remap/Makefile
 +++ 15_virtual_mem_part3_precomputed_tables/Makefile
-@@ -71,10 +71,17 @@
+@@ -71,10 +71,20 @@
  KERNEL_LINKER_SCRIPT = kernel.ld
  LAST_BUILD_CONFIG    = target/$(BSP).build_config
 
 -KERNEL_ELF      = target/$(TARGET)/release/kernel
-+TT_TOOL_PATH = tools/translation_table_tool
-+
 +KERNEL_ELF_RAW      = target/$(TARGET)/release/kernel
  # This parses cargo's dep-info file.
  # https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
 -KERNEL_ELF_DEPS = $(filter-out modulo: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
 +KERNEL_ELF_RAW_DEPS = $(filter-out modulo: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
 +
++##------------------------------------------------------------------------------
++## Translation tables
++##------------------------------------------------------------------------------
++TT_TOOL_PATH = tools/translation_table_tool
++
 +KERNEL_ELF_TTABLES      = target/$(TARGET)/release/kernel+ttables
 +KERNEL_ELF_TTABLES_DEPS = $(KERNEL_ELF_RAW) $(wildcard $(TT_TOOL_PATH)/*)
 +
 +KERNEL_ELF = $(KERNEL_ELF_TTABLES)
 
 
 
-@@ -104,6 +111,7 @@
+@@ -104,6 +114,7 @@
      -O binary
 
  EXEC_QEMU          = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
 +EXEC_TT_TOOL       = ruby $(TT_TOOL_PATH)/main.rb
  EXEC_TEST_DISPATCH = ruby ../common/tests/dispatch.rb
  EXEC_MINIPUSH      = ruby ../common/serial/minipush.rb
 
-@@ -154,16 +162,24 @@
+@@ -154,16 +165,24 @@
  ##------------------------------------------------------------------------------
  ## Compile the kernel ELF
  ##------------------------------------------------------------------------------
@@ -1893,7 +1896,7 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/Makefile 15_virtual_mem_part3_precompu
  	$(call color_progress_prefix, "Name")
  	@echo $(KERNEL_BIN)
  	$(call color_progress_prefix, "Size")
-@@ -302,6 +318,7 @@
+@@ -302,6 +321,7 @@
      TEST_ELF=$$(echo $$1 | sed -e 's/.*target/target/g')
      TEST_BINARY=$$(echo $$1.img | sed -e 's/.*target/target/g')
 

15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.15.0"
 authors = ["Andre Richter <[email protected]>"]
 edition = "2021"
 
-
 [features]
 default = []
 bsp_rpi3 = ["tock-registers"]

16_virtual_mem_part4_higher_half_kernel/Makefile

@@ -71,13 +71,16 @@ KERNEL_MANIFEST      = kernel/Cargo.toml
 KERNEL_LINKER_SCRIPT = kernel.ld
 LAST_BUILD_CONFIG    = target/$(BSP).build_config
 
-TT_TOOL_PATH = tools/translation_table_tool
-
 KERNEL_ELF_RAW      = target/$(TARGET)/release/kernel
 # This parses cargo's dep-info file.
 # https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
 KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
 
+##------------------------------------------------------------------------------
+## Translation tables
+##------------------------------------------------------------------------------
+TT_TOOL_PATH = tools/translation_table_tool
+
 KERNEL_ELF_TTABLES      = target/$(TARGET)/release/kernel+ttables
 KERNEL_ELF_TTABLES_DEPS = $(KERNEL_ELF_RAW) $(wildcard $(TT_TOOL_PATH)/*)
 

16_virtual_mem_part4_higher_half_kernel/kernel/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.16.0"
 authors = ["Andre Richter <[email protected]>"]
 edition = "2021"
 
-
 [features]
 default = []
 bsp_rpi3 = ["tock-registers"]