On Tue, 28 Apr 2020 at 05:58, AKASHI Takahiro <takahiro.aka...@linaro.org>
wrote:
> Heinrich,
>
> On Mon, Apr 27, 2020 at 10:28:35PM +0200, Heinrich Schuchardt wrote:
> > On 4/27/20 11:48 AM, AKASHI Takahiro wrote:
> > > Capsule data can be loaded into the system either via UpdateCapsule
> > > runtime service or files on a file system (of boot device).
> > > The latter case is called "capsules on disk", and actual updates will
> > > take place at the next boot time.
> > >
> > > In this commit, we will support capsule on disk mechanism.
> > >
> > > Please note that U-Boot itself has no notion of "boot device" and
> > > all the capsule files to be executed will be detected only if they
> > > are located in a specific directory, \EFI\UpdateCapsule, on a device
> > > that is identified as a boot device by "BootXXXX" variables.
> > >
> > > Signed-off-by: AKASHI Takahiro <takahiro.aka...@linaro.org>
> > > ---
> > > common/main.c | 4 +
> > > include/efi_loader.h | 16 ++
> > > lib/efi_loader/Kconfig | 22 ++
> > > lib/efi_loader/efi_capsule.c | 449 +++++++++++++++++++++++++++++++++++
> > > lib/efi_loader/efi_setup.c | 9 +
> > > 5 files changed, 500 insertions(+)
> > >
> > > diff --git a/common/main.c b/common/main.c
> > > index 06d7ff56d60c..877ae63b708d 100644
> > > --- a/common/main.c
> > > +++ b/common/main.c
> > > @@ -14,6 +14,7 @@
> > > #include <env.h>
> > > #include <init.h>
> > > #include <version.h>
> > > +#include <efi_loader.h>
> > >
> > > static void run_preboot_environment_command(void)
> > > {
> > > @@ -51,6 +52,9 @@ void main_loop(void)
> > > if (IS_ENABLED(CONFIG_UPDATE_TFTP))
> > > update_tftp(0UL, NULL, NULL);
> > >
> > > + if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK_EARLY))
> > > + efi_launch_capsules();
> > > +
> >
> > Can't we move this to efi_init_obj_list() and do away with
> > CONFIG_EFI_CAPSULE_ON_DISK_EARLY?
>
> With CONFIG_EFI_CAPSULE_ON_DISK_EARLY disabled,
> efi_launch_capsules() will be called in efi_init_obj_list()
> as you expect. See the code below in efi_setup.c.
>
Instead of calling efi_launch_capsules in efi_init_obj_list, can we invoke
the function explicitly through a dedicated command line, under the
'efidebug capsule' class of commands. I think that would be a cleaner
approach, since efi_init_obj_list gets called for a lot of efi functions,
which are unrelated to capsule update.
-sughosh
