Merge pull request #12 from hanbings/feat/uefi

feat(uefi): Implement device path, simple fs and gop.

Author: luojia65

.github/workflows/test.yml

@@ -15,24 +15,11 @@ jobs:
         with:
           target: riscv64gc-unknown-none-elf
           toolchain: nightly-2025-03-31
-      
+
       - name: Install cargo-binutils and rust-objcopy
         run: |
           rustup component add llvm-tools-preview
           cargo install cargo-binutils
-      
-      - name: Prepare for Build
-        run: |
-          # Fix breaking update in rust dependency.
-          cargo fetch
-          find ~/.cargo/git/checkouts/ -type f -name '*.rs' -exec sed -i 's/#\[unsafe(naked)\]/#[naked]/g' {} +
-          
-          # Correct incorrect build directory name in build script.
-          sed -i '/^SBI :=/s#riscv64imac-unknown-none-elf#riscv64gc-unknown-none-elf#' Makefile
-          sed -i '/^SBI :=/s#riscv64imac-unknown-none-elf#riscv64gc-unknown-none-elf#' scripts/make/build.mk
-
-          make clone-rustsbi
-          sed -i -E '/^\s*#\[repr\(align\(16\)\)\]\s*$/d' rustsbi/prototyper/prototyper/src/sbi/early_trap.rs
 
       - name: Build with Makefile
         run: |
@@ -51,27 +38,43 @@ jobs:
 
       - name: Build EDK2
         run: sh scripts/test/build_edk2.sh
-      
+
       - name: Generate disk image
         run: sh scripts/test/disk.sh
 
-      - name: Create EFI System Partition (ESP)
-        run: sh scripts/test/make_esp.sh
-
       - name: Set up QEMU
         run: |
           sudo apt update
           sudo apt install -y qemu-system-misc
 
-      - name: Run QEMU
-        run: |
-          make qemu-run > qemu.log
+      # Test 1: HelloRiscv
+      - name: Create ESP (HelloRiscv)
+        run: EFI_NAME=HelloRiscv sh scripts/test/make_esp.sh
+
+      - name: Run QEMU (HelloRiscv)
+        run: make qemu-run > qemu-hello.log
+
+      - name: Upload QEMU log (HelloRiscv)
+        uses: actions/upload-artifact@v4
+        with:
+          name: log-hello
+          path: qemu-hello.log
+
+      - name: Check QEMU output (HelloRiscv)
+        run: sh scripts/test/check_hello_test.sh
+
+      # Test 2: AllocatePage
+      - name: Create ESP (AllocatePage)
+        run: EFI_NAME=AllocatePage sh scripts/test/make_esp.sh
+
+      - name: Run QEMU (AllocatePage)
+        run: make qemu-run > qemu-allocate.log
 
-      - name: Upload QEMU log
+      - name: Upload QEMU log (AllocatePage)
         uses: actions/upload-artifact@v4
         with:
-          name: log
-          path: qemu.log
+          name: log-allocate
+          path: qemu-allocate.log
 
-      - name: Check QEMU output
-        run: sh scripts/test/check_hello_test.sh
+      - name: Check QEMU output (AllocatePage)
+        run: sh scripts/test/check_allocate_test.sh

Cargo.lock

@@ -25,7 +25,7 @@ axconfig = { git = "https://github.com/arceos-org/arceos.git" }
 axsync = { git = "https://github.com/arceos-org/arceos.git" }
 axalloc = { git = "https://github.com/arceos-org/arceos.git", optional = true }
 axmm = { git = "https://github.com/arceos-org/arceos.git", optional = true }
-axdriver = { git = "https://github.com/arceos-org/arceos.git", optional = true, features = ["virtio-blk"] }
+axdriver = { git = "https://github.com/arceos-org/arceos.git", optional = true, features = ["virtio-blk", "virtio-gpu"] }
 axfs = { git = "https://github.com/arceos-org/arceos.git", optional = true }
 axnet = { git = "https://github.com/arceos-org/arceos.git", optional = true }
 axdisplay = { git = "https://github.com/arceos-org/arceos.git", optional = true }
@@ -34,7 +34,7 @@ axio = { version = "0.1", features = ["alloc"] }
 crate_interface = "0.1"
 ctor_bare = "0.2"
 cfg-if = "1.0.1"
-object = { version = "0.37.1", default-features = false, features = [ "read" ] }
+object = { version = "0.37.1", default-features = false, features = [ "read", "pe" ] }
 chrono = { version = "0.4.38", default-features = false }
 uefi-raw = "0.11.0"
 lazyinit = "0.2.2"

Cargo.toml

@@ -48,5 +48,8 @@ build: clean defconfig all
 qemu-run:
 	qemu-system-riscv64 -m 128M -serial mon:stdio -bios $(SBI) -nographic -machine virt -nographic -machine virt -device virtio-blk-pci,drive=disk0 -drive id=disk0,if=none,format=raw,file=$(DISK)
 
+qemu-display:
+	qemu-system-riscv64 -m 128M -serial mon:stdio -bios $(SBI) -machine virt -device virtio-blk-pci,drive=disk0 -drive id=disk0,if=none,format=raw,file=$(DISK) -device virtio-gpu-pci,xres=1024,yres=768
+
 qemu-run-ramdisknotload:
 	qemu-system-riscv64 -m 128M -serial mon:stdio -bios $(SBI) -nographic -machine virt -nographic -machine virt -device virtio-blk-pci,drive=disk0 -drive id=disk0,if=none,format=raw,file=$(DISK) -device loader,file=$(RAMDISK_CPIO),addr=0x84000000

Makefile

@@ -1,2 +1,16 @@
 # ArceBoot
 Reuse [ArceOS](https://github.com/arceos-org/arceos) components to build a cross-platform operating system bootloader
+
+# Build
+
+```bash
+# for serial output build:
+$ make
+$ make qemu-run
+
+# for qemu virtual monitor:
+# this may require a desktop system or graphical infrastructure 
+# such as x11 forwarding configured on your host machine.
+$ make EXACT_FEATURES="display"
+$ make qemu-display
+```

README.md

@@ -8,6 +8,16 @@ ELF := $(ROOT_DIR)/target/$(TARGET)/release/arceboot
 BIN := $(ROOT_DIR)/target/$(TARGET)/release/arceboot.bin
 RUSTSBI_DIR := $(ROOT_DIR)/rustsbi
 
+# 用逗号或者空格分隔 feature 名称
+EXACT_FEATURES ?=
+EXACT_FEATURES_CLEANED := $(subst $(space),$(comma),$(strip $(EXACT_FEATURES)))
+
+ifeq ($(strip $(EXACT_FEATURES)),)
+  FEATURE_ARGS :=
+else
+  FEATURE_ARGS := --features '$(EXACT_FEATURES_CLEANED)'
+endif
+
 # 彩色打印
 define print_info
 	@printf "\033[1;37m%s\033[0m" "[RustSBI-Arceboot Build] "
@@ -22,7 +32,7 @@ all: build-arceboot extract-bin clone-rustsbi build-rustsbi
 
 build-arceboot:
 	$(call print_info,开始编译 ArceBoot...)
-	cargo rustc --release --target $(TARGET) -- \
+	cargo rustc --release --target $(TARGET) $(FEATURE_ARGS) -- \
 		-C opt-level=z \
 		-C panic=abort \
 		-C relocation-model=static \

scripts/make/build.mk

@@ -7,7 +7,7 @@ EDK_DIR="$WORKSPACE_DIR/edk2"
 
 mkdir -p "$WORKSPACE_DIR"
 
-echo "[1/3] 准备 EDK2 构建环境..."
+echo "[1/4] 准备 EDK2 构建环境..."
 cd "$WORKSPACE_DIR"
 
 if [ ! -d "ToolChain/RISCV" ]; then
@@ -19,7 +19,7 @@ else
     echo "RISCV 工具链已存在，跳过下载。"
 fi
 
-echo "[2/3] 克隆 EDK2 仓库..."
+echo "[2/4] 克隆 EDK2 仓库..."
 if [ ! -d "$EDK_DIR" ]; then
     git clone --recurse-submodule https://github.com/tianocore/edk2.git "$EDK_DIR"
 else
@@ -28,7 +28,7 @@ fi
 
 export PATH="$WORKSPACE_DIR/ToolChain/RISCV/riscv/bin:$PATH"
 
-echo "[3/3] 构建 EDK2..."
+echo "[3/4] 构建 EDK2..."
 cd "$WORKSPACE_DIR"
 
 export WORKSPACE=`pwd`
@@ -40,6 +40,7 @@ export EDK_TOOLS_PATH=$WORKSPACE/edk2/BaseTools
 make -C edk2/BaseTools
 . "$EDK_DIR/edksetup.sh" BaseTools
 
+echo "[4/4] 准备 HelloRiscv 和 AllocatePage 示例..."
 # mkdir -p "$EDK_DIR/Hello"
 # cp -r "$PROJECT_ROOT/tests/edk2-Hello" "$EDK_DIR"
 # mv "$EDK_DIR/edk2-Hello"/* "$EDK_DIR/Hello/"
@@ -50,4 +51,8 @@ cp -r "$PROJECT_ROOT/tests/edk2-HelloRiscv" "$EDK_DIR"
 mv "$EDK_DIR/edk2-HelloRiscv" "$EDK_DIR/HelloRiscv/"
 build -a RISCV64 -t GCC5 -p "$EDK_DIR/HelloRiscv/HelloRiscv.dsc"
 
-echo "EDK2 构建完成。生成的镜像位于：$WORKSPACE_DIR/Build/DEBUG_GCC5/RISCV64/HelloRiscv.efi"
+cp -r "$PROJECT_ROOT/tests/edk2-AllocatePage" "$EDK_DIR"
+mv "$EDK_DIR/edk2-AllocatePage" "$EDK_DIR/AllocatePage/"
+build -a RISCV64 -t GCC5 -p "$EDK_DIR/AllocatePage/AllocatePage.dsc"
+
+echo "EDK2 与示例构建完成。生成的文件位于：$WORKSPACE_DIR/Build/DEBUG_GCC5/RISCV64"

scripts/test/build_edk2.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+LOG_FILE="qemu-allocate.log"
+TARGET_STRING="EFI Output: 0xDEADBEEF12345678"
+
+if [ ! -f "$LOG_FILE" ]; then
+    echo "❌ $LOG_FILE 不存在"
+    exit 1
+fi
+
+if grep -qF "$TARGET_STRING" "$LOG_FILE"; then
+    echo "✅ 找到匹配日志行"
+    exit 0
+else
+    echo "❌ 未找到匹配日志行"
+    exit 2
+fi

scripts/test/check_allocate_test.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-LOG_FILE="qemu.log"
+LOG_FILE="qemu-hello.log"
 TARGET_STRING="EFI Output: Hello, World!"
 
 if [ ! -f "$LOG_FILE" ]; then

scripts/test/check_hello_test.sh

@@ -5,6 +5,9 @@ PROJECT_ROOT=$(pwd)
 IMG_NAME="disk.img"
 MOUNT_DIR="mnt_fat32"
 ESP_DIR="$MOUNT_DIR/EFI/BOOT"
+EFI_NAME="${EFI_NAME:-HelloRiscv}"
+BUILD_FLAVOR="${BUILD_FLAVOR:-DEBUG_GCC5}"
+ARCH_DIR="${ARCH_DIR:-RISCV64}"
 
 if [ ! -d "$MOUNT_DIR" ]; then
     mkdir "$MOUNT_DIR"
@@ -17,7 +20,9 @@ echo "[2/3] 创建 ESP 目录结构..."
 sudo mkdir -p "$ESP_DIR"
 
 echo "[3/3] 复制 efi 文件到 ESP..."
-sudo cp "$PROJECT_ROOT/edk2/Build/DEBUG_GCC5/RISCV64/HelloRiscv.efi" "$ESP_DIR/BOOTRISCV64.EFI"
+SRC_EFI="$PROJECT_ROOT/edk2/Build/$BUILD_FLAVOR/$ARCH_DIR/${EFI_NAME}.efi"
+echo "源文件: $SRC_EFI"
+sudo cp "$SRC_EFI" "$ESP_DIR/BOOTRISCV64.EFI"
 
 sudo find "$ESP_DIR" -type d | while read -r dir; do
     echo "$dir"