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

merge: targets: update image generation and targets

Browse Source 
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
This commit is contained in:
Zoltan HERPAI
2017-11-07 09:45:52 +01:00
committed by Felix Fietkau
parent bf5cef47b3
commit 7b5c989ab9
22 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/qemustart
View File

@@ -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