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

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

Commit Message

AKASHI Takahiro Nov. 17, 2020, 12:28 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 Nov. 24, 2020, 7:05 p.m. | #1
On 11/17/20 1:28 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>


This patch leads to a build failure:

https://gitlab.denx.de/u-boot/custodians/u-boot-efi/-/jobs/181984

Building current source for 1 boards (1 thread, 40 jobs per thread)
    sandbox:  +   sandbox
+common/update.c:178:12: error: 'update_flash' defined but not used
[-Werror=unused-function]
+ static int update_flash(ulong addr_source, ulong addr_first, ulong size)
+            ^~~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[2]: *** [common/update.o] Error 1
+make[1]: *** [common] Error 2
+make: *** [sub-make] Error 2

I suggest you mark function update_fetch as __maybe_unused.

Best regards

Heinrich


> ---

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

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

>   2 files changed, 12 insertions(+)

>

> 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

>
AKASHI Takahiro Nov. 25, 2020, 12:46 a.m. | #2
Heinrich,

On Tue, Nov 24, 2020 at 08:05:45PM +0100, Heinrich Schuchardt wrote:
> On 11/17/20 1:28 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>

> 

> This patch leads to a build failure:

> 

> https://gitlab.denx.de/u-boot/custodians/u-boot-efi/-/jobs/181984

> 

> Building current source for 1 boards (1 thread, 40 jobs per thread)

>    sandbox:  +   sandbox

> +common/update.c:178:12: error: 'update_flash' defined but not used

> [-Werror=unused-function]

> + static int update_flash(ulong addr_source, ulong addr_first, ulong size)

> +            ^~~~~~~~~~~~

> +cc1: all warnings being treated as errors

> +make[2]: *** [common/update.o] Error 1

> +make[1]: *** [common] Error 2

> +make: *** [sub-make] Error 2

> 

> I suggest you mark function update_fetch as __maybe_unused.


I suppose that you have not applied my patch:
https://lists.denx.de/pipermail/u-boot/2020-November/433064.html

-Takahiro Akashi


> Best regards

> 

> Heinrich

> 

> 

> > ---

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

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

> >   2 files changed, 12 insertions(+)

> > 

> > 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

> > 

>

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