From 09202cce26fdd2796688ae6bf5b746ecaf2b07d2 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 24 Aug 2023 17:19:03 -0600 Subject: [PATCH] vc/intel: Remove unnecessary Kconfig options These Kconfig options were being used basically as #define statements, which is unnecessary. This isn't a good use of Kconfig options and would be better just as #defines if actually needed. Signed-off-by: Martin Roth Change-Id: If987b50d8ec3bb2ab99096e5e3c325e4d90a67a9 Reviewed-on: https://review.coreboot.org/c/coreboot/+/77419 Tested-by: build bot (Jenkins) Reviewed-by: Frans Hendriks Reviewed-by: Eric Lai Reviewed-by: Elyes Haouas --- src/drivers/intel/fsp2_0/include/fsp/util.h | 2 +- src/drivers/mrc_cache/Kconfig | 2 +- src/include/efi/efi_datatype.h | 2 +- src/vendorcode/intel/Kconfig | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index 80982f0e57..8fdd178d79 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -74,7 +74,7 @@ union extended_fsp_revision { } rev; }; -#if CONFIG_UDK_VERSION < CONFIG_UDK_2017_VERSION +#if CONFIG_UDK_VERSION < 2017 enum resource_type { EFI_RESOURCE_SYSTEM_MEMORY = 0, EFI_RESOURCE_MEMORY_MAPPED_IO = 1, diff --git a/src/drivers/mrc_cache/Kconfig b/src/drivers/mrc_cache/Kconfig index 403c501964..71111537f6 100644 --- a/src/drivers/mrc_cache/Kconfig +++ b/src/drivers/mrc_cache/Kconfig @@ -54,7 +54,7 @@ config MRC_SAVE_HASH_IN_TPM config MRC_CACHE_USING_MRC_VERSION bool - default y if UDK_VERSION >= UDK_202302_VERSION + default y if UDK_VERSION >= 202302 default n help Use the MRC version info from FSP extended header to store the MRC cache data. diff --git a/src/include/efi/efi_datatype.h b/src/include/efi/efi_datatype.h index 4518a86357..917d0c8f22 100644 --- a/src/include/efi/efi_datatype.h +++ b/src/include/efi/efi_datatype.h @@ -6,7 +6,7 @@ #include #include -#if CONFIG_UDK_VERSION >= CONFIG_UDK_2017_VERSION +#if CONFIG_UDK_VERSION >= 2017 #include #include #include diff --git a/src/vendorcode/intel/Kconfig b/src/vendorcode/intel/Kconfig index 8af7eb84b2..595a1c61c8 100644 --- a/src/vendorcode/intel/Kconfig +++ b/src/vendorcode/intel/Kconfig @@ -38,10 +38,10 @@ config UDK_202302_VERSION config UDK_VERSION int - default UDK_202302_VERSION if UDK_202302_BINDING - default UDK_202005_VERSION if UDK_202005_BINDING - default UDK_2017_VERSION if UDK_2017_BINDING - default UDK_2013_VERSION + default 202302 if UDK_202302_BINDING + default 202005 if UDK_202005_BINDING + default 2017 if UDK_2017_BINDING + default 2013 help UEFI Development Kit version for Platform endif # UDK_BASE