| Message ID | 20230206005537.254541-76-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 83f3d121ddf5c2f0c3ffc5e0cd01a67d31c28bfd |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | None | expand |
On 2/6/23 01:54, Simon Glass wrote: > This converts 1 usage of this option to the non-SPL form, since there is > no SPL_EFI_MM_COMM_TEE defined in Kconfig > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > (no changes since v1) > > cmd/eficonfig.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c > index 47c04cf5363..46f652c35d6 100644 > --- a/cmd/eficonfig.c > +++ b/cmd/eficonfig.c > @@ -2670,7 +2670,7 @@ static const struct eficonfig_item maintenance_menu_items[] = { > {"Edit Boot Option", eficonfig_process_edit_boot_option}, > {"Change Boot Order", eficonfig_process_change_boot_order}, > {"Delete Boot Option", eficonfig_process_delete_boot_option}, > -#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && CONFIG_IS_ENABLED(EFI_MM_COMM_TEE)) > +#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && IS_ENABLED(CONFIG_EFI_MM_COMM_TEE)) There is no reason to use two different macros here. Best regards Heinrich > {"Secure Boot Configuration", eficonfig_process_secure_boot_config}, > #endif > {"Quit", eficonfig_process_quit},
diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 47c04cf5363..46f652c35d6 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -2670,7 +2670,7 @@ static const struct eficonfig_item maintenance_menu_items[] = { {"Edit Boot Option", eficonfig_process_edit_boot_option}, {"Change Boot Order", eficonfig_process_change_boot_order}, {"Delete Boot Option", eficonfig_process_delete_boot_option}, -#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && CONFIG_IS_ENABLED(EFI_MM_COMM_TEE)) +#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && IS_ENABLED(CONFIG_EFI_MM_COMM_TEE)) {"Secure Boot Configuration", eficonfig_process_secure_boot_config}, #endif {"Quit", eficonfig_process_quit},
This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_MM_COMM_TEE defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) cmd/eficonfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)