riscv: qemu: detect and boot the kernel passed by QEMU

QEMU embeds the location of the kernel image in the device tree. Store
this address in the environment as variable kernel_start. It is used in
the board-local distro boot command QEMU to boot the kernel with the
U-Boot device tree. The QEMU boot command is added as the first boot
target device.

Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Alexander Graf <agraf@suse.de>

diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig
index 37a80db6a94d069d5c7942fc0e3df95d07f8d8cb..be5839b7dbaea6f4f4db7594ed536d44db3e9d38 100644 (file)
--- a/board/emulation/qemu-riscv/Kconfig
+++ b/board/emulation/qemu-riscv/Kconfig
@@ -29,5 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        imply CMD_EXT2
        imply CMD_EXT4
        imply CMD_FAT
+       imply BOARD_LATE_INIT
 
 endif

diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index 2ce093e19a92f353d9e25a789a0b6aae63787b30..587f2c49094dd0814aade5608a23692974cace5f 100644 (file)
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -19,3 +19,32 @@ int board_init(void)
 
        return 0;
 }
+
+int board_late_init(void)
+{
+       ulong kernel_start;
+       ofnode chosen_node;
+       int ret;
+
+       chosen_node = ofnode_path("/chosen");
+       if (!ofnode_valid(chosen_node)) {
+               debug("No chosen node found, can't get kernel start address\n");
+               return 0;
+       }
+
+#ifdef CONFIG_ARCH_RV64I
+       ret = ofnode_read_u64(chosen_node, "riscv,kernel-start",
+                             (u64 *)&kernel_start);
+#else
+       ret = ofnode_read_u32(chosen_node, "riscv,kernel-start",
+                             (u32 *)&kernel_start);
+#endif
+       if (ret) {
+               debug("Can't find kernel start address in device tree\n");
+               return 0;
+       }
+
+       env_set_hex("kernel_start", kernel_start);
+
+       return 0;
+}

diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 66d61bd896de09a43b4b90cfc0b97cd5174ff342..b29d155d095c4704655ba9c974329fee8c169a52 100644 (file)
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -21,11 +21,21 @@
 #define CONFIG_ENV_SIZE                        SZ_4K
 
 #define BOOT_TARGET_DEVICES(func) \
+       func(QEMU, qemu, na) \
        func(VIRTIO, virtio, 0) \
        func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>
 
+#define BOOTENV_DEV_QEMU(devtypeu, devtypel, instance) \
+       "bootcmd_qemu=" \
+               "if env exists kernel_start; then " \
+                       "bootm ${kernel_start} - ${fdtcontroladdr};" \
+               "fi;\0"
+
+#define BOOTENV_DEV_NAME_QEMU(devtypeu, devtypel, instance) \
+       "qemu "
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffffffffffff\0" \
        "initrd_high=0xffffffffffffffff\0" \