diff options
| author | Simon Glass <[email protected]> | 2023-07-12 09:04:41 -0600 |
|---|---|---|
| committer | Bin Meng <[email protected]> | 2023-07-17 13:38:35 +0800 |
| commit | 63b7ccbf9ffe9e79a6762a94eec74c8159f11a14 (patch) | |
| tree | 585b26877b6d50bea448b3ce2294ef6e27438de0 | |
| parent | 1e5ff886575f5a870cb5f89e6c70b35160479f1f (diff) | |
x86: qemu: Switch to standard boot
Drop use of the distro boot script and use standard boot instead.
Moving to a text-based environment would be desirable also, but requires
additional work.
Signed-off-by: Simon Glass <[email protected]>
Reviewed-by: Bin Meng <[email protected]>
| -rw-r--r-- | configs/qemu-x86_64_defconfig | 2 | ||||
| -rw-r--r-- | configs/qemu-x86_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/qemu-x86.h | 8 |
3 files changed, 2 insertions, 10 deletions
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 7e9f90891a4..5dfad36ba52 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -20,7 +20,7 @@ CONFIG_X86_OFFSET_U_BOOT=0xfff00000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_MONITOR_BASE=0x01110000 -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SHOW_BOOT_PROGRESS=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index a7c37b8b0e1..56788cd185f 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -9,7 +9,7 @@ CONFIG_SMP=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_FIT=y -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SHOW_BOOT_PROGRESS=y diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 33263a46a40..3e5235291a2 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -12,14 +12,6 @@ #include <linux/sizes.h> -#define BOOT_TARGET_DEVICES(func) \ - func(USB, usb, 0) \ - func(SCSI, scsi, 0) \ - func(VIRTIO, virtio, 0) \ - func(IDE, ide, 0) \ - func(DHCP, dhcp, na) - -#include <config_distro_bootcmd.h> #include <configs/x86-common.h> #define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ |