[v10,11/11] sandbox: enable capsule update for testing

Message ID 20201130091218.66413-12-takahiro.akashi@linaro.org
State New
Headers show
Series
  • efi_loader: add capsule update support
Related show

Commit Message

AKASHI Takahiro Nov. 30, 2020, 9:12 a.m.
Add more configuration options to allow for efi capsule update
on sandbox.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

---
 configs/sandbox64_defconfig | 6 ++++++
 configs/sandbox_defconfig   | 6 ++++++
 2 files changed, 12 insertions(+)

-- 
2.28.0

Comments

Heinrich Schuchardt Dec. 2, 2020, 2:37 p.m. | #1
On 11/30/20 10:12 AM, AKASHI Takahiro wrote:
> Add more configuration options to allow for efi capsule update

> on sandbox.

>

> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

> ---

>  configs/sandbox64_defconfig | 6 ++++++

>  configs/sandbox_defconfig   | 6 ++++++

>  2 files changed, 12 insertions(+)


This still does not build on Gitlab CI. As indicated before the
following warning must be fixed:

common/update.c:178:12: warning: ‘update_flash’ defined but not used
[-Wunused-function]
  178 | static int update_flash(ulong addr_source, ulong addr_first,
ulong size)
      |            ^~~~~~~~~~~~

Best regards

Heinrich

>

> diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig

> index dc993cd13aaa..661830763feb 100644

> --- a/configs/sandbox64_defconfig

> +++ b/configs/sandbox64_defconfig

> @@ -231,3 +231,9 @@ CONFIG_TEST_FDTDEC=y

>  CONFIG_UNIT_TEST=y

>  CONFIG_UT_TIME=y

>  CONFIG_UT_DM=y

> +#

> +CONFIG_DFU_SF=y

> +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y

> +CONFIG_EFI_CAPSULE_ON_DISK=y

> +CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y

> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y

> diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig

> index f2a767a4cdea..e385425b7d91 100644

> --- a/configs/sandbox_defconfig

> +++ b/configs/sandbox_defconfig

> @@ -274,3 +274,9 @@ CONFIG_TEST_FDTDEC=y

>  CONFIG_UNIT_TEST=y

>  CONFIG_UT_TIME=y

>  CONFIG_UT_DM=y

> +#

> +CONFIG_DFU_SF=y

> +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y

> +CONFIG_EFI_CAPSULE_ON_DISK=y

> +CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y

> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y

>
Tom Rini Dec. 2, 2020, 3:55 p.m. | #2
On Wed, Dec 02, 2020 at 03:37:54PM +0100, Heinrich Schuchardt wrote:
> On 11/30/20 10:12 AM, AKASHI Takahiro wrote:

> > Add more configuration options to allow for efi capsule update

> > on sandbox.

> >

> > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

> > ---

> >  configs/sandbox64_defconfig | 6 ++++++

> >  configs/sandbox_defconfig   | 6 ++++++

> >  2 files changed, 12 insertions(+)

> 

> This still does not build on Gitlab CI. As indicated before the

> following warning must be fixed:

> 

> common/update.c:178:12: warning: ‘update_flash’ defined but not used

> [-Wunused-function]

>   178 | static int update_flash(ulong addr_source, ulong addr_first,

> ulong size)

>       |            ^~~~~~~~~~~~


This is addressed with
https://patchwork.ozlabs.org/project/uboot/patch/20201119003719.14186-1-takahiro.akashi@linaro.org/
which I thought was listed as a pre-req.

What is still outstanding is your comments in the previous thread about
how to handle CI for the tests, wrt sudo vs make-virt-fs and dealing
with the fallout of whatever is available / required.

-- 
Tom

Patch

diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index dc993cd13aaa..661830763feb 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -231,3 +231,9 @@  CONFIG_TEST_FDTDEC=y
 CONFIG_UNIT_TEST=y
 CONFIG_UT_TIME=y
 CONFIG_UT_DM=y
+#
+CONFIG_DFU_SF=y
+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
+CONFIG_EFI_CAPSULE_ON_DISK=y
+CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index f2a767a4cdea..e385425b7d91 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -274,3 +274,9 @@  CONFIG_TEST_FDTDEC=y
 CONFIG_UNIT_TEST=y
 CONFIG_UT_TIME=y
 CONFIG_UT_DM=y
+#
+CONFIG_DFU_SF=y
+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
+CONFIG_EFI_CAPSULE_ON_DISK=y
+CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y