[PoC 211/241] global: Migrate CONFIG_TPM_TIS_BASE_ADDRESS to CFG

Tom Rini
2022-11-20T14:25:16Z

README | 2 +-
include/configs/efi-x86_app.h | 2 +-
include/configs/x86-common.h | 2 +-
scripts/config_whitelist.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 57ca5733dd64..aeb94d003f6a 100644
--- a/README
+++ b/README
@@ -585,7 +585,7 @@ The following options need to be configured:
Support for generic parallel port TPM devices. Only one device
per system is supported at this time.

- CONFIG_TPM_TIS_BASE_ADDRESS
+ CFG_TPM_TIS_BASE_ADDRESS
Base address where the generic TPM device is mapped
to. Contemporary x86 systems usually map it at
0xfed40000.
diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
index 96ad15b535d1..3420b4265a58 100644
--- a/include/configs/efi-x86_app.h
+++ b/include/configs/efi-x86_app.h
@@ -8,7 +8,7 @@

#include <configs/x86-common.h>

-#undef CONFIG_TPM_TIS_BASE_ADDRESS
+#undef CFG_TPM_TIS_BASE_ADDRESS

#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \
"stdout=vidconsole\0" \
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 9cfaa02958c8..becc87b1a6b4 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -16,7 +16,7 @@
*/

/* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
+#define CFG_TPM_TIS_BASE_ADDRESS 0xfed40000

/*-----------------------------------------------------------------------
* Serial Configuration
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b78294211ab0..34a34a2f0776 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -220,7 +220,7 @@ CFG_TEGRA_VDD_CORE_TPS62366A_SET1
CFG_TESTPIN_MASK
CFG_TESTPIN_REG
CFG_THOR_RESET_OFF
-CONFIG_TPM_TIS_BASE_ADDRESS
+CFG_TPM_TIS_BASE_ADDRESS
CONFIG_TSEC1
CONFIG_TSEC1_NAME
CONFIG_TSEC2
--
2.25.1