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 8513ccf

Browse files
Various minor fixes
1 parent a0cfe17 commit 8513ccf

File tree

73 files changed

+228
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+228
-142
lines changed

‎01_wait_forever/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ COMPILER_ARGS = --target=$(TARGET) \
8181
RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
8282
DOC_CMD = cargo doc $(COMPILER_ARGS)
8383
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
84-
CHECK_CMD = cargo check $(COMPILER_ARGS)
8584
OBJCOPY_CMD = rust-objcopy \
8685
--strip-all \
8786
-O binary

‎01_wait_forever/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
// Copyright (c) 2018-2022 Andre Richter <andre.o.richter@gmail.com>
44

55
// Rust embedded logo for `make doc`.
6-
#![doc(html_logo_url = "https://raw.githubusercontent.com/rust-embedded/wg/master/assets/logo/ewg-logo-blue-white-on-transparent.png")]
6+
#![doc(
7+
html_logo_url = "https://raw.githubusercontent.com/rust-embedded/wg/master/assets/logo/ewg-logo-blue-white-on-transparent.png"
8+
)]
79

810
//! The `kernel` binary.
911
//!

‎02_runtime_init/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ COMPILER_ARGS = --target=$(TARGET) \
8181
RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
8282
DOC_CMD = cargo doc $(COMPILER_ARGS)
8383
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
84-
CHECK_CMD = cargo check $(COMPILER_ARGS)
8584
OBJCOPY_CMD = rust-objcopy \
8685
--strip-all \
8786
-O binary

‎02_runtime_init/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ diff -uNr 01_wait_forever/Cargo.toml 02_runtime_init/Cargo.toml
5252
diff -uNr 01_wait_forever/Makefile 02_runtime_init/Makefile
5353
--- 01_wait_forever/Makefile
5454
+++ 02_runtime_init/Makefile
55-
@@ -181,6 +181,8 @@
55+
@@ -180,6 +180,8 @@
5656
$(call color_header, "Launching objdump")
5757
@$(DOCKER_TOOLS) $(OBJDUMP_BINARY) --disassemble --demangle \
5858
--section .text \
@@ -302,15 +302,15 @@ diff -uNr 01_wait_forever/src/cpu.rs 02_runtime_init/src/cpu.rs
302302
diff -uNr 01_wait_forever/src/main.rs 02_runtime_init/src/main.rs
303303
--- 01_wait_forever/src/main.rs
304304
+++ 02_runtime_init/src/main.rs
305-
@@ -102,6 +102,7 @@
305+
@@ -104,6 +104,7 @@
306306
//!
307307
//! 1. The kernel's entry point is the function `cpu::boot::arch_boot::_start()`.
308308
//! - It is implemented in `src/_arch/__arch_name__/cpu/boot.s`.
309309
+//! 2. Once finished with architectural setup, the arch code calls `kernel_init()`.
310310

311311
#![no_main]
312312
#![no_std]
313-
@@ -110,4 +111,11 @@
313+
@@ -112,4 +113,11 @@
314314
mod cpu;
315315
mod panic_wait;
316316

‎02_runtime_init/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
// Copyright (c) 2018-2022 Andre Richter <andre.o.richter@gmail.com>
44

55
// Rust embedded logo for `make doc`.
6-
#![doc(html_logo_url = "https://raw.githubusercontent.com/rust-embedded/wg/master/assets/logo/ewg-logo-blue-white-on-transparent.png")]
6+
#![doc(
7+
html_logo_url = "https://raw.githubusercontent.com/rust-embedded/wg/master/assets/logo/ewg-logo-blue-white-on-transparent.png"
8+
)]
79

810
//! The `kernel` binary.
911
//!

‎03_hacky_hello_world/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ COMPILER_ARGS = --target=$(TARGET) \
8181
RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
8282
DOC_CMD = cargo doc $(COMPILER_ARGS)
8383
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
84-
CHECK_CMD = cargo check $(COMPILER_ARGS)
8584
OBJCOPY_CMD = rust-objcopy \
8685
--strip-all \
8786
-O binary

‎03_hacky_hello_world/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
7070
OBJDUMP_BINARY = aarch64-none-elf-objdump
7171
NM_BINARY = aarch64-none-elf-nm
7272
READELF_BINARY = aarch64-none-elf-readelf
73-
@@ -86,17 +86,20 @@
73+
@@ -85,17 +85,20 @@
7474
--strip-all \
7575
-O binary
7676

@@ -94,7 +94,7 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
9494

9595

9696

97-
@@ -192,3 +195,27 @@
97+
@@ -191,3 +194,27 @@
9898
$(call color_header, "Launching nm")
9999
@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
100100

@@ -212,7 +212,7 @@ diff -uNr 02_runtime_init/src/console.rs 03_hacky_hello_world/src/console.rs
212212
diff -uNr 02_runtime_init/src/main.rs 03_hacky_hello_world/src/main.rs
213213
--- 02_runtime_init/src/main.rs
214214
+++ 03_hacky_hello_world/src/main.rs
215-
@@ -104,12 +104,16 @@
215+
@@ -106,12 +106,16 @@
216216
//! - It is implemented in `src/_arch/__arch_name__/cpu/boot.s`.
217217
//! 2. Once finished with architectural setup, the arch code calls `kernel_init()`.
218218

@@ -229,7 +229,7 @@ diff -uNr 02_runtime_init/src/main.rs 03_hacky_hello_world/src/main.rs
229229

230230
/// Early init code.
231231
///
232-
@@ -117,5 +121,7 @@
232+
@@ -119,5 +123,7 @@
233233
///
234234
/// - Only a single core must be active and running this function.
235235
unsafe fn kernel_init() -> ! {

‎03_hacky_hello_world/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
// Copyright (c) 2018-2022 Andre Richter <andre.o.richter@gmail.com>
44

55
// Rust embedded logo for `make doc`.
6-
#![doc(html_logo_url = "https://raw.githubusercontent.com/rust-embedded/wg/master/assets/logo/ewg-logo-blue-white-on-transparent.png")]
6+
#![doc(
7+
html_logo_url = "https://raw.githubusercontent.com/rust-embedded/wg/master/assets/logo/ewg-logo-blue-white-on-transparent.png"
8+
)]
79

810
//! The `kernel` binary.
911
//!

‎04_safe_globals/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ COMPILER_ARGS = --target=$(TARGET) \
8181
RUSTC_CMD = cargo rustc $(COMPILER_ARGS)
8282
DOC_CMD = cargo doc $(COMPILER_ARGS)
8383
CLIPPY_CMD = cargo clippy $(COMPILER_ARGS)
84-
CHECK_CMD = cargo check $(COMPILER_ARGS)
8584
OBJCOPY_CMD = rust-objcopy \
8685
--strip-all \
8786
-O binary

‎04_safe_globals/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,23 +224,23 @@ diff -uNr 03_hacky_hello_world/src/console.rs 04_safe_globals/src/console.rs
224224
diff -uNr 03_hacky_hello_world/src/main.rs 04_safe_globals/src/main.rs
225225
--- 03_hacky_hello_world/src/main.rs
226226
+++ 04_safe_globals/src/main.rs
227-
@@ -106,6 +106,7 @@
227+
@@ -108,6 +108,7 @@
228228

229229
#![feature(format_args_nl)]
230230
#![feature(panic_info_message)]
231231
+#![feature(trait_alias)]
232232
#![no_main]
233233
#![no_std]
234234

235-
@@ -114,6 +115,7 @@
235+
@@ -116,6 +117,7 @@
236236
mod cpu;
237237
mod panic_wait;
238238
mod print;
239239
+mod synchronization;
240240

241241
/// Early init code.
242242
///
243-
@@ -121,7 +123,15 @@
243+
@@ -123,7 +125,15 @@
244244
///
245245
/// - Only a single core must be active and running this function.
246246
unsafe fn kernel_init() -> ! {

0 commit comments

Comments
(0)

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