diff mbox series

[v4,4/4] qcom_defconfig: enable capsule update support

Message ID 20241012-b4-qcom-capsule-updates-v4-4-abd05f15255f@linaro.org
State New
Headers show
Series qcom: implement capsule updates | expand

Commit Message

Caleb Connolly Oct. 12, 2024, 1:57 p.m. UTC 
Enable all the necessary options for capsule updates to work, as well as
a few additional EFI features.

Capsule updates themselves are only enabled for the RB3 Gen 2, since the
exact details on where to flash U-Boot (or how to handle multiple boot
methods) has not been finalised for other boards.

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

Comments

Neil Armstrong Oct. 14, 2024, 6:53 a.m. UTC | #1 
On 12/10/2024 15:57, Caleb Connolly wrote:
> Enable all the necessary options for capsule updates to work, as well as
> a few additional EFI features.
> 
> Capsule updates themselves are only enabled for the RB3 Gen 2, since the
> exact details on where to flash U-Boot (or how to handle multiple boot
> methods) has not been finalised for other boards.

-----------------------/\ finalized

> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>   configs/qcm6490_defconfig | 6 ++++++
>   configs/qcom_defconfig    | 8 +++++++-
>   2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig
> index 5ddc5ab3ef8c..ba26924da161 100644
> --- a/configs/qcm6490_defconfig
> +++ b/configs/qcm6490_defconfig
> @@ -18,4 +18,10 @@ 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 e7ed03ff0f24..4c8ff0e84372 100644
> --- a/configs/qcom_defconfig
> +++ b/configs/qcom_defconfig
> @@ -20,21 +20,24 @@ CONFIG_LOG_MAX_LEVEL=9
>   CONFIG_LOG_DEFAULT_LEVEL=4
>   # CONFIG_DISPLAY_CPUINFO is not set
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
>   CONFIG_CMD_BOOTMENU=y
> +CONFIG_CMD_NVEDIT_EFI=y
>   CONFIG_CMD_EEPROM=y
>   CONFIG_SYS_I2C_EEPROM_BUS=2
>   CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
>   CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=5
>   # CONFIG_CMD_BIND is not set
>   CONFIG_CMD_CLK=y
> +CONFIG_CMD_DFU=y
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_I2C=y
>   CONFIG_CMD_MMC=y
>   CONFIG_CMD_UFS=y
>   CONFIG_CMD_USB=y
>   CONFIG_CMD_CAT=y
>   CONFIG_CMD_BMP=y
> +CONFIG_CMD_EFIDEBUG=y
>   CONFIG_CMD_REGULATOR=y
>   CONFIG_CMD_LOG=y
>   CONFIG_OF_LIVE=y
>   CONFIG_USE_DEFAULT_ENV_FILE=y
> @@ -44,15 +47,18 @@ CONFIG_CLK=y
>   CONFIG_CLK_QCOM_APQ8016=y
>   CONFIG_CLK_QCOM_APQ8096=y
>   CONFIG_CLK_QCOM_QCM2290=y
>   CONFIG_CLK_QCOM_QCS404=y
> -CONFIG_CLK_QCOM_SC7280=y
>   CONFIG_CLK_QCOM_SDM845=y
>   CONFIG_CLK_QCOM_SM6115=y
>   CONFIG_CLK_QCOM_SM8150=y
>   CONFIG_CLK_QCOM_SM8250=y
>   CONFIG_CLK_QCOM_SM8550=y
>   CONFIG_CLK_QCOM_SM8650=y
> +CONFIG_CLK_QCOM_SC7280=y
> +CONFIG_DFU_MMC=y
> +CONFIG_DFU_SCSI=y
> +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x200000
>   CONFIG_MSM_GPIO=y
>   CONFIG_QCOM_PMIC_GPIO=y
>   CONFIG_DM_I2C=y
>   CONFIG_SYS_I2C_QUP=y
> 

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Ilias Apalodimas Oct. 14, 2024, 9 a.m. UTC | #2 
On Sat, 12 Oct 2024 at 16:57, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Enable all the necessary options for capsule updates to work, as well as
> a few additional EFI features.
>
> Capsule updates themselves are only enabled for the RB3 Gen 2, since the
> exact details on where to flash U-Boot (or how to handle multiple boot
> methods) has not been finalised for other boards.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>  configs/qcm6490_defconfig | 6 ++++++
>  configs/qcom_defconfig    | 8 +++++++-
>  2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig
> index 5ddc5ab3ef8c..ba26924da161 100644
> --- a/configs/qcm6490_defconfig
> +++ b/configs/qcm6490_defconfig
> @@ -18,4 +18,10 @@ 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 e7ed03ff0f24..4c8ff0e84372 100644
> --- a/configs/qcom_defconfig
> +++ b/configs/qcom_defconfig
> @@ -20,21 +20,24 @@ CONFIG_LOG_MAX_LEVEL=9
>  CONFIG_LOG_DEFAULT_LEVEL=4
>  # CONFIG_DISPLAY_CPUINFO is not set
>  CONFIG_DISPLAY_BOARDINFO_LATE=y
>  CONFIG_CMD_BOOTMENU=y
> +CONFIG_CMD_NVEDIT_EFI=y
>  CONFIG_CMD_EEPROM=y
>  CONFIG_SYS_I2C_EEPROM_BUS=2
>  CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
>  CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=5
>  # CONFIG_CMD_BIND is not set
>  CONFIG_CMD_CLK=y
> +CONFIG_CMD_DFU=y
>  CONFIG_CMD_GPIO=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
>  CONFIG_CMD_UFS=y
>  CONFIG_CMD_USB=y
>  CONFIG_CMD_CAT=y
>  CONFIG_CMD_BMP=y
> +CONFIG_CMD_EFIDEBUG=y
>  CONFIG_CMD_REGULATOR=y
>  CONFIG_CMD_LOG=y
>  CONFIG_OF_LIVE=y
>  CONFIG_USE_DEFAULT_ENV_FILE=y
> @@ -44,15 +47,18 @@ CONFIG_CLK=y
>  CONFIG_CLK_QCOM_APQ8016=y
>  CONFIG_CLK_QCOM_APQ8096=y
>  CONFIG_CLK_QCOM_QCM2290=y
>  CONFIG_CLK_QCOM_QCS404=y
> -CONFIG_CLK_QCOM_SC7280=y
>  CONFIG_CLK_QCOM_SDM845=y
>  CONFIG_CLK_QCOM_SM6115=y
>  CONFIG_CLK_QCOM_SM8150=y
>  CONFIG_CLK_QCOM_SM8250=y
>  CONFIG_CLK_QCOM_SM8550=y
>  CONFIG_CLK_QCOM_SM8650=y
> +CONFIG_CLK_QCOM_SC7280=y
> +CONFIG_DFU_MMC=y
> +CONFIG_DFU_SCSI=y
> +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x200000
>  CONFIG_MSM_GPIO=y
>  CONFIG_QCOM_PMIC_GPIO=y
>  CONFIG_DM_I2C=y
>  CONFIG_SYS_I2C_QUP=y
>
> --
> 2.46.2
>

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Caleb Connolly Oct. 17, 2024, 1:19 p.m. UTC | #3 
On 14/10/2024 08:53, Neil Armstrong wrote:
> On 12/10/2024 15:57, Caleb Connolly wrote:
>> Enable all the necessary options for capsule updates to work, as well as
>> a few additional EFI features.
>>
>> Capsule updates themselves are only enabled for the RB3 Gen 2, since the
>> exact details on where to flash U-Boot (or how to handle multiple boot
>> methods) has not been finalised for other boards.
> 
> -----------------------/\ finalized

Finalised is the correct spelling in British English :P

Is there a rule about this? XD

Thanks for the review!
> 
>>
>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>> ---
>>   configs/qcm6490_defconfig | 6 ++++++
>>   configs/qcom_defconfig    | 8 +++++++-
>>   2 files changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig
>> index 5ddc5ab3ef8c..ba26924da161 100644
>> --- a/configs/qcm6490_defconfig
>> +++ b/configs/qcm6490_defconfig
>> @@ -18,4 +18,10 @@ 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 e7ed03ff0f24..4c8ff0e84372 100644
>> --- a/configs/qcom_defconfig
>> +++ b/configs/qcom_defconfig
>> @@ -20,21 +20,24 @@ CONFIG_LOG_MAX_LEVEL=9
>>   CONFIG_LOG_DEFAULT_LEVEL=4
>>   # CONFIG_DISPLAY_CPUINFO is not set
>>   CONFIG_DISPLAY_BOARDINFO_LATE=y
>>   CONFIG_CMD_BOOTMENU=y
>> +CONFIG_CMD_NVEDIT_EFI=y
>>   CONFIG_CMD_EEPROM=y
>>   CONFIG_SYS_I2C_EEPROM_BUS=2
>>   CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
>>   CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=5
>>   # CONFIG_CMD_BIND is not set
>>   CONFIG_CMD_CLK=y
>> +CONFIG_CMD_DFU=y
>>   CONFIG_CMD_GPIO=y
>>   CONFIG_CMD_I2C=y
>>   CONFIG_CMD_MMC=y
>>   CONFIG_CMD_UFS=y
>>   CONFIG_CMD_USB=y
>>   CONFIG_CMD_CAT=y
>>   CONFIG_CMD_BMP=y
>> +CONFIG_CMD_EFIDEBUG=y
>>   CONFIG_CMD_REGULATOR=y
>>   CONFIG_CMD_LOG=y
>>   CONFIG_OF_LIVE=y
>>   CONFIG_USE_DEFAULT_ENV_FILE=y
>> @@ -44,15 +47,18 @@ CONFIG_CLK=y
>>   CONFIG_CLK_QCOM_APQ8016=y
>>   CONFIG_CLK_QCOM_APQ8096=y
>>   CONFIG_CLK_QCOM_QCM2290=y
>>   CONFIG_CLK_QCOM_QCS404=y
>> -CONFIG_CLK_QCOM_SC7280=y
>>   CONFIG_CLK_QCOM_SDM845=y
>>   CONFIG_CLK_QCOM_SM6115=y
>>   CONFIG_CLK_QCOM_SM8150=y
>>   CONFIG_CLK_QCOM_SM8250=y
>>   CONFIG_CLK_QCOM_SM8550=y
>>   CONFIG_CLK_QCOM_SM8650=y
>> +CONFIG_CLK_QCOM_SC7280=y
>> +CONFIG_DFU_MMC=y
>> +CONFIG_DFU_SCSI=y
>> +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x200000
>>   CONFIG_MSM_GPIO=y
>>   CONFIG_QCOM_PMIC_GPIO=y
>>   CONFIG_DM_I2C=y
>>   CONFIG_SYS_I2C_QUP=y
>>
> 
> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Neil Armstrong Oct. 17, 2024, 2:41 p.m. UTC | #4 
On 17/10/2024 15:19, Caleb Connolly wrote:
> 
> 
> On 14/10/2024 08:53, Neil Armstrong wrote:
>> On 12/10/2024 15:57, Caleb Connolly wrote:
>>> Enable all the necessary options for capsule updates to work, as well as
>>> a few additional EFI features.
>>>
>>> Capsule updates themselves are only enabled for the RB3 Gen 2, since the
>>> exact details on where to flash U-Boot (or how to handle multiple boot
>>> methods) has not been finalised for other boards.
>>
>> -----------------------/\ finalized
> 
> Finalised is the correct spelling in British English :P

Ah Ah sorry, my mailer spell checked is in English USA, sorry :-p Adding the british one right now!

Since you're a certified British, I'll trust you!

Neil

> 
> Is there a rule about this? XD
> 
> Thanks for the review!
>>
>>>
>>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>>> ---
>>>   configs/qcm6490_defconfig | 6 ++++++
>>>   configs/qcom_defconfig    | 8 +++++++-
>>>   2 files changed, 13 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig
>>> index 5ddc5ab3ef8c..ba26924da161 100644
>>> --- a/configs/qcm6490_defconfig
>>> +++ b/configs/qcm6490_defconfig
>>> @@ -18,4 +18,10 @@ 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 e7ed03ff0f24..4c8ff0e84372 100644
>>> --- a/configs/qcom_defconfig
>>> +++ b/configs/qcom_defconfig
>>> @@ -20,21 +20,24 @@ CONFIG_LOG_MAX_LEVEL=9
>>>   CONFIG_LOG_DEFAULT_LEVEL=4
>>>   # CONFIG_DISPLAY_CPUINFO is not set
>>>   CONFIG_DISPLAY_BOARDINFO_LATE=y
>>>   CONFIG_CMD_BOOTMENU=y
>>> +CONFIG_CMD_NVEDIT_EFI=y
>>>   CONFIG_CMD_EEPROM=y
>>>   CONFIG_SYS_I2C_EEPROM_BUS=2
>>>   CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
>>>   CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=5
>>>   # CONFIG_CMD_BIND is not set
>>>   CONFIG_CMD_CLK=y
>>> +CONFIG_CMD_DFU=y
>>>   CONFIG_CMD_GPIO=y
>>>   CONFIG_CMD_I2C=y
>>>   CONFIG_CMD_MMC=y
>>>   CONFIG_CMD_UFS=y
>>>   CONFIG_CMD_USB=y
>>>   CONFIG_CMD_CAT=y
>>>   CONFIG_CMD_BMP=y
>>> +CONFIG_CMD_EFIDEBUG=y
>>>   CONFIG_CMD_REGULATOR=y
>>>   CONFIG_CMD_LOG=y
>>>   CONFIG_OF_LIVE=y
>>>   CONFIG_USE_DEFAULT_ENV_FILE=y
>>> @@ -44,15 +47,18 @@ CONFIG_CLK=y
>>>   CONFIG_CLK_QCOM_APQ8016=y
>>>   CONFIG_CLK_QCOM_APQ8096=y
>>>   CONFIG_CLK_QCOM_QCM2290=y
>>>   CONFIG_CLK_QCOM_QCS404=y
>>> -CONFIG_CLK_QCOM_SC7280=y
>>>   CONFIG_CLK_QCOM_SDM845=y
>>>   CONFIG_CLK_QCOM_SM6115=y
>>>   CONFIG_CLK_QCOM_SM8150=y
>>>   CONFIG_CLK_QCOM_SM8250=y
>>>   CONFIG_CLK_QCOM_SM8550=y
>>>   CONFIG_CLK_QCOM_SM8650=y
>>> +CONFIG_CLK_QCOM_SC7280=y
>>> +CONFIG_DFU_MMC=y
>>> +CONFIG_DFU_SCSI=y
>>> +CONFIG_SYS_DFU_DATA_BUF_SIZE=0x200000
>>>   CONFIG_MSM_GPIO=y
>>>   CONFIG_QCOM_PMIC_GPIO=y
>>>   CONFIG_DM_I2C=y
>>>   CONFIG_SYS_I2C_QUP=y
>>>
>>
>> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
>
diff mbox series

Patch

diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig
index 5ddc5ab3ef8c..ba26924da161 100644
--- a/configs/qcm6490_defconfig
+++ b/configs/qcm6490_defconfig
@@ -18,4 +18,10 @@  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 e7ed03ff0f24..4c8ff0e84372 100644
--- a/configs/qcom_defconfig
+++ b/configs/qcom_defconfig
@@ -20,21 +20,24 @@  CONFIG_LOG_MAX_LEVEL=9
 CONFIG_LOG_DEFAULT_LEVEL=4
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_CMD_BOOTMENU=y
+CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_BUS=2
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=5
 # CONFIG_CMD_BIND is not set
 CONFIG_CMD_CLK=y
+CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_UFS=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CAT=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_LOG=y
 CONFIG_OF_LIVE=y
 CONFIG_USE_DEFAULT_ENV_FILE=y
@@ -44,15 +47,18 @@  CONFIG_CLK=y
 CONFIG_CLK_QCOM_APQ8016=y
 CONFIG_CLK_QCOM_APQ8096=y
 CONFIG_CLK_QCOM_QCM2290=y
 CONFIG_CLK_QCOM_QCS404=y
-CONFIG_CLK_QCOM_SC7280=y
 CONFIG_CLK_QCOM_SDM845=y
 CONFIG_CLK_QCOM_SM6115=y
 CONFIG_CLK_QCOM_SM8150=y
 CONFIG_CLK_QCOM_SM8250=y
 CONFIG_CLK_QCOM_SM8550=y
 CONFIG_CLK_QCOM_SM8650=y
+CONFIG_CLK_QCOM_SC7280=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_SCSI=y
+CONFIG_SYS_DFU_DATA_BUF_SIZE=0x200000
 CONFIG_MSM_GPIO=y
 CONFIG_QCOM_PMIC_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_QUP=y