diff mbox series

[4/4] qcom_defconfig: enable capsule update support

Message ID 20250326-b4-qcom-capsule-update-improvements-v1-4-afe2e3696675@linaro.org
State New
Headers show
Series Qualcomm: expand capsule update support | expand

Commit Message

Caleb Connolly March 26, 2025, 5:40 p.m. UTC
We can now correctly identify which partition U-Boot is flashed to
between uefi, xbl, and boot (including A/B support) so enable capsule
update support for all boards.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 configs/qcm6490_defconfig | 6 ------
 configs/qcom_defconfig    | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

Comments

Peng Fan (OSS) March 27, 2025, 8:46 a.m. UTC | #1
On Wed, Mar 26, 2025 at 06:40:37PM +0100, Caleb Connolly wrote:
>We can now correctly identify which partition U-Boot is flashed to
>between uefi, xbl, and boot (including A/B support) so enable capsule
>update support for all boards.
>
>Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>---
> configs/qcm6490_defconfig | 6 ------
> configs/qcom_defconfig    | 3 +++
> 2 files changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig
>index ba26924da161b1c4b5378955185f314b05cb1006..5ddc5ab3ef8cfe8f9cc09eb573c1a8130b394b43 100644
>--- a/configs/qcm6490_defconfig
>+++ b/configs/qcm6490_defconfig
>@@ -18,10 +18,4 @@ CONFIG_DEBUG_UART_CLOCK=14745600
> CONFIG_TEXT_BASE=0x9fc00000
> CONFIG_REMAKE_ELF=y
> 
> CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs6490-rb3gen2"
>-
>-# Enable capsule updates
>-CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
>-CONFIG_EFI_CAPSULE_ON_DISK=y
>-CONFIG_EFI_IGNORE_OSINDICATIONS=y
>-CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
>diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
>index ba4d38d100e053e3708ee2623bf3530787b6b94f..d69185f3c2f0452e6757b785a023cf612bfa3839 100644
>--- a/configs/qcom_defconfig
>+++ b/configs/qcom_defconfig
>@@ -5,8 +5,11 @@ CONFIG_SYS_INIT_SP_BSS_OFFSET=1572864
> CONFIG_ARCH_SNAPDRAGON=y
> CONFIG_NR_DRAM_BANKS=24
> CONFIG_DEFAULT_DEVICE_TREE="qcom/sdm845-db845c"
> CONFIG_SYS_LOAD_ADDR=0xA0000000
>+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
>+CONFIG_EFI_CAPSULE_ON_DISK=y
>+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
> CONFIG_BUTTON_CMD=y
> CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_BOOTSTD_FULL=y

For capsule update, CONFIG_EFI_MM_COMM_TEE is not needed?

Regards,
Peng
>
>-- 
>2.49.0
>
Caleb Connolly March 27, 2025, 12:30 p.m. UTC | #2
On 3/27/25 09:46, Peng Fan wrote:
> On Wed, Mar 26, 2025 at 06:40:37PM +0100, Caleb Connolly wrote:
>> We can now correctly identify which partition U-Boot is flashed to
>> between uefi, xbl, and boot (including A/B support) so enable capsule
>> update support for all boards.
>>
>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>> ---
>> configs/qcm6490_defconfig | 6 ------
>> configs/qcom_defconfig    | 3 +++
>> 2 files changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig
>> index ba26924da161b1c4b5378955185f314b05cb1006..5ddc5ab3ef8cfe8f9cc09eb573c1a8130b394b43 100644
>> --- a/configs/qcm6490_defconfig
>> +++ b/configs/qcm6490_defconfig
>> @@ -18,10 +18,4 @@ CONFIG_DEBUG_UART_CLOCK=14745600
>> CONFIG_TEXT_BASE=0x9fc00000
>> CONFIG_REMAKE_ELF=y
>>
>> CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs6490-rb3gen2"
>> -
>> -# Enable capsule updates
>> -CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
>> -CONFIG_EFI_CAPSULE_ON_DISK=y
>> -CONFIG_EFI_IGNORE_OSINDICATIONS=y
>> -CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
>> diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
>> index ba4d38d100e053e3708ee2623bf3530787b6b94f..d69185f3c2f0452e6757b785a023cf612bfa3839 100644
>> --- a/configs/qcom_defconfig
>> +++ b/configs/qcom_defconfig
>> @@ -5,8 +5,11 @@ CONFIG_SYS_INIT_SP_BSS_OFFSET=1572864
>> CONFIG_ARCH_SNAPDRAGON=y
>> CONFIG_NR_DRAM_BANKS=24
>> CONFIG_DEFAULT_DEVICE_TREE="qcom/sdm845-db845c"
>> CONFIG_SYS_LOAD_ADDR=0xA0000000
>> +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
>> +CONFIG_EFI_CAPSULE_ON_DISK=y
>> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
>> CONFIG_BUTTON_CMD=y
>> CONFIG_FIT=y
>> CONFIG_FIT_VERBOSE=y
>> CONFIG_BOOTSTD_FULL=y
> 
> For capsule update, CONFIG_EFI_MM_COMM_TEE is not needed?

No, Qualcomm have a proprietary TEE. We rely on storing EFI variables in 
a file on the ESP. There does seem to be an issue where capsule updates 
don't occur unless that file already exists though...
> 
> Regards,
> Peng
>>
>> -- 
>> 2.49.0
>>
diff mbox series

Patch

diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig
index ba26924da161b1c4b5378955185f314b05cb1006..5ddc5ab3ef8cfe8f9cc09eb573c1a8130b394b43 100644
--- a/configs/qcm6490_defconfig
+++ b/configs/qcm6490_defconfig
@@ -18,10 +18,4 @@  CONFIG_DEBUG_UART_CLOCK=14745600
 CONFIG_TEXT_BASE=0x9fc00000
 CONFIG_REMAKE_ELF=y
 
 CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs6490-rb3gen2"
-
-# Enable capsule updates
-CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
-CONFIG_EFI_CAPSULE_ON_DISK=y
-CONFIG_EFI_IGNORE_OSINDICATIONS=y
-CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
index ba4d38d100e053e3708ee2623bf3530787b6b94f..d69185f3c2f0452e6757b785a023cf612bfa3839 100644
--- a/configs/qcom_defconfig
+++ b/configs/qcom_defconfig
@@ -5,8 +5,11 @@  CONFIG_SYS_INIT_SP_BSS_OFFSET=1572864
 CONFIG_ARCH_SNAPDRAGON=y
 CONFIG_NR_DRAM_BANKS=24
 CONFIG_DEFAULT_DEVICE_TREE="qcom/sdm845-db845c"
 CONFIG_SYS_LOAD_ADDR=0xA0000000
+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
+CONFIG_EFI_CAPSULE_ON_DISK=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
 CONFIG_BUTTON_CMD=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTSTD_FULL=y