From 96212991d7cd456a6ab0e5e0962edeb58939ab7e Mon Sep 17 00:00:00 2001 From: Ferenc Fejes <7911352+SPYFF@users.noreply.github.com> Date: Sun, 11 May 2025 17:20:20 +0200 Subject: [PATCH] defconfig: r64/r2/r3/r3mini/r4: Enable EFI related options U-Boot can load and boot EFI payload (e.g.: GRUB). This commit enable the related options discussed in the docs [1]. To play safe, be conservative and do not enable secure boot and other exotic features. [1] https://docs.u-boot.org/en/latest/develop/uefi/uefi.html --- configs/mt7622_bpi-r64_defconfig | 5 +++++ configs/mt7623n_bpir2_defconfig | 6 +++++- configs/mt7986a_bpir3_emmc_defconfig | 6 +++++- configs/mt7986a_bpir3_sd_defconfig | 6 +++++- configs/mt7986a_bpir3mini_emmc_defconfig | 7 ++++++- configs/mt7988a_bpir4_emmc_defconfig | 6 +++++- configs/mt7988a_bpir4_sd_defconfig | 6 +++++- 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/configs/mt7622_bpi-r64_defconfig b/configs/mt7622_bpi-r64_defconfig index a5646decce1..ddafe7fd84a 100644 --- a/configs/mt7622_bpi-r64_defconfig +++ b/configs/mt7622_bpi-r64_defconfig @@ -65,6 +65,11 @@ CONFIG_MTK_TIMER=y CONFIG_LZ4=y CONFIG_LZO=y CONFIG_HEXDUMP=y +CONFIG_CMD_BOOTEFI=y +CONFIG_EFI_LOADER=y +CONFIG_BLK=y +CONFIG_PARTITIONS=y +CONFIG_BOOTM_EFI=y CONFIG_USE_DEFAULT_ENV_FILE=y CONFIG_DEFAULT_ENV_FILE="uEnv_r64.txt" diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig index fafe0c5d8d5..861bf5b9cca 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -65,7 +65,11 @@ CONFIG_TIMER=y CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y CONFIG_LZMA=y -# CONFIG_EFI_LOADER is not set +CONFIG_CMD_BOOTEFI=y +CONFIG_EFI_LOADER=y +CONFIG_BLK=y +CONFIG_PARTITIONS=y +CONFIG_BOOTM_EFI=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="BPI-R2> " diff --git a/configs/mt7986a_bpir3_emmc_defconfig b/configs/mt7986a_bpir3_emmc_defconfig index ddc22ea7607..b669e2e54f6 100644 --- a/configs/mt7986a_bpir3_emmc_defconfig +++ b/configs/mt7986a_bpir3_emmc_defconfig @@ -13,7 +13,11 @@ CONFIG_SYS_LOAD_ADDR=0x46000000 CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 CONFIG_DEBUG_UART=y -# CONFIG_EFI_LOADER is not set +CONFIG_CMD_BOOTEFI=y +CONFIG_EFI_LOADER=y +CONFIG_BLK=y +CONFIG_PARTITIONS=y +CONFIG_BOOTM_EFI=y CONFIG_DEFAULT_FDT_FILE="mt7986a-bpi-r3-emmc" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 diff --git a/configs/mt7986a_bpir3_sd_defconfig b/configs/mt7986a_bpir3_sd_defconfig index 44187617646..3a9f0e27725 100644 --- a/configs/mt7986a_bpir3_sd_defconfig +++ b/configs/mt7986a_bpir3_sd_defconfig @@ -13,7 +13,11 @@ CONFIG_SYS_LOAD_ADDR=0x46000000 CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 CONFIG_DEBUG_UART=y -# CONFIG_EFI_LOADER is not set +CONFIG_CMD_BOOTEFI=y +CONFIG_EFI_LOADER=y +CONFIG_BLK=y +CONFIG_PARTITIONS=y +CONFIG_BOOTM_EFI=y CONFIG_DEFAULT_FDT_FILE="mt7986a-bpi-r3-sd" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 diff --git a/configs/mt7986a_bpir3mini_emmc_defconfig b/configs/mt7986a_bpir3mini_emmc_defconfig index 1502dd29dcc..0bc1b54ccae 100644 --- a/configs/mt7986a_bpir3mini_emmc_defconfig +++ b/configs/mt7986a_bpir3mini_emmc_defconfig @@ -62,9 +62,14 @@ CONFIG_DM_SERIAL=y CONFIG_MTK_SERIAL=y CONFIG_FAT_WRITE=y CONFIG_HEXDUMP=y -# CONFIG_EFI_LOADER is not set CONFIG_LMB_MAX_REGIONS=64 +CONFIG_CMD_BOOTEFI=y +CONFIG_EFI_LOADER=y +CONFIG_BLK=y +CONFIG_PARTITIONS=y +CONFIG_BOOTM_EFI=y + CONFIG_AUTOBOOT=y #CONFIG_BOOTDELAY=2 diff --git a/configs/mt7988a_bpir4_emmc_defconfig b/configs/mt7988a_bpir4_emmc_defconfig index 827d4331016..3df64faca43 100644 --- a/configs/mt7988a_bpir4_emmc_defconfig +++ b/configs/mt7988a_bpir4_emmc_defconfig @@ -32,6 +32,11 @@ CONFIG_CMD_PING=y CONFIG_CMD_SMC=y CONFIG_DOS_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_CMD_BOOTEFI=y +CONFIG_EFI_LOADER=y +CONFIG_BLK=y +CONFIG_PARTITIONS=y +CONFIG_BOOTM_EFI=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y @@ -80,7 +85,6 @@ CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y CONFIG_LZO=y CONFIG_HEXDUMP=y -# CONFIG_EFI_LOADER is not set CONFIG_CMD_BOOTMENU=y CONFIG_CMD_EXT4=y diff --git a/configs/mt7988a_bpir4_sd_defconfig b/configs/mt7988a_bpir4_sd_defconfig index 7e8318f6a5e..2e89f2f6db4 100644 --- a/configs/mt7988a_bpir4_sd_defconfig +++ b/configs/mt7988a_bpir4_sd_defconfig @@ -68,7 +68,11 @@ CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y CONFIG_LZO=y CONFIG_HEXDUMP=y -# CONFIG_EFI_LOADER is not set +CONFIG_CMD_BOOTEFI=y +CONFIG_EFI_LOADER=y +CONFIG_BLK=y +CONFIG_PARTITIONS=y +CONFIG_BOOTM_EFI=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_EXT4=y