* [PATCH v2 0/5] configs: apple: Switch to standard boot + small adjustments
@ 2024-04-18 19:00 Janne Grunau
2024-04-18 19:00 ` [PATCH v2 1/5] apple_m1_defconfig: Turn on CONFIG_SYS_64BIT_LBA Janne Grunau
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Janne Grunau @ 2024-04-18 19:00 UTC (permalink / raw)
To: Mark Kettenis, Tom Rini
Cc: Simon Glass, u-boot, asahi, Janne Grunau, Hector Martin,
Neal Gompa
This series contains a few misc config changes for Apple silicon
systems:
- switch from the deprecated distro boot scripts to standard boot
- allows EFI console resizing based on the video console size
- enables 16x32 bitmap fonts as Apple devices come with high DPI
displays
- enables 64-bit LBA addressing
Signed-off-by: Janne Grunau <j@jannau.net>
---
Changes in v2:
- added Reviewed-by: tags
- switched to BOOTSTD_FULL to enable efi_bootmgr and make interactive
use easier
- override BOOTCOMMAND to not list the bootflows
- rebased onto v2024.04
- Link to v1: https://lore.kernel.org/r/20240317-apple_config-v1-0-1b862bc140a9@jannau.net
---
Hector Martin (1):
apple_m1_defconfig: Turn on CONFIG_SYS_64BIT_LBA
Janne Grunau (4):
configs: apple: Use "vidconsole,serial" as stdout/stderr
configs: apple: Enable CMD_SELECT_FONT and FONT_16X32
arm: apple: Switch to standard boot
arm: apple: Do not list bootflows on boot
arch/arm/Kconfig | 2 +-
configs/apple_m1_defconfig | 4 ++++
include/configs/apple.h | 24 ++++--------------------
3 files changed, 9 insertions(+), 21 deletions(-)
---
base-commit: 25049ad560826f7dc1c4740883b0016014a59789
change-id: 20240317-apple_config-981fcd9028b9
Best regards,
--
Janne Grunau <j@jannau.net>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/5] apple_m1_defconfig: Turn on CONFIG_SYS_64BIT_LBA
2024-04-18 19:00 [PATCH v2 0/5] configs: apple: Switch to standard boot + small adjustments Janne Grunau
@ 2024-04-18 19:00 ` Janne Grunau
2024-04-18 19:00 ` [PATCH v2 2/5] configs: apple: Use "vidconsole,serial" as stdout/stderr Janne Grunau
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Janne Grunau @ 2024-04-18 19:00 UTC (permalink / raw)
To: Mark Kettenis, Tom Rini
Cc: Simon Glass, u-boot, asahi, Janne Grunau, Hector Martin,
Neal Gompa
From: Hector Martin <marcan@marcan.st>
This makes USB HDDs >2TiB work. The only reason this hasn't bitten us
for the internal NVMe yet is the 4K sector size, because the largest SSD
Apple sells is 8TB and we can handle up to 16TiB with that sector size.
Close call.
Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Signed-off-by: Janne Grunau <j@jannau.net>
---
configs/apple_m1_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig
index e00d72e8be..31d966f0ab 100644
--- a/configs/apple_m1_defconfig
+++ b/configs/apple_m1_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_PBSIZE=276
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOARD_LATE_INIT=y
# CONFIG_NET is not set
+CONFIG_SYS_64BIT_LBA=y
CONFIG_APPLE_SPI_KEYB=y
# CONFIG_MMC is not set
CONFIG_NVME_APPLE=y
--
2.44.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/5] configs: apple: Use "vidconsole,serial" as stdout/stderr
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 ` Janne Grunau
2024-04-18 19:00 ` [PATCH v2 3/5] configs: apple: Enable CMD_SELECT_FONT and FONT_16X32 Janne Grunau
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Janne Grunau @ 2024-04-18 19:00 UTC (permalink / raw)
To: Mark Kettenis, Tom Rini
Cc: Simon Glass, u-boot, asahi, Janne Grunau, Neal Gompa
The display size querying in efi_console relies on this order. The
display should be the primary output device and should be used to
display more than 80x25 chars.
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Signed-off-by: Janne Grunau <j@jannau.net>
---
include/configs/apple.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/apple.h b/include/configs/apple.h
index 0576bc04c9..a70440b3ad 100644
--- a/include/configs/apple.h
+++ b/include/configs/apple.h
@@ -6,8 +6,8 @@
/* Environment */
#define ENV_DEVICE_SETTINGS \
"stdin=serial,usbkbd,spikbd\0" \
- "stdout=serial,vidconsole\0" \
- "stderr=serial,vidconsole\0"
+ "stdout=vidconsole,serial\0" \
+ "stderr=vidconsole,serial\0"
#if IS_ENABLED(CONFIG_CMD_NVME)
#define BOOT_TARGET_NVME(func) func(NVME, nvme, 0)
--
2.44.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/5] configs: apple: Enable CMD_SELECT_FONT and FONT_16X32
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 ` Janne Grunau
2024-04-18 19:00 ` [PATCH v2 4/5] arm: apple: Switch to standard boot Janne Grunau
2024-04-18 19:00 ` [PATCH v2 5/5] arm: apple: Do not list bootflows on boot Janne Grunau
4 siblings, 0 replies; 6+ messages in thread
From: Janne Grunau @ 2024-04-18 19:00 UTC (permalink / raw)
To: Mark Kettenis, Tom Rini
Cc: Simon Glass, u-boot, asahi, Janne Grunau, Neal Gompa
Apple devices have high DPI displays so the larger fonts are preferable
for improved readability. This does not yet change the used font based
on the display's pixel density so the standard 8x16 font is still used
by default.
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Signed-off-by: Janne Grunau <j@jannau.net>
---
configs/apple_m1_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig
index 31d966f0ab..c30aec7c55 100644
--- a/configs/apple_m1_defconfig
+++ b/configs/apple_m1_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_PBSIZE=276
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOARD_LATE_INIT=y
+CONFIG_CMD_SELECT_FONT=y
# CONFIG_NET is not set
CONFIG_SYS_64BIT_LBA=y
CONFIG_APPLE_SPI_KEYB=y
@@ -19,6 +20,7 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_XHCI_PCI=y
CONFIG_USB_DWC3=y
CONFIG_USB_KEYBOARD=y
+CONFIG_VIDEO_FONT_16X32=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_NO_FB_CLEAR=y
CONFIG_VIDEO_SIMPLE=y
--
2.44.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/5] arm: apple: Switch to standard boot
2024-04-18 19:00 [PATCH v2 0/5] configs: apple: Switch to standard boot + small adjustments Janne Grunau
` (2 preceding siblings ...)
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
2024-04-18 19:00 ` [PATCH v2 5/5] arm: apple: Do not list bootflows on boot Janne Grunau
4 siblings, 0 replies; 6+ messages in thread
From: Janne Grunau @ 2024-04-18 19:00 UTC (permalink / raw)
To: Mark Kettenis, Tom Rini; +Cc: Simon Glass, u-boot, asahi, Janne Grunau
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 5/5] arm: apple: Do not list bootflows on boot
2024-04-18 19:00 [PATCH v2 0/5] configs: apple: Switch to standard boot + small adjustments Janne Grunau
` (3 preceding siblings ...)
2024-04-18 19:00 ` [PATCH v2 4/5] arm: apple: Switch to standard boot Janne Grunau
@ 2024-04-18 19:00 ` Janne Grunau
4 siblings, 0 replies; 6+ messages in thread
From: Janne Grunau @ 2024-04-18 19:00 UTC (permalink / raw)
To: Mark Kettenis, Tom Rini; +Cc: Simon Glass, u-boot, asahi, Janne Grunau
The bootflow list is only seen briefly and is probably more confusing
than helpful.
Signed-off-by: Janne Grunau <j@jannau.net>
---
configs/apple_m1_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig
index c30aec7c55..4eac1a9e2d 100644
--- a/configs/apple_m1_defconfig
+++ b/configs/apple_m1_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_CBSIZE=256
CONFIG_SYS_PBSIZE=276
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_BOOTCOMMAND="bootflow scan -b"
CONFIG_BOARD_LATE_INIT=y
CONFIG_CMD_SELECT_FONT=y
# CONFIG_NET is not set
--
2.44.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-18 19:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH v2 4/5] arm: apple: Switch to standard boot Janne Grunau
2024-04-18 19:00 ` [PATCH v2 5/5] arm: apple: Do not list bootflows on boot Janne Grunau
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).