global: Migrate CONFIG_STACKBASE to CFG

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

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index fb599c9..45bd94e 100644 (file)
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -10,27 +10,73 @@
 
 /* Physical memory map */
 
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
-/* The DTB generated by QEMU is placed at start of RAM, stay away from there */
-#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + SZ_2M)
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + SZ_2M)
-#define CONFIG_SYS_MALLOC_LEN          SZ_16M
+/* GUIDs for capsule updatable firmware images */
+#define QEMU_ARM_UBOOT_IMAGE_GUID \
+       EFI_GUID(0xf885b085, 0x99f8, 0x45af, 0x84, 0x7d, \
+                0xd5, 0x14, 0x10, 0x7a, 0x4a, 0x2c)
+
+#define QEMU_ARM64_UBOOT_IMAGE_GUID \
+       EFI_GUID(0x058b7d83, 0x50d5, 0x4c47, 0xa1, 0x95, \
+                0x60, 0xd8, 0x6a, 0xd3, 0x41, 0xc4)
+
+/* Try files from QEMU's -kernel/-initrd, through the QEMU firmware device. */
+#define BOOTENV_DEV_QFW(devtypeu, devtypel, instance) \
+       "bootcmd_qfw= " \
+               "if qfw load $kernel_addr_r $ramdisk_addr_r; then " \
+               "  booti $kernel_addr_r $ramdisk_addr_r:$filesize $fdtcontroladdr; " \
+               "  if test $? -eq 1; then " \
+               "    bootz $kernel_addr_r $ramdisk_addr_r:$filesize $fdtcontroladdr; " \
+               "  fi ; " \
+               "fi\0"
+#define BOOTENV_DEV_NAME_QFW(devtypeu, devtypel, instance) "qfw "
 
 /* For timer, QEMU emulates an ARMv7/ARMv8 architected timer */
-#define CONFIG_SYS_HZ                       1000
 
 /* Environment options */
 
+#if CONFIG_IS_ENABLED(CMD_USB)
+# define BOOT_TARGET_USB(func) func(USB, usb, 0)
+#else
+# define BOOT_TARGET_USB(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_SCSI)
+# define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
+#else
+# define BOOT_TARGET_SCSI(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_VIRTIO)
+# define BOOT_TARGET_VIRTIO(func) func(VIRTIO, virtio, 0)
+#else
+# define BOOT_TARGET_VIRTIO(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_NVME)
+# define BOOT_TARGET_NVME(func) func(NVME, nvme, 0)
+#else
+# define BOOT_TARGET_NVME(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_DHCP)
+# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
+#else
+# define BOOT_TARGET_DHCP(func)
+#endif
+
 #define BOOT_TARGET_DEVICES(func) \
-       func(USB, usb, 0) \
-       func(SCSI, scsi, 0) \
-       func(VIRTIO, virtio, 0) \
-       func(DHCP, dhcp, na)
+       func(QFW, qfw, na) \
+       BOOT_TARGET_USB(func) \
+       BOOT_TARGET_SCSI(func) \
+       BOOT_TARGET_VIRTIO(func) \
+       BOOT_TARGET_NVME(func) \
+       BOOT_TARGET_DHCP(func)
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "fdt_addr=0x40000000\0" \
@@ -40,16 +86,4 @@
        "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 */