merge: targets: update image generation and targets

[openwrt/staging/jogo.git] / scripts / qemustart

diff --git a/scripts/qemustart b/scripts/qemustart
index 5cadd7d6a8198eaab38784e5e410ad56abf6a3c8..6c2254e3aff9ccd90733b4bf8fa09b45724d9d7a 100755 (executable)
--- a/scripts/qemustart
+++ b/scripts/qemustart
@@ -107,8 +107,8 @@ Examples
   $SELF malta le64
   $SELF malta be-glibc
   $SELF armvirt 32 \\
-                --kernel bin/targets/armvirt/32/lede-armvirt-32-zImage \\
-                --rootfs bin/targets/armvirt/32/lede-armvirt-32-root.ext4
+                --kernel bin/targets/armvirt/32/openwrt-armvirt-32-zImage \\
+                --rootfs bin/targets/armvirt/32/openwrt-armvirt-32-root.ext4
 EOF
 }
 
@@ -158,12 +158,12 @@ start_qemu_armvirt() {
                32)
                        qemu_exe="qemu-system-arm"
                        cpu="cortex-a15"
-                       [ -n "$kernel" ] || kernel="$o_bindir/lede-$o_target-${o_subtarget%-*}-zImage-initramfs"
+                       [ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-zImage-initramfs"
                        ;;
                64)
                        qemu_exe="qemu-system-aarch64"
                        cpu="cortex-a57"
-                       [ -n "$kernel" ] || kernel="$o_bindir/lede-$o_target-${o_subtarget%-*}-Image-initramfs"
+                       [ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-Image-initramfs"
                        ;;
                *)
                        __errmsg "target $o_target: unknown subtarget $o_subtarget"
@@ -199,7 +199,7 @@ start_qemu_malta() {
        [ "$(echo "$o_subtarget" | grep -o '^..')" = "le" ] && isel="el"
        qemu_exe="qemu-system-mips$is64$isel"
 
-       [ -n "$kernel" ] || kernel="$o_bindir/lede-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
+       [ -n "$kernel" ] || kernel="$o_bindir/openwrt-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
 
        # NOTE: order of wan, lan -device arguments matters as it will affect which
        # one will be actually used as the wan, lan network interface inside the
@@ -216,7 +216,7 @@ start_qemu_x86() {
        local qemu_exe
 
        [ -n "$rootfs" ] || {
-               rootfs="$o_bindir/lede-$o_target-${o_subtarget%-*}-combined-ext4.img"
+               rootfs="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-combined-ext4.img"
                if [ ! -f "$rootfs" -a -s "$rootfs.gz" ]; then
                        gunzip "$rootfs.gz"
                fi