瀏覽代碼

qemuriscv64: Don't use the linux-riscv kernel

Default to the mainline 4.19 kernel for the 64-bit QEMU machine.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Alistair Francis 5 年之前
父節點
當前提交
e253804993

+ 0 - 3
conf/machine/include/qemuriscv.inc

@@ -1,6 +1,3 @@
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-riscv"
-PREFERRED_VERSION_linux-riscv ?= "4.19%"
-
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 
 require conf/machine/include/qemu.inc

+ 4 - 0
conf/machine/qemuriscv32.conf

@@ -6,6 +6,10 @@ require conf/machine/include/qemuriscv.inc
 
 DEFAULTTUNE = "riscv32"
 
+# The mainline 4.19 kernel doesn't compile for 32-bit RISC-V
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-riscv"
+PREFERRED_VERSION_linux-riscv ?= "4.19%"
+
 # u-boot doesn't compile, error: "can't link hard-float modules with soft-float modules"
 # EXTRA_IMAGEDEPENDS += "u-boot"
 # UBOOT_MACHINE = "qemu-riscv32_defconfig"

+ 1 - 0
recipes-kernel/linux/linux-yocto_4.19.bbappend

@@ -0,0 +1 @@
+COMPATIBLE_MACHINE_append = "|qemuriscv64"