Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8d87d2c

Browse files
minor cosmetics
1 parent 9785300 commit 8d87d2c

File tree

8 files changed

+19
-15
lines changed

8 files changed

+19
-15
lines changed

‎12_integrated_testing/kernel/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ version = "0.12.0"
44
authors = ["Andre Richter <andre.o.richter@gmail.com>"]
55
edition = "2021"
66

7-
87
[features]
98
default = []
109
bsp_rpi3 = ["tock-registers"]

‎13_exceptions_part2_peripheral_IRQs/kernel/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ version = "0.13.0"
44
authors = ["Andre Richter <andre.o.richter@gmail.com>"]
55
edition = "2021"
66

7-
87
[features]
98
default = []
109
bsp_rpi3 = ["tock-registers"]

‎14_virtual_mem_part2_mmio_remap/kernel/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ version = "0.14.0"
44
authors = ["Andre Richter <andre.o.richter@gmail.com>"]
55
edition = "2021"
66

7-
87
[features]
98
default = []
109
bsp_rpi3 = ["tock-registers"]

‎15_virtual_mem_part3_precomputed_tables/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,16 @@ KERNEL_MANIFEST = kernel/Cargo.toml
7171
KERNEL_LINKER_SCRIPT = kernel.ld
7272
LAST_BUILD_CONFIG = target/$(BSP).build_config
7373

74-
TT_TOOL_PATH = tools/translation_table_tool
75-
7674
KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
7775
# This parses cargo's dep-info file.
7876
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
7977
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
8078

79+
##------------------------------------------------------------------------------
80+
## Translation tables
81+
##------------------------------------------------------------------------------
82+
TT_TOOL_PATH = tools/translation_table_tool
83+
8184
KERNEL_ELF_TTABLES = target/$(TARGET)/release/kernel+ttables
8285
KERNEL_ELF_TTABLES_DEPS = $(KERNEL_ELF_RAW) $(wildcard $(TT_TOOL_PATH)/*)
8386

‎15_virtual_mem_part3_precomputed_tables/README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,35 +1837,38 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/kernel/tests/04_exception_irq_sanity.r
18371837
diff -uNr 14_virtual_mem_part2_mmio_remap/Makefile 15_virtual_mem_part3_precomputed_tables/Makefile
18381838
--- 14_virtual_mem_part2_mmio_remap/Makefile
18391839
+++ 15_virtual_mem_part3_precomputed_tables/Makefile
1840-
@@ -71,10 +71,17 @@
1840+
@@ -71,10 +71,20 @@
18411841
KERNEL_LINKER_SCRIPT = kernel.ld
18421842
LAST_BUILD_CONFIG = target/$(BSP).build_config
18431843

18441844
-KERNEL_ELF = target/$(TARGET)/release/kernel
1845-
+TT_TOOL_PATH = tools/translation_table_tool
1846-
+
18471845
+KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
18481846
# This parses cargo's dep-info file.
18491847
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
18501848
-KERNEL_ELF_DEPS = $(filter-out modulo: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
18511849
+KERNEL_ELF_RAW_DEPS = $(filter-out modulo: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
18521850
+
1851+
+##------------------------------------------------------------------------------
1852+
+## Translation tables
1853+
+##------------------------------------------------------------------------------
1854+
+TT_TOOL_PATH = tools/translation_table_tool
1855+
+
18531856
+KERNEL_ELF_TTABLES = target/$(TARGET)/release/kernel+ttables
18541857
+KERNEL_ELF_TTABLES_DEPS = $(KERNEL_ELF_RAW) $(wildcard $(TT_TOOL_PATH)/*)
18551858
+
18561859
+KERNEL_ELF = $(KERNEL_ELF_TTABLES)
18571860

18581861

18591862

1860-
@@ -104,6 +111,7 @@
1863+
@@ -104,6 +114,7 @@
18611864
-O binary
18621865

18631866
EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE)
18641867
+EXEC_TT_TOOL = ruby $(TT_TOOL_PATH)/main.rb
18651868
EXEC_TEST_DISPATCH = ruby ../common/tests/dispatch.rb
18661869
EXEC_MINIPUSH = ruby ../common/serial/minipush.rb
18671870

1868-
@@ -154,16 +162,24 @@
1871+
@@ -154,16 +165,24 @@
18691872
##------------------------------------------------------------------------------
18701873
## Compile the kernel ELF
18711874
##------------------------------------------------------------------------------
@@ -1893,7 +1896,7 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/Makefile 15_virtual_mem_part3_precompu
18931896
$(call color_progress_prefix, "Name")
18941897
@echo $(KERNEL_BIN)
18951898
$(call color_progress_prefix, "Size")
1896-
@@ -302,6 +318,7 @@
1899+
@@ -302,6 +321,7 @@
18971900
TEST_ELF=$$(echo $1ドル | sed -e 's/.*target/target/g')
18981901
TEST_BINARY=$$(echo $1ドル.img | sed -e 's/.*target/target/g')
18991902

‎15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ version = "0.15.0"
44
authors = ["Andre Richter <andre.o.richter@gmail.com>"]
55
edition = "2021"
66

7-
87
[features]
98
default = []
109
bsp_rpi3 = ["tock-registers"]

‎16_virtual_mem_part4_higher_half_kernel/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,16 @@ KERNEL_MANIFEST = kernel/Cargo.toml
7171
KERNEL_LINKER_SCRIPT = kernel.ld
7272
LAST_BUILD_CONFIG = target/$(BSP).build_config
7373

74-
TT_TOOL_PATH = tools/translation_table_tool
75-
7674
KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
7775
# This parses cargo's dep-info file.
7876
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
7977
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
8078

79+
##------------------------------------------------------------------------------
80+
## Translation tables
81+
##------------------------------------------------------------------------------
82+
TT_TOOL_PATH = tools/translation_table_tool
83+
8184
KERNEL_ELF_TTABLES = target/$(TARGET)/release/kernel+ttables
8285
KERNEL_ELF_TTABLES_DEPS = $(KERNEL_ELF_RAW) $(wildcard $(TT_TOOL_PATH)/*)
8386

‎16_virtual_mem_part4_higher_half_kernel/kernel/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ version = "0.16.0"
44
authors = ["Andre Richter <andre.o.richter@gmail.com>"]
55
edition = "2021"
66

7-
87
[features]
98
default = []
109
bsp_rpi3 = ["tock-registers"]

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /