Skip to content

Commit 840f6d6

Browse files
andre-richterandre-richter
committed
Add Cargo.toml to dependencies
1 parent b48a89f commit 840f6d6

File tree

21 files changed

+46
-46
lines changed

21 files changed

+46
-46
lines changed

‎01_wait_forever/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export LD_SCRIPT_PATH
5151
##--------------------------------------------------------------------------------------------------
5252
## Targets and Prerequisites
5353
##--------------------------------------------------------------------------------------------------
54+
KERNEL_MANIFEST = Cargo.toml
5455
KERNEL_LINKER_SCRIPT = kernel.ld
55-
56-
LAST_BUILD_CONFIG = target/$(BSP).build_config
56+
LAST_BUILD_CONFIG = target/$(BSP).build_config
5757

5858
KERNEL_ELF = target/$(TARGET)/release/kernel
5959
# This parses cargo's dep-info file.
6060
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
61-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
61+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6262

6363

6464

‎02_runtime_init/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export LD_SCRIPT_PATH
5151
##--------------------------------------------------------------------------------------------------
5252
## Targets and Prerequisites
5353
##--------------------------------------------------------------------------------------------------
54+
KERNEL_MANIFEST = Cargo.toml
5455
KERNEL_LINKER_SCRIPT = kernel.ld
55-
56-
LAST_BUILD_CONFIG = target/$(BSP).build_config
56+
LAST_BUILD_CONFIG = target/$(BSP).build_config
5757

5858
KERNEL_ELF = target/$(TARGET)/release/kernel
5959
# This parses cargo's dep-info file.
6060
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
61-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
61+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6262

6363

6464

‎03_hacky_hello_world/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export LD_SCRIPT_PATH
5151
##--------------------------------------------------------------------------------------------------
5252
## Targets and Prerequisites
5353
##--------------------------------------------------------------------------------------------------
54+
KERNEL_MANIFEST = Cargo.toml
5455
KERNEL_LINKER_SCRIPT = kernel.ld
55-
56-
LAST_BUILD_CONFIG = target/$(BSP).build_config
56+
LAST_BUILD_CONFIG = target/$(BSP).build_config
5757

5858
KERNEL_ELF = target/$(TARGET)/release/kernel
5959
# This parses cargo's dep-info file.
6060
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
61-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
61+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6262

6363

6464

‎04_safe_globals/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export LD_SCRIPT_PATH
5151
##--------------------------------------------------------------------------------------------------
5252
## Targets and Prerequisites
5353
##--------------------------------------------------------------------------------------------------
54+
KERNEL_MANIFEST = Cargo.toml
5455
KERNEL_LINKER_SCRIPT = kernel.ld
55-
56-
LAST_BUILD_CONFIG = target/$(BSP).build_config
56+
LAST_BUILD_CONFIG = target/$(BSP).build_config
5757

5858
KERNEL_ELF = target/$(TARGET)/release/kernel
5959
# This parses cargo's dep-info file.
6060
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
61-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
61+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6262

6363

6464

‎05_drivers_gpio_uart/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ export LD_SCRIPT_PATH
5454
##--------------------------------------------------------------------------------------------------
5555
## Targets and Prerequisites
5656
##--------------------------------------------------------------------------------------------------
57+
KERNEL_MANIFEST = Cargo.toml
5758
KERNEL_LINKER_SCRIPT = kernel.ld
58-
59-
LAST_BUILD_CONFIG = target/$(BSP).build_config
59+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6060

6161
KERNEL_ELF = target/$(TARGET)/release/kernel
6262
# This parses cargo's dep-info file.
6363
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
64-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
64+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6565

6666

6767

‎06_uart_chainloader/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ export LD_SCRIPT_PATH
5656
##--------------------------------------------------------------------------------------------------
5757
## Targets and Prerequisites
5858
##--------------------------------------------------------------------------------------------------
59+
KERNEL_MANIFEST = Cargo.toml
5960
KERNEL_LINKER_SCRIPT = kernel.ld
60-
61-
LAST_BUILD_CONFIG = target/$(BSP).build_config
61+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6262

6363
KERNEL_ELF = target/$(TARGET)/release/kernel
6464
# This parses cargo's dep-info file.
6565
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
66-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
66+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6767

6868

6969

‎07_timestamps/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ export LD_SCRIPT_PATH
5454
##--------------------------------------------------------------------------------------------------
5555
## Targets and Prerequisites
5656
##--------------------------------------------------------------------------------------------------
57+
KERNEL_MANIFEST = Cargo.toml
5758
KERNEL_LINKER_SCRIPT = kernel.ld
58-
59-
LAST_BUILD_CONFIG = target/$(BSP).build_config
59+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6060

6161
KERNEL_ELF = target/$(TARGET)/release/kernel
6262
# This parses cargo's dep-info file.
6363
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
64-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
64+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6565

6666

6767

‎08_hw_debug_JTAG/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ export LD_SCRIPT_PATH
5858
##--------------------------------------------------------------------------------------------------
5959
## Targets and Prerequisites
6060
##--------------------------------------------------------------------------------------------------
61+
KERNEL_MANIFEST = Cargo.toml
6162
KERNEL_LINKER_SCRIPT = kernel.ld
62-
63-
LAST_BUILD_CONFIG = target/$(BSP).build_config
63+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6464

6565
KERNEL_ELF = target/$(TARGET)/release/kernel
6666
# This parses cargo's dep-info file.
6767
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
68-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
68+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6969

7070

7171

‎09_privilege_level/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ export LD_SCRIPT_PATH
5858
##--------------------------------------------------------------------------------------------------
5959
## Targets and Prerequisites
6060
##--------------------------------------------------------------------------------------------------
61+
KERNEL_MANIFEST = Cargo.toml
6162
KERNEL_LINKER_SCRIPT = kernel.ld
62-
63-
LAST_BUILD_CONFIG = target/$(BSP).build_config
63+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6464

6565
KERNEL_ELF = target/$(TARGET)/release/kernel
6666
# This parses cargo's dep-info file.
6767
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
68-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
68+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6969

7070

7171

‎10_virtual_mem_part1_identity_mapping/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ export LD_SCRIPT_PATH
5858
##--------------------------------------------------------------------------------------------------
5959
## Targets and Prerequisites
6060
##--------------------------------------------------------------------------------------------------
61+
KERNEL_MANIFEST = Cargo.toml
6162
KERNEL_LINKER_SCRIPT = kernel.ld
62-
63-
LAST_BUILD_CONFIG = target/$(BSP).build_config
63+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6464

6565
KERNEL_ELF = target/$(TARGET)/release/kernel
6666
# This parses cargo's dep-info file.
6767
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
68-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
68+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6969

7070

7171

‎11_exceptions_part1_groundwork/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ export LD_SCRIPT_PATH
5858
##--------------------------------------------------------------------------------------------------
5959
## Targets and Prerequisites
6060
##--------------------------------------------------------------------------------------------------
61+
KERNEL_MANIFEST = Cargo.toml
6162
KERNEL_LINKER_SCRIPT = kernel.ld
62-
63-
LAST_BUILD_CONFIG = target/$(BSP).build_config
63+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6464

6565
KERNEL_ELF = target/$(TARGET)/release/kernel
6666
# This parses cargo's dep-info file.
6767
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
68-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
68+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6969

7070

7171

‎12_integrated_testing/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ LAST_BUILD_CONFIG = target/$(BSP).build_config
7474
KERNEL_ELF = target/$(TARGET)/release/kernel
7575
# This parses cargo's dep-info file.
7676
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
77-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
77+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
7878

7979

8080

‎13_exceptions_part2_peripheral_IRQs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ LAST_BUILD_CONFIG = target/$(BSP).build_config
7474
KERNEL_ELF = target/$(TARGET)/release/kernel
7575
# This parses cargo's dep-info file.
7676
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
77-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
77+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
7878

7979

8080

‎14_virtual_mem_part2_mmio_remap/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ LAST_BUILD_CONFIG = target/$(BSP).build_config
7474
KERNEL_ELF = target/$(TARGET)/release/kernel
7575
# This parses cargo's dep-info file.
7676
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
77-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
77+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
7878

7979

8080

‎15_virtual_mem_part3_precomputed_tables/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ LAST_BUILD_CONFIG = target/$(BSP).build_config
7474
KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
7575
# This parses cargo's dep-info file.
7676
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
77-
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
77+
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
7878

7979
##------------------------------------------------------------------------------
8080
## Translation tables

‎15_virtual_mem_part3_precomputed_tables/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1846,8 +1846,8 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/Makefile 15_virtual_mem_part3_precompu
18461846
+KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
18471847
# This parses cargo's dep-info file.
18481848
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
1849-
-KERNEL_ELF_DEPS = $(filter-out modulo: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
1850-
+KERNEL_ELF_RAW_DEPS = $(filter-out modulo: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
1849+
-KERNEL_ELF_DEPS = $(filter-out modulo: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
1850+
+KERNEL_ELF_RAW_DEPS = $(filter-out modulo: ,$(file < $(KERNEL_ELF_RAW).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
18511851
+
18521852
+##------------------------------------------------------------------------------
18531853
+## Translation tables

‎16_virtual_mem_part4_higher_half_kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ LAST_BUILD_CONFIG = target/$(BSP).build_config
7474
KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
7575
# This parses cargo's dep-info file.
7676
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
77-
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
77+
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
7878

7979
##------------------------------------------------------------------------------
8080
## Translation tables

‎17_kernel_symbols/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ LAST_BUILD_CONFIG = target/$(BSP).build_config
7474
KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
7575
# This parses cargo's dep-info file.
7676
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
77-
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
77+
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
7878

7979
##------------------------------------------------------------------------------
8080
## Translation tables

‎18_backtrace/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ LAST_BUILD_CONFIG = target/$(BSP).build_config
7474
KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
7575
# This parses cargo's dep-info file.
7676
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
77-
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
77+
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
7878

7979
##------------------------------------------------------------------------------
8080
## Translation tables

‎19_kernel_heap/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ LAST_BUILD_CONFIG = target/$(BSP)_$(DEBUG_PRINTS).build_config
7979
KERNEL_ELF_RAW = target/$(TARGET)/release/kernel
8080
# This parses cargo's dep-info file.
8181
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
82-
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(LAST_BUILD_CONFIG)
82+
KERNEL_ELF_RAW_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF_RAW).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
8383

8484
##------------------------------------------------------------------------------
8585
## Translation tables

‎X1_JTAG_boot/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ export LD_SCRIPT_PATH
5454
##--------------------------------------------------------------------------------------------------
5555
## Targets and Prerequisites
5656
##--------------------------------------------------------------------------------------------------
57+
KERNEL_MANIFEST = Cargo.toml
5758
KERNEL_LINKER_SCRIPT = kernel.ld
58-
59-
LAST_BUILD_CONFIG = target/$(BSP).build_config
59+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6060

6161
KERNEL_ELF = target/$(TARGET)/release/kernel
6262
# This parses cargo's dep-info file.
6363
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
64-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
64+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) $(LAST_BUILD_CONFIG)
6565

6666

6767

0 commit comments

Comments
 (0)