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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 01d6556c42b6f613acbe5bf5179435b8e73b35ec..9b83b2e6f8fe3ecca9500c81eb48157ba35accb4 100644 (file)
--- 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 a70440b3adcb50d4869e50fc13418e731d99a562..1e08b114480e5d66e4db0ef5b774d0f7f38b5280 100644 (file)
--- 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