Merge patch series "configs: apple: Switch to standard boot + small adjustments"
Janne Grunau <j@jannau.net> says:
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c9f2657..9b17ad3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1022,7 +1022,7 @@
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/configs/apple_m1_defconfig b/configs/apple_m1_defconfig
index e00d72e..4eac1a9 100644
--- a/configs/apple_m1_defconfig
+++ b/configs/apple_m1_defconfig
@@ -8,8 +8,11 @@
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
+CONFIG_SYS_64BIT_LBA=y
CONFIG_APPLE_SPI_KEYB=y
# CONFIG_MMC is not set
CONFIG_NVME_APPLE=y
@@ -18,6 +21,7 @@
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
diff --git a/include/configs/apple.h b/include/configs/apple.h
index 0576bc0..1e08b11 100644
--- a/include/configs/apple.h
+++ b/include/configs/apple.h
@@ -6,29 +6,13 @@
/* 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)
-#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