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 eb874828154f003ffd43e46b751fc55e28bb845d..1ef75a87836b22905edccf59bd6b6caca62328ec 100644 (file)
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2017 Tuomas Tynkkynen
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -11,7 +10,6 @@
 
 /* Physical memory map */
 
-#define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE          0x40000000
 
 /* The DTB generated by QEMU is placed at start of RAM, stay away from there */
@@ -19,26 +17,21 @@
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + SZ_2M)
 #define CONFIG_SYS_MALLOC_LEN          SZ_16M
 
-/* QEMU implements a 62.5MHz architected timer */
-/* FIXME: can we rely on CNTFREQ instead of hardcoding this fact here? */
-#define CONFIG_SYS_ARCH_TIMER
-#define CONFIG_SYS_HZ                       1000
-#define CONFIG_SYS_HZ_CLOCK                 62500000
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
-/* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
+/* For timer, QEMU emulates an ARMv7/ARMv8 architected timer */
+#define CONFIG_SYS_HZ                       1000
 
 /* Environment options */
-#define CONFIG_ENV_SIZE                                SZ_64K
-
-#include <config_distro_defaults.h>
 
 #define BOOT_TARGET_DEVICES(func) \
-       func(SCSI, scsi, 0)
+       func(USB, usb, 0) \
+       func(SCSI, scsi, 0) \
+       func(VIRTIO, virtio, 0) \
+       func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_PREBOOT "pci enum"
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
@@ -49,4 +42,16 @@
        "ramdisk_addr_r=0x44000000\0" \
        BOOTENV
 
+#define CONFIG_SYS_CBSIZE 512
+
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#ifdef CONFIG_TFABOOT
+#define CONFIG_SYS_FLASH_BASE          0x4000000
+#define CONFIG_SYS_MAX_FLASH_BANKS     1
+#else
+#define CONFIG_SYS_FLASH_BASE          0x0
+#define CONFIG_SYS_MAX_FLASH_BANKS     2
+#endif
+#define CONFIG_SYS_MAX_FLASH_SECT      256 /* Sector: 256K, Bank: 64M */
+
 #endif /* __CONFIG_H */