From: Janne Grunau <j@jannau.net>
To: Mark Kettenis <kettenis@openbsd.org>, Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>,
u-boot@lists.denx.de, asahi@lists.linux.dev,
Janne Grunau <j@jannau.net>
Subject: [PATCH v2 4/5] arm: apple: Switch to standard boot
Date: Thu, 18 Apr 2024 21:00:28 +0200 [thread overview]
Message-ID: <20240418-apple_config-v2-4-7e5c6b9a9db3@jannau.net> (raw)
In-Reply-To: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net>
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>
---
arch/arm/Kconfig | 2 +-
include/configs/apple.h | 20 ++------------------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 01d6556c42..9b83b2e6f8 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 a70440b3ad..1e08b11448 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
--
2.44.0
next prev parent reply other threads:[~2024-04-18 19:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 19:00 [PATCH v2 0/5] configs: apple: Switch to standard boot + small adjustments Janne Grunau
2024-04-18 19:00 ` [PATCH v2 1/5] apple_m1_defconfig: Turn on CONFIG_SYS_64BIT_LBA Janne Grunau
2024-04-18 19:00 ` [PATCH v2 2/5] configs: apple: Use "vidconsole,serial" as stdout/stderr Janne Grunau
2024-04-18 19:00 ` [PATCH v2 3/5] configs: apple: Enable CMD_SELECT_FONT and FONT_16X32 Janne Grunau
2024-04-18 19:00 ` Janne Grunau [this message]
2024-04-18 19:00 ` [PATCH v2 5/5] arm: apple: Do not list bootflows on boot Janne Grunau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240418-apple_config-v2-4-7e5c6b9a9db3@jannau.net \
--to=j@jannau.net \
--cc=asahi@lists.linux.dev \
--cc=kettenis@openbsd.org \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).