arm: qemu: Switch to standard boot

Drop use of the distro scripts and use standard boot instead.

Enable BOOTDEV_FULL just for convenience, although this does add quite a
bit to the size.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig
index 2f46030855d9b1f82666ba8bf3000d84e0e0cfbc..40aec927fc91dfa34d0b482fc6cf445f074048a4 100644 (file)
--- a/configs/qemu_arm64_defconfig
+++ b/configs/qemu_arm64_defconfig
@@ -13,13 +13,14 @@ CONFIG_SYS_LOAD_ADDR=0x40200000
 CONFIG_ENV_ADDR=0x4000000
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_CPUINFO is not set
@@ -27,6 +28,7 @@ CONFIG_USE_PREBOOT=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_DFU=y

diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
index f0ee54658a556f184315dfbb20ce8b81f6b19e5a..ad02526a5dcb3be5767f9173779d2f2c51e4297d 100644 (file)
--- a/configs/qemu_arm_defconfig
+++ b/configs/qemu_arm_defconfig
@@ -14,13 +14,14 @@ CONFIG_SYS_LOAD_ADDR=0x40200000
 CONFIG_ENV_ADDR=0x4000000
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_BEST_MATCH=y
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_CPUINFO is not set
@@ -28,6 +29,7 @@ CONFIG_USE_PREBOOT=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_CMD_BOOTZ=y
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 45bd94ee5c76f3965d62788366ddf8c271d22176..02f9354c05d92450cb91385750ecc6f72d3c85f5 100644 (file)
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -21,60 +21,10 @@
        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 */
 
 /* 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(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 BOOT_TARGETS   "qfw usb scsi virtio nvme dhcp"
 
 #define CFG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffff\0" \
@@ -84,6 +34,6 @@
        "pxefile_addr_r=0x40300000\0" \
        "kernel_addr_r=0x40400000\0" \
        "ramdisk_addr_r=0x44000000\0" \
-       BOOTENV
+       "boot_targets=" BOOT_TARGETS "\0"
 
 #endif /* __CONFIG_H */