[PoC 209/241] global: Migrate CONFIG_TESTPIN_REG to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 15:17:11 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 board/keymile/km83xx/km83xx.c | 2 +-
 include/configs/kmcoge5ne.h   | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 73e3709bbba2..9ec1dbc6f97b 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -216,7 +216,7 @@ int post_hotkeys_pressed(void)
 	int testpin = 0;
 	struct km_bec_fpga *base =
 		(struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE;
-	int testpin_reg = in_8(&base->CONFIG_TESTPIN_REG);
+	int testpin_reg = in_8(&base->CFG_TESTPIN_REG);
 	testpin = (testpin_reg & CFG_TESTPIN_MASK) != 0;
 	debug("post_hotkeys_pressed: %d\n", !testpin);
 	return testpin;
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 161b07406f3a..8ca64f8e9e9a 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -36,7 +36,7 @@
 #define CFG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)
 #define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
-#define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
+#define CFG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
 #define CFG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
 
 #endif /* CONFIG */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 56a7f2f656c5..dbb98c572076 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -218,7 +218,7 @@ CFG_TEGRA_UARTA_SDIO1
 CFG_TEGRA_VDD_CORE_TPS62361B_SET3
 CFG_TEGRA_VDD_CORE_TPS62366A_SET1
 CFG_TESTPIN_MASK
-CONFIG_TESTPIN_REG
+CFG_TESTPIN_REG
 CONFIG_THOR_RESET_OFF
 CONFIG_TPM_TIS_BASE_ADDRESS
 CONFIG_TSEC1
-- 
2.25.1



More information about the U-Boot mailing list