arm: qemu: Switch to a text environment

Use the new environment format so we can drop most of the config.h file.

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

diff --git a/board/emulation/qemu-arm/qemu-arm.env b/board/emulation/qemu-arm/qemu-arm.env
new file mode 100644 (file)
index 0000000..e658d5e
--- /dev/null
+++ b/board/emulation/qemu-arm/qemu-arm.env
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+/* environment for qemu-arm and qemu-arm64 */
+
+fdt_high=0xffffffff
+initrd_high=0xffffffff
+fdt_addr=0x40000000
+scriptaddr=0x40200000
+pxefile_addr_r=0x40300000
+kernel_addr_r=0x40400000
+ramdisk_addr_r=0x44000000
+boot_targets=qfw usb scsi virtio nvme dhcp

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 02f9354c05d92450cb91385750ecc6f72d3c85f5..77ab573825437133f4ec979522bc68730f780ffb 100644 (file)
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -23,17 +23,4 @@
 
 /* For timer, QEMU emulates an ARMv7/ARMv8 architected timer */
 
-/* Environment options */
-#define BOOT_TARGETS   "qfw usb scsi virtio nvme dhcp"
-
-#define CFG_EXTRA_ENV_SETTINGS \
-       "fdt_high=0xffffffff\0" \
-       "initrd_high=0xffffffff\0" \
-       "fdt_addr=0x40000000\0" \
-       "scriptaddr=0x40200000\0" \
-       "pxefile_addr_r=0x40300000\0" \
-       "kernel_addr_r=0x40400000\0" \
-       "ramdisk_addr_r=0x44000000\0" \
-       "boot_targets=" BOOT_TARGETS "\0"
-
 #endif /* __CONFIG_H */