[v2,4/5] configs: qemu_riscv*: Build the kernel Image file
diff mbox series

Message ID 20190318210106.6347-4-alistair.francis@wdc.com
State Changes Requested
Headers show
Series
  • Untitled series #97803
Related show

Commit Message

Alistair Francis March 18, 2019, 9:02 p.m. UTC
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 configs/qemu_riscv32_virt_defconfig | 1 +
 configs/qemu_riscv64_virt_defconfig | 1 +
 linux/Config.in                     | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni March 18, 2019, 9:23 p.m. UTC | #1
Hello Alistair,

On Mon, 18 Mar 2019 21:02:04 +0000
Alistair Francis <Alistair.Francis@wdc.com> wrote:

> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

This commit should have a non-empty commit log, and should actually be
split into to:

 - One allowing to enable BR2_LINUX_KERNEL_IMAGE on RISC-V

 - One moving the defconfig to using OpenSBI, which requires using the
   Image target if I understood correctly. As it is, the change to the
   defconfigs in this commit is pretty useless: the new Image is not
   generated. Worse: it probably breaks the defconfig because the Linux
   kernel build no longer installs $(BINARIES_DIR)/vmlinux, which is
   needed by riscv-pk. So your patch series is not bisectable.

Best regards,

Thomas

Patch
diff mbox series

diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig
index 6f9a61b11c..f7e9a23106 100644
--- a/configs/qemu_riscv32_virt_defconfig
+++ b/configs/qemu_riscv32_virt_defconfig
@@ -20,6 +20,7 @@  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config"
+BR2_LINUX_KERNEL_IMAGE=y
 
 # Bootloader
 BR2_TARGET_RISCV_PK=y
diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig
index 596edf2fcd..ae67979d29 100644
--- a/configs/qemu_riscv64_virt_defconfig
+++ b/configs/qemu_riscv64_virt_defconfig
@@ -19,6 +19,7 @@  BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_IMAGE=y
 
 # Bootloader
 BR2_TARGET_RISCV_PK=y
diff --git a/linux/Config.in b/linux/Config.in
index 818b94e1c0..dc10238053 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -258,7 +258,7 @@  config BR2_LINUX_KERNEL_SIMPLEIMAGE
 
 config BR2_LINUX_KERNEL_IMAGE
 	bool "Image"
-	depends on BR2_aarch64
+	depends on BR2_aarch64 || BR2_riscv
 
 config BR2_LINUX_KERNEL_LINUX_BIN
 	bool "linux.bin"