mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-05-04 20:26:13 +02:00
arm: apple: Switch to standard boot
Use standard boot instead of the distro boot scripts. Use BOOTSTD_FULL instead of BOOTSTD_DEFAULTS for easier interactive use. Signed-off-by: Janne Grunau <j@jannau.net> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Neal Gompa <neal@gompa.dev>
This commit is contained in:
parent
59f5ce836d
commit
f1972dd73f
@ -1034,7 +1034,7 @@ config ARCH_APPLE
|
||||
select USB
|
||||
imply CMD_DM
|
||||
imply CMD_GPT
|
||||
imply DISTRO_DEFAULTS
|
||||
imply BOOTSTD_FULL
|
||||
imply OF_HAS_PRIOR_STAGE
|
||||
|
||||
config ARCH_OWL
|
||||
|
||||
@ -9,26 +9,10 @@
|
||||
"stdout=vidconsole,serial\0" \
|
||||
"stderr=vidconsole,serial\0"
|
||||
|
||||
#if IS_ENABLED(CONFIG_CMD_NVME)
|
||||
#define BOOT_TARGET_NVME(func) func(NVME, nvme, 0)
|
||||
#else
|
||||
#define BOOT_TARGET_NVME(func)
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_CMD_USB)
|
||||
#define BOOT_TARGET_USB(func) func(USB, usb, 0)
|
||||
#else
|
||||
#define BOOT_TARGET_USB(func)
|
||||
#endif
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
BOOT_TARGET_NVME(func) \
|
||||
BOOT_TARGET_USB(func)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
#define BOOT_TARGETS "nvme usb"
|
||||
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
ENV_DEVICE_SETTINGS \
|
||||
BOOTENV
|
||||
"boot_targets=" BOOT_TARGETS "\0"
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user