diff options
| author | Tom Rini | 2024-04-22 11:02:16 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-04-22 11:02:16 -0600 |
| commit | 230a1dd608ca06dd618bd61b1df689b14e10a1c6 (patch) | |
| tree | 1ae220e24c606e5072fc29b7b20ffa47e8fa09e2 /include | |
| parent | 9552923ded4484c3dd5bc9e51f7a473cb48914ba (diff) | |
| parent | 63334ca9b593dcb378c19cc0712174dbe918e027 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/apple.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/include/configs/apple.h b/include/configs/apple.h index 0576bc04c94..1e08b114480 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 |