x86_64: edk2 + linux + ubuntu

There is no support for virtualization emulation on this platform.

Author: pbo-linaro

.github/workflows/build.yml

@@ -24,14 +24,14 @@ jobs:
       - run: sudo sed -i -e "s/ deb$/ deb deb-src/" /etc/apt/sources.list.d/ubuntu.sources
       - run: sudo apt update && sudo apt build-dep -y qemu
       - run: git clone https://gitlab.com/qemu-project/qemu --branch v10.0.2 --single-branch --depth 1
-      - run: cd qemu && ./configure --target-list=aarch64-softmmu && ninja -C build && cd ..
+      - run: cd qemu && ./configure --target-list=x86_64-softmmu && ninja -C build && cd ..
 
       - run: echo "----- build stack -----"
       - run: sudo apt update && sudo apt install -y podman qemu-user-static
       - run: ./build.sh
 
-      - run: echo "----- run nested guest and exit -----"
-      - run: INIT='env INIT=true /host/guest.sh qemu-system-aarch64' ./run.sh ./qemu/build/qemu-system-aarch64
+      - run: echo "----- run guest and exit -----"
+      - run: INIT='true' ./run.sh ./qemu/build/qemu-system-x86_64
 
       - run: echo "----- create artifacts ------"
       - run: echo $(basename ${{github.ref}}) > branch

Dockerfile

@@ -3,8 +3,8 @@ FROM docker.io/debian:trixie
 RUN apt update && apt install -y \
 build-essential \
 git \
-gcc-aarch64-linux-gnu \
-g++-aarch64-linux-gnu \
+gcc-x86-64-linux-gnu \
+g++-x86-64-linux-gnu \
 bison \
 flex \
 bc \
@@ -23,10 +23,14 @@ libgnutls28-dev
 RUN apt update && apt install -y ccache
 RUN apt update && apt install -y clang-tools
 RUN ln -s /usr/bin/intercept-build-* /usr/bin/intercept-build
+RUN apt update && apt install -y \
+libelf-dev
+RUN apt update && \
+apt install -y uuid-dev python-is-python3 nasm acpica-tools
 
 # wrap compilers to call ccache, keep frame pointer, and enable debug info
 RUN mkdir /opt/compiler_wrappers && \
-    for c in gcc g++ aarch64-linux-gnu-gcc aarch64-linux-gnu-g++; do \
+    for c in gcc g++ x86_64-linux-gnu-gcc x86_64-linux-gnu-g++; do \
         f=/opt/compiler_wrappers/$c && \
         echo '#!/usr/bin/env bash' >> $f && \
         echo 'args="-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -g -ggdb3"' >> $f && \

README.md

@@ -28,15 +28,15 @@ Thus, update or switch branches should not require any ``git clean -ffdx``.
 ./build.sh
 
 # run system using:
-./run.sh /path/to/qemu-system-aarch64
+./run.sh /path/to/qemu-system-x86_64
 # exit QEMU with ctrl-a + x
 
 # debug kernel, firmwares and bootloader using:
-./debug.sh /path/to/qemu-system-aarch64
-# additional gdb commands were added, like arm-exception-level. See gdb.py.
+./debug.sh /path/to/qemu-system-x86_64
+# additional gdb commands were added, like x64-privilege-level. See gdb.py.
 
 # to debug qemu itself:
-./run.sh gdb --args /path/to/qemu-system-aarch64
+./run.sh gdb --args /path/to/qemu-system-x86_64
 
 # to create an archive containing the whole stack:
 ./build.sh
@@ -50,11 +50,11 @@ It's possible to automate execution of commands in the VM:
 # A script named guest.sh can be used to launch a nested guest
 # Finally, a custom command can be passed to init script using INIT env var
 
-# To boot a nested guest, and call hostname:
-INIT='env INIT=hostname /host/guest.sh qemu-system-aarch64' ./run.sh qemu-system-aarch64
+# To boot a guest, and call hostname:
+INIT=hostname ./run.sh qemu-system-x86_64
 
 # In case command fail, init will trigger a Kernel panic
-INIT='false' ./run.sh qemu-system-aarch64
+INIT='false' ./run.sh qemu-system-x86_64
 ```
 
 ---

build.sh

@@ -8,9 +8,7 @@ rm -rf out
 
 ./build_kernel.sh
 echo '-------------------------------------------------------------------------'
-./build_uboot.sh
-echo '-------------------------------------------------------------------------'
-./build_arm_trusted_firmware.sh
+./build_edk2.sh
 echo '-------------------------------------------------------------------------'
 ./build_rootfs.sh
 echo '-------------------------------------------------------------------------'

build_arm_trusted_firmware.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+set -x
+
+if [ -z "${DISABLE_CONTAINER_CHECK:-}" ]; then
+    ./container.sh ./build_edk2.sh
+    exit 0
+fi
+
+clone()
+{
+    rm -f edk2
+    url=https://github.com/tianocore/edk2.git
+    version=edk2-stable202505
+    src=$version-x86_64
+    if [ ! -d $src ]; then
+        git clone $url --single-branch --branch $version --depth 1 $src
+        pushd $src
+        git submodule update --init --depth 1
+        popd
+    fi
+    ln -s $src edk2
+}
+
+build()
+{
+    pushd edk2
+    make -C BaseTools -j $(nproc)
+    export GCC5_X64_PREFIX=x86_64-linux-gnu-
+    # always build in debug to enable traces
+    intercept-build --append \
+    bash -c ". edksetup.sh &&
+    build -q -n $(nproc) \
+    -a X64 -b DEBUG -t GCC5 \
+    -D DEBUG_ON_SERIAL_PORT -p OvmfPkg/OvmfPkgX64.dsc"
+    sed -i compile_commands.json -e 's/"cc"/"x86_64-linux-gnu-gcc"/'
+    popd
+}
+
+output()
+{
+    mkdir -p output
+    rsync -a edk2/Build/OvmfX64/DEBUG_GCC5/FV/OVMF.fd out/
+}
+
+clone
+build
+output

build_edk2.sh

@@ -13,7 +13,7 @@ clone()
     rm -f linux
     url=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
     version=v6.15
-    src=linux_$version
+    src=linux_${version}_x86_64
     if [ ! -d $src ]; then
         git clone $url --single-branch --branch $version --depth 1 $src
         pushd $src
@@ -27,23 +27,23 @@ build()
 {
     pushd linux
     rm -f .config
-    make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig -j$(nproc)
+    make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- defconfig -j$(nproc)
     # reduce number of timer interrupts
-    scripts/config --disable CONFIG_HZ_250
+    scripts/config --disable CONFIG_NO_HZ
+    scripts/config --disable CONFIG_HZ_1000
     scripts/config --enable CONFIG_HZ_100
     # nvme
     scripts/config --enable BLK_DEV_NVME
     # iommufd
     # https://docs.kernel.org/driver-api/vfio.html#vfio-device-cdev
     scripts/config --enable IOMMUFD
     scripts/config --enable VFIO_DEVICE_CDEV
-    scripts/config --enable ARM_SMMU_V3_IOMMUFD
 
     # disable all modules
     sed -i -e 's/=m$/=n/' .config
 
-    make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- olddefconfig -j$(nproc)
-    make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- all -j$(nproc)
+    make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- olddefconfig -j$(nproc)
+    make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- all -j$(nproc)
 
     # compile commands
     ./scripts/clang-tools/gen_compile_commands.py
@@ -52,15 +52,15 @@ build()
         -e 's/-fconserve-stack//' \
         -e 's/-fno-allow-store-data-races//' \
         -e 's/-mabi=lp64//' \
-        -e 's/aarch64-linux-gnu-gcc/clang -target aarch64-pc-none-gnu -Wno-unknown-warning-option -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang/'
+        -e 's/x86_64-linux-gnu-gcc/clang -target x86_64-pc-none-gnu -Wno-unknown-warning-option -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang/'
 
     popd
 }
 
 output()
 {
     mkdir -p out
-    rsync ./linux/arch/arm64/boot/Image.gz out/
+    rsync ./linux/arch/x86/boot/bzImage out/
 }
 
 clone

build_kernel.sh

@@ -3,11 +3,11 @@
 set -euo pipefail
 
 if [ $# -lt 1 ]; then
-    echo "usage: qemu_aarch64_cmd"
+    echo "usage: qemu_x86_64_cmd"
     exit 1
 fi
 
-qemu_aarch64_cmd=$*
+qemu_x86_64_cmd=$*
 
 tmux_session()
 {
@@ -22,4 +22,4 @@ if [ -z "$(which tmux)" ]; then
     echo "debug.sh: tmux needs to be installed on your machine"
     exit 1
 fi
-tmux_session ./run.sh $qemu_aarch64_cmd -S -s
+tmux_session ./run.sh $qemu_x86_64_cmd -S -s