aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2023-06-02 13:48:38 +0200
committerPetr Štetiar <ynezz@true.cz>2023-06-13 14:15:22 +0200
commit848759c2362fc60fef8aa76f2adeb228af3cae65 (patch)
tree333ceca6269efab4929816e23000e5319b1c85a2 /target/linux
parentc05c0699d4798b02f8ee88159236142e08c0c4cd (diff)
downloadupstream-848759c2362fc60fef8aa76f2adeb228af3cae65.tar.gz
upstream-848759c2362fc60fef8aa76f2adeb228af3cae65.tar.bz2
upstream-848759c2362fc60fef8aa76f2adeb228af3cae65.zip
uboot-armsr: add support for QEMU armv7/armv8
Add new package so we can use self-compiled bootloader during QEMU based testing and development. Backported fix[1] is needed for EFI boot from virtio devices. 1. https://patchwork.ozlabs.org/project/uboot/patch/20230424134946.v10.7.Ia5f5e39c882ac22b5f71c4d576941b34e868eeba@changeid/ Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit b8e3fa2d1205213c71bc356744e9bed6cd8e69f9)
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/armsr/README9
-rw-r--r--target/linux/armsr/image/Makefile3
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/armsr/README b/target/linux/armsr/README
index bce839ddfc..b4b9012826 100644
--- a/target/linux/armsr/README
+++ b/target/linux/armsr/README
@@ -52,7 +52,7 @@ images in EFI mode:
gunzip -c bin/targets/armsr/armv7/openwrt-armsr-armv7-generic-ext4-combined.img.gz > openwrt-arm-32.img
qemu-system-arm -nographic \
-cpu cortex-a15 -machine virt \
- -bios QEMU_EFI_32.fd \
+ -bios bin/targets/armsr/armv7/u-boot-qemu_armv7/u-boot.bin \
-smp 1 -m 1024 \
-device virtio-rng-pci \
-drive file=openwrt-arm-32.img,format=raw,index=0,media=disk \
@@ -63,14 +63,13 @@ qemu-system-arm -nographic \
gunzip -c bin/targets/armsr/armv8/openwrt-armsr-armv8-generic-ext4-combined.img.gz > openwrt-arm-64.img
qemu-system-aarch64 -nographic \
-cpu cortex-a53 -machine virt \
- -bios QEMU_EFI_64.fd \
+ -bios bin/targets/armsr/armv8/u-boot-qemu_armv8/u-boot.bin \
-smp 1 -m 1024 \
-device virtio-rng-pci \
-drive file=openwrt-arm-64.img,format=raw,index=0,media=disk \
-netdev user,id=testlan -net nic,netdev=testlan \
-netdev user,id=testwan -net nic,netdev=testwan
-One can find EFI/BIOS binaries from:
-- Compile mainline U-Boot for the QEMU ARM virtual machine (qemu_arm_defconfig/qemu_arm64_defconfig)
-- From distribution packages (such as qemu-efi-arm and qemu-efi-aarch64 in Debian)
+One can obtain other EFI/BIOS binaries from:
+- Distribution packages (such as qemu-efi-arm and qemu-efi-aarch64 in Debian)
- Community builds, like retrage/edk2-nightly: https://retrage.github.io/edk2-nightly/
diff --git a/target/linux/armsr/image/Makefile b/target/linux/armsr/image/Makefile
index e3031d5a13..e4ba7988ec 100644
--- a/target/linux/armsr/image/Makefile
+++ b/target/linux/armsr/image/Makefile
@@ -73,7 +73,7 @@ define Build/grub-install
$(INSTALL_DIR) $@.grub2
endef
-DEVICE_VARS += GRUB2_VARIANT
+DEVICE_VARS += GRUB2_VARIANT UBOOT
define Device/efi-default
IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE)
IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip
@@ -105,6 +105,7 @@ define Device/generic
DEVICE_TITLE := Generic EFI Boot
GRUB2_VARIANT := generic
FILESYSTEMS := ext4 squashfs
+ UBOOT := $(if $(CONFIG_aarch64),qemu_armv8,qemu_armv7)
DEVICE_PACKAGES += kmod-amazon-ena kmod-e1000e kmod-vmxnet3 kmod-rtc-rx8025 \
kmod-i2c-mux-pca954x kmod-gpio-pca953x partx-utils kmod-wdt-sp805 \
kmod-mvneta kmod-mvpp2 kmod-fsl-dpaa1-net kmod-fsl-dpaa2-net \