[PoC 210/241] global: Migrate CONFIG_THOR_RESET_OFF to CFG

Tom Rini
2022-11-20T14:24:46Z

drivers/usb/gadget/f_thor.c | 4 ++--
drivers/usb/gadget/f_thor.h | 2 +-
include/configs/xilinx_versal.h | 2 +-
include/configs/xilinx_versal_net.h | 2 +-
include/configs/xilinx_zynqmp.h | 2 +-
include/configs/zynq-common.h | 2 +-
scripts/config_whitelist.txt | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 47ef55b2fd31..a83fd6fe90b0 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -129,7 +129,7 @@ static int process_rqt_cmd(const struct rqt_box *rqt)
send_rsp(rsp);
g_dnl_unregister();
dfu_free_entities();
-#ifdef CONFIG_THOR_RESET_OFF
+#ifdef CFG_THOR_RESET_OFF
return RESET_DONE;
#endif
run_command("reset", 0);
@@ -726,7 +726,7 @@ int thor_handle(void)

if (ret > 0) {
ret = process_data();
-#ifdef CONFIG_THOR_RESET_OFF
+#ifdef CFG_THOR_RESET_OFF
if (ret == RESET_DONE)
break;
#endif
diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h
index 8ba3fa21b733..2c22ccef542b 100644
--- a/drivers/usb/gadget/f_thor.h
+++ b/drivers/usb/gadget/f_thor.h
@@ -120,7 +120,7 @@ struct f_thor {
#define F_NAME_BUF_SIZE 32
#define THOR_PACKET_SIZE SZ_1M /* 1 MiB */
#define THOR_STORE_UNIT_SIZE SZ_32M /* 32 MiB */
-#ifdef CONFIG_THOR_RESET_OFF
+#ifdef CFG_THOR_RESET_OFF
#define RESET_DONE 0xFFFFFFFF
#endif
#endif /* _USB_THOR_H_ */
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index 836a6506b1ad..00e466528e87 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -25,7 +25,7 @@

#if defined(CONFIG_CMD_DFU)
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#define CONFIG_THOR_RESET_OFF
+#define CFG_THOR_RESET_OFF
#endif

/* Ethernet driver */
diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h
index b8d2685246f3..672c54e79fd9 100644
--- a/include/configs/xilinx_versal_net.h
+++ b/include/configs/xilinx_versal_net.h
@@ -25,7 +25,7 @@

#if defined(CONFIG_CMD_DFU)
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#define CONFIG_THOR_RESET_OFF
+#define CFG_THOR_RESET_OFF
#define DFU_ALT_INFO_RAM \
"dfu_ram_info=" \
"setenv dfu_alt_info " \
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index f07e7d3f0ac3..2452f81570a8 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -31,7 +31,7 @@

#if defined(CONFIG_ZYNQMP_USB)
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#define CONFIG_THOR_RESET_OFF
+#define CFG_THOR_RESET_OFF

# define PARTS_DEFAULT \
"partitions=uuid_disk=${uuid_gpt_disk};" \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1edd49a784d4..901f602d3d4e 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -41,7 +41,7 @@

#ifdef CONFIG_USB_EHCI_ZYNQ
# define DFU_DEFAULT_POLL_TIMEOUT 300
-# define CONFIG_THOR_RESET_OFF
+# define CFG_THOR_RESET_OFF
#endif

/* enable preboot to be loaded before CONFIG_BOOTDELAY */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index dbb98c572076..b78294211ab0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -219,7 +219,7 @@ CFG_TEGRA_VDD_CORE_TPS62361B_SET3
CFG_TEGRA_VDD_CORE_TPS62366A_SET1
CFG_TESTPIN_MASK
CFG_TESTPIN_REG
-CONFIG_THOR_RESET_OFF
+CFG_THOR_RESET_OFF
CONFIG_TPM_TIS_BASE_ADDRESS
CONFIG_TSEC1
CONFIG_TSEC1_NAME
--
2.25.1