diff options
| author | Simon Glass <[email protected]> | 2023-01-28 15:00:26 -0700 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-02-06 13:04:53 -0500 |
| commit | c2488a81b8b88db393de9680de1c26a71ea3afb6 (patch) | |
| tree | 372b2413be68146a92734169e468da11f4803aab /include | |
| parent | 9c6d57dc7e836c67aef95bc49ba6e7fe714b09d4 (diff) | |
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 <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/qemu-arm.h | 54 |
1 files changed, 2 insertions, 52 deletions
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 45bd94ee5c7..02f9354c05d 100644 --- 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 */ |