domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts: qemustart: change armvirt references to armsr

Browse Source 
The armvirt target has been renamed to 'armsr' (Arm SystemReady)
after inclusion of EFI support.
Change references (including subtargets) accordingly.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
This commit is contained in:
Mathew McBride
2023-06-09 02:19:40 +00:00
committed by Petr Štetiar
parent 203deef82c
commit 36bf9d8610
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/qemustart
View File

@@ -109,10 +109,10 @@ Examples
$SELF malta be -m 64 $SELF malta be -m 64
$SELF malta le64 $SELF malta le64
$SELF malta be-glibc $SELF malta be-glibc
$SELF armvirt 32 \\ $SELF armsr armv7 \\
--machine virt,highmem=off \\ --machine virt,highmem=off \\
--kernel bin/targets/armvirt/32/openwrt-armvirt-32-zImage \\ --kernel bin/targets/armsr/armv7/openwrt-armsr-armv7-generic-kernel.bin \\
--rootfs bin/targets/armvirt/32/openwrt-armvirt-32-root.ext4 --rootfs bin/targets/armsr/armv7/openwrt-armsr-armv7-generic-ext4-rootfs.img
EOF EOF
} }
@@ -162,7 +162,7 @@ parse_args() {
o_bindir="${CONFIG_BINARY_FOLDER:-bin}/targets/$o_target/$o_subtarget" o_bindir="${CONFIG_BINARY_FOLDER:-bin}/targets/$o_target/$o_subtarget"
} }
start_qemu_armvirt() { start_qemu_armsr() {
local kernel="$o_kernel" local kernel="$o_kernel"
local rootfs="$o_rootfs" local rootfs="$o_rootfs"
local mach="${o_mach:-virt}" local mach="${o_mach:-virt}"
@@ -170,15 +170,15 @@ start_qemu_armvirt() {
local qemu_exe local qemu_exe
case "${o_subtarget%-*}" in case "${o_subtarget%-*}" in
32) armv7)
qemu_exe="qemu-system-arm" qemu_exe="qemu-system-arm"
cpu="cortex-a15" cpu="cortex-a15"
[ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-zImage-initramfs" [ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-generic-initramfs-kernel.bin"
;; ;;
64) armv8)
qemu_exe="qemu-system-aarch64" qemu_exe="qemu-system-aarch64"
cpu="cortex-a57" cpu="cortex-a57"
[ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-Image-initramfs" [ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-generic-initramfs-kernel.bin"
;; ;;
*) *)
__errmsg "target $o_target: unknown subtarget $o_subtarget" __errmsg "target $o_target: unknown subtarget $o_subtarget"
@@ -328,7 +328,7 @@ start_qemu_x86() {
start_qemu() { start_qemu() {
case "$o_target" in case "$o_target" in
armvirt) start_qemu_armvirt ;; armsr) start_qemu_armsr ;;
malta) start_qemu_malta ;; malta) start_qemu_malta ;;
x86) start_qemu_x86 ;; x86) start_qemu_x86 ;;
*) *)