ACPI WIP

Allow to hack w/o edk2.

Signed-off-by: Björn Töpel <bjorn@rivosinc.com>

mkfirmware_rv64_uboot.sh

@@ -11,8 +11,8 @@ tmp=$(mktemp -d -p "$PWD")
 
 trap 'rm -rf "$tmp"' EXIT
 
-git clone https://github.com/u-boot/u-boot.git $tmp -b v2024.01
-make -C $tmp ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- qemu-riscv64_smode_defconfig
+git clone https://github.com/u-boot/u-boot.git $tmp -b v2024.04
+make -C $tmp ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- qemu-riscv64_smode_defconfig acpi.config
 
 cat <<EOF >>$tmp/.config
 CONFIG_CMD_KASLRSEED=y

mkimage_rv64_uefi.sh

@@ -19,7 +19,7 @@ trap cleanup EXIT
 
 kernel=
 modpath=
-cmdline='root=/dev/vda2 rw earlycon console=tty0 console=ttyS0 efi=debug'
+cmdline='root=/dev/vda2 rw earlycon console=tty0 console=ttyS0 efi=debug acpi=force'
 
 while getopts k:m: name ; do
     case $name in

mkrootfs_rv64_ubuntu.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 
 d=$(dirname "${BASH_SOURCE[0]}")
 
-distro=${1:-mantic}
+distro=${1:-noble}
 
 packages=(
     automake

qemu.sh

@@ -19,7 +19,7 @@ if [[ ! -f $d/firmware/rv64-u-boot.bin ]]; then
 fi
 
 /home/bjorn/src/qemu/qemu/build/qemu-system-riscv64 \
-    -machine virt \
+    -machine virt,acpi=on,aia=aplic-imsic \
     -cpu rv64,v=true,vlen=256,elen=64,h=true,zbkb=on,zbkc=on,zbkx=on,zkr=on,zkt=on,svinval=on,svnapot=on,svpbmt=on \
     -nographic -m 16G -smp 8 -kernel $d/firmware/rv64-u-boot.bin \
     -device virtio-net-device,netdev=net0 -netdev user,hostfwd=tcp::10022-:22,id=net0,tftp=tftp \

updimage.sh

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+set -x
 set -euo pipefail
 
 d=$(dirname "${BASH_SOURCE[0]}")
@@ -16,7 +17,7 @@ trap cleanup EXIT
 
 kernel=
 modpath=
-cmdline='root=/dev/vda2 rw earlycon console=tty0 console=ttyS0 efi=debug'
+cmdline='root=/dev/vda2 rw earlycon console=tty0 console=ttyS0 efi=debug acpi=force'
 
 while getopts k:m:n name ; do
     case $name in
@@ -35,7 +36,7 @@ shift $(($OPTIND -1))
 
 imagename=$1
 
-imsz=1
+imsz=2
 if [[ $modpath ]]; then
     imsz=$(du -B 1G -s "$modpath" | awk '{print $1}')
 fi