Fix: CI failures

Author: LawrenceHunter

.github/workflows/main.yml

@@ -36,8 +36,8 @@ jobs:
           cd /tftpboot/boot
           chmod +x *.sh
           cd /tftpboot/boot
-          ./mkimage.sh
           echo "tftpboot 0x80000000 bootloader.img; go 0x80000000" > boot.scr
+          ./mkimage.sh
           timeout 5m ./qemu_tftp.sh
 
   vf2_tftp:
@@ -51,8 +51,8 @@ jobs:
           cp tftp/* /tftpboot/boot
           cd /tftpboot/boot
           chmod +x *.sh
-          ./mkimage.sh
           echo "tftpboot 0x80300000 bootloader.img; go 0x80300000" > boot.scr
+          ./mkimage.sh
           ./power_vf2.sh off && ./power_vf2.sh on
           timeout 5m python3 vf2_tftp.py
           ./power_vf2.sh off

.github/workflows/pull.yml

@@ -36,6 +36,7 @@ jobs:
           cd /tftpboot/boot
           chmod +x *.sh
           cd /tftpboot/boot
+          echo "tftpboot 0x80000000 bootloader.img; go 0x80000000" > boot.scr
           ./mkimage.sh
           timeout 5m ./qemu_tftp.sh
 
@@ -50,6 +51,7 @@ jobs:
           cp tftp/* /tftpboot/boot
           cd /tftpboot/boot
           chmod +x *.sh
+          echo "tftpboot 0x80300000 bootloader.img; go 0x80300000" > boot.scr
           ./mkimage.sh
           ./power_vf2.sh off && ./power_vf2.sh on
           timeout 5m python3 vf2_tftp.py

.github/workflows/qemu_test.sh

@@ -9,13 +9,13 @@ rm -f /tmp/{guest,host}.{in,out} && mkfifo /tmp/{guest,host}.{in,out}
 set +x
 
 printf -v QEMU_CMDLINE '%s' 'qemu-system-riscv64 -serial pipe:/tmp/guest ' \
-'-M virt -cpu rv64 -smp 4 -m 128M -nographic -bios none -kernel bootloader.img'
+'-M virt -cpu rv64 -smp 4 -m 256M -nographic -bios none -kernel bootloader.img'
 
 wait_for_line () {
     local expected_line_pattern="$1"
     local fifo="$2"
     while read -r line; do
-        echo "  [$(date +"%T")] $line"
+        echo "$line"
         if [[ $line == *$expected_line_pattern* ]]; then
             break
         fi

.gitignore

@@ -18,3 +18,4 @@ Cargo.lock
 
 .github/workflows/*.md
 src/helper.rs
+test.md

Makefile

@@ -74,7 +74,7 @@ FEATURES      = --features $(BSP)
 COMPILER_ARGS = $(FEATURES) --release
 
 RUSTC_CMD   = cargo rustc $(COMPILER_ARGS)
-DOC_CMD     = cargo doc $(COMPILER_ARGS) --all-features \
+DOC_CMD     = cargo doc $(COMPILER_ARGS) --features $(BSP) \
 				--document-private-items --workspace
 CLIPPY_CMD  = cargo clippy $(COMPILER_ARGS) -- -A clippy::modulo_one
 OBJCOPY_CMD = rust-objcopy -O binary
@@ -246,15 +246,19 @@ endif
 ##------------------------------------------------------------------------------
 hyperfine:
 ifeq ($(DOCKER),y)
+	$(DOCKER_CMD) touch test.md
 	$(DOCKER_CMD) hyperfine --warmup 1 --show-output --export-markdown test.md ./.github/workflows/qemu_test.sh
+	$(DOCKER_CMD) cat test.md
 else
+	touch test.md
 	hyperfine --warmup 1 --show-output --export-markdown test.md ./.github/workflows/qemu_test.sh
+	cat test.md
 endif
 
 ##------------------------------------------------------------------------------
 ## Execute cargo expand
 ##------------------------------------------------------------------------------
-hyperfine:
+expand:
 ifeq ($(DOCKER),y)
 	$(DOCKER_CMD) cargo expand --target riscv64gc-unknown-none-elf --features $(BSP)
 else

src/helper.rs

@@ -13,4 +13,4 @@ pub fn print_boot_logo() {
 	println!(r"              \/_/                                                           ");
 	println!(r"");
 }
-pub const SHA: &str = "20c74052";
+pub const SHA: &str = "c0d90bb9";