Merge tag 'efi-2020-07-rc2-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / qemu-arm.h

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index afbf7a828d8b59e0d1d6dce59519ebc795c85b58..1ef75a87836b22905edccf59bd6b6caca62328ec 100644 (file)
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -17,12 +17,12 @@
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + SZ_2M)
 #define CONFIG_SYS_MALLOC_LEN          SZ_16M
 
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
+
 /* For timer, QEMU emulates an ARMv7/ARMv8 architected timer */
 #define CONFIG_SYS_HZ                       1000
 
 /* Environment options */
-#define CONFIG_ENV_ADDR                        0x4000000
-#define CONFIG_ENV_SIZE                        SZ_256K
 
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
@@ -32,8 +32,6 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT "pci enum"
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \