diff options
| author | Janne Grunau <j@jannau.net> | 2024-04-18 21:00:28 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-22 11:02:08 -0600 |
| commit | f1972dd73f4dd18d708e5109ffcb492d0687487b (patch) | |
| tree | ad83e90f919ba3250282e8af35f9fbc102bf400e | |
| parent | 59f5ce836d8ac86d31f0c902d9fc1e1f4425fb53 (diff) | |
| download | u-boot-f1972dd73f4dd18d708e5109ffcb492d0687487b.zip u-boot-f1972dd73f4dd18d708e5109ffcb492d0687487b.tar.gz u-boot-f1972dd73f4dd18d708e5109ffcb492d0687487b.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | include/configs/apple.h | 20 |
2 files changed, 3 insertions, 19 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 01d6556..9b83b2e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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 diff --git a/include/configs/apple.h b/include/configs/apple.h index a70440b..1e08b11 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -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 |