Message ID | 20180808095433.230882-4-sjg@chromium.org |
---|---|
State | Superseded, archived |
Delegated to: | Alexander Graf |
Headers | show |
Series | efi: Enable sandbox support for EFI loader | expand |
On 08.08.18 11:54, Simon Glass wrote: > With sandbox these values depend on the host system. Let's assume that it > is x86_64 for now. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v9: None > Changes in v8: None > Changes in v7: > - Drop an unnecessary comment > > Changes in v6: > - Warn about building sandbox EFI support on something other than __x86_64__ > > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: None > > include/config_distro_bootcmd.h | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h > index d672e8ebe65..75866f2abf9 100644 > --- a/include/config_distro_bootcmd.h > +++ b/include/config_distro_bootcmd.h > @@ -261,6 +261,17 @@ > #elif defined(CONFIG_CPU_RISCV_64) > #define BOOTENV_EFI_PXE_ARCH "0x1b" > #define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00027:UNDI:003000" > +#elif defined(CONFIG_SANDBOX) Can we just change the #ifdef checks here to compiler based ones instead? That way sandbox automatically gets the correct architecture type depending on what it's running on. Alex > +/* > + * TODO(sjg@chromium.org): Consider providing a way to enable sandbox features > + * based on the host architecture > + */ > +# ifndef __x86_64__ > +# warning "sandbox EFI support is only tested on 64-bit x86" > +# endif > +/* To support other *host* architectures this should be changed */ > +#define BOOTENV_EFI_PXE_ARCH "0x7" > +#define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00007:UNDI:003000" > #else > #error Please specify an EFI client identifier > #endif >
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d672e8ebe65..75866f2abf9 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -261,6 +261,17 @@ #elif defined(CONFIG_CPU_RISCV_64) #define BOOTENV_EFI_PXE_ARCH "0x1b" #define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00027:UNDI:003000" +#elif defined(CONFIG_SANDBOX) +/* + * TODO(sjg@chromium.org): Consider providing a way to enable sandbox features + * based on the host architecture + */ +# ifndef __x86_64__ +# warning "sandbox EFI support is only tested on 64-bit x86" +# endif +/* To support other *host* architectures this should be changed */ +#define BOOTENV_EFI_PXE_ARCH "0x7" +#define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00007:UNDI:003000" #else #error Please specify an EFI client identifier #endif
With sandbox these values depend on the host system. Let's assume that it is x86_64 for now. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v9: None Changes in v8: None Changes in v7: - Drop an unnecessary comment Changes in v6: - Warn about building sandbox EFI support on something other than __x86_64__ Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None include/config_distro_bootcmd.h | 11 +++++++++++ 1 file changed, 11 insertions(+)