Merge Official Source

This commit is contained in:
CN_SZTL
2020-10-17 18:00:05 +08:00
239 changed files with 4989 additions and 3326 deletions

View File

@@ -212,6 +212,7 @@ start_qemu_malta() {
local is64
local isel
local qemu_exe
local cpu
local rootfs="$o_rootfs"
local kernel="$o_kernel"
local mach="${o_mach:-malta}"
@@ -220,6 +221,7 @@ start_qemu_malta() {
is64="$(echo $o_subtarget | grep -o 64)"
[ "$(echo "$o_subtarget" | grep -o '^..')" = "le" ] && isel="el"
qemu_exe="qemu-system-mips$is64$isel"
[ -n "$is64" ] && cpu="MIPS64R2-generic" || cpu="24Kc"
[ -n "$kernel" ] || kernel="$o_bindir/openwrt-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
@@ -243,7 +245,7 @@ start_qemu_malta() {
)
}
"$qemu_exe" -machine "$mach" -nographic \
"$qemu_exe" -machine "$mach" -cpu "$cpu" -nographic \
-kernel "$kernel" \
"${o_qemu_extra[@]}"
}