Merge tag 'efi-2019-07-rc3-3' of git://git.denx.de/u-boot-efi

[platform/kernel/u-boot.git] / include / configs / qemu-riscv.h

diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 66d61bd..b7110ed 100644 (file)
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -15,25 +15,41 @@
 
 #define CONFIG_SYS_MALLOC_LEN          SZ_8M
 
-#define CONFIG_SYS_BOOTM_LEN           SZ_16M
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
+
+#define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
 
 /* Environment options */
 #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" \
-       "kernel_addr_r=0x81000000\0" \
-       "fdt_addr_r=0x82000000\0" \
-       "scriptaddr=0x82100000\0" \
-       "pxefile_addr_r=0x82200000\0" \
-       "ramdisk_addr_r=0x82300000\0" \
+       "kernel_addr_r=0x84000000\0" \
+       "fdt_addr_r=0x88000000\0" \
+       "scriptaddr=0x88100000\0" \
+       "pxefile_addr_r=0x88200000\0" \
+       "ramdisk_addr_r=0x88300000\0" \
        BOOTENV
 
+#define CONFIG_PREBOOT \
+       "setenv fdt_addr ${fdtcontroladdr};" \
+       "fdt addr ${fdtcontroladdr};"
+
 #endif /* __CONFIG_H */