[U-Boot] [PATCH 2/3] dfu: Rename _FUNCTION_DFU to DFU_OVER_

Fri Feb 16 15:41:18 UTC 2018

Do the following to make the symbol names less confusing.

sed -i "s/\([TU][^_]\+\)_FUNCTION_DFU/DFU_OVER_\1/g" \
	`git grep _FUNCTION_DFU | cut -d ":" -f 1 | sort -u`

Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
Cc: Lukasz Majewski <lukma at denx.de>
---
 README                              |  2 +-
 board/siemens/common/factoryset.c   |  4 ++--
 cmd/dfu.c                           | 12 ++++++------
 common/Makefile                     |  4 ++--
 drivers/dfu/Kconfig                 |  8 ++++----
 drivers/usb/gadget/Makefile         |  2 +-
 include/configs/tegra-common-post.h |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/README b/README
index 81b7ee1ce8..cb8d5ef24f 100644
--- a/README
+++ b/README
@@ -1203,7 +1203,7 @@ The following options need to be configured:
 		key for the Replay Protection Memory Block partition in eMMC.
 
 - USB Device Firmware Update (DFU) class support:
-		CONFIG_USB_FUNCTION_DFU
+		CONFIG_DFU_OVER_USB
 		This enables the USB portion of the DFU USB class
 
 		CONFIG_DFU_MMC
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index 81bbb5758d..7fa2673c2b 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -144,7 +144,7 @@ int factoryset_read_eeprom(int i2c_addr)
 	unsigned char eeprom_buf[0x3c00], hdr[4], buf[MAX_STRING_LENGTH];
 	unsigned char *cp, *cp1;
 
-#if defined(CONFIG_USB_FUNCTION_DFU)
+#if defined(CONFIG_DFU_OVER_USB)
 	factory_dat.usb_vendor_id = CONFIG_USB_GADGET_VENDOR_NUM;
 	factory_dat.usb_product_id = CONFIG_USB_GADGET_PRODUCT_NUM;
 #endif
@@ -202,7 +202,7 @@ int factoryset_read_eeprom(int i2c_addr)
 		cp1 += 3;
 	}
 
-#if defined(CONFIG_USB_FUNCTION_DFU)
+#if defined(CONFIG_DFU_OVER_USB)
 	/* read vid and pid for dfu mode */
 	if (0 <= get_factory_record_val(cp, size, (uchar *)"USBD1",
 					(uchar *)"vid", buf,
diff --git a/cmd/dfu.c b/cmd/dfu.c
index 76b89ca5ed..68b1a7fec9 100644
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -25,14 +25,14 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	if (argc < 4)
 		return CMD_RET_USAGE;
 
-#ifdef CONFIG_USB_FUNCTION_DFU
+#ifdef CONFIG_DFU_OVER_USB
 	char *usb_controller = argv[1];
 #endif
 	char *interface = argv[2];
 	char *devstring = argv[3];
 
 	int ret = 0;
-#ifdef CONFIG_TFTP_FUNCTION_DFU
+#ifdef CONFIG_DFU_OVER_TFTP
 	unsigned long addr = 0;
 	if (!strcmp(argv[1], "tftp")) {
 		if (argc == 5)
@@ -41,7 +41,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		return update_tftp(addr, interface, devstring);
 	}
 #endif
-#ifdef CONFIG_USB_FUNCTION_DFU
+#ifdef CONFIG_DFU_OVER_USB
 	ret = dfu_init_env_entities(interface, devstring);
 	if (ret)
 		goto done;
@@ -64,15 +64,15 @@ done:
 
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
 	"Device Firmware Upgrade",
-#ifdef CONFIG_USB_FUNCTION_DFU
+#ifdef CONFIG_DFU_OVER_USB
 	"<USB_controller> <interface> <dev> [list]\n"
 	"  - device firmware upgrade via <USB_controller>\n"
 	"    on device <dev>, attached to interface\n"
 	"    <interface>\n"
 	"    [list] - list available alt settings\n"
 #endif
-#ifdef CONFIG_TFTP_FUNCTION_DFU
-#ifdef CONFIG_USB_FUNCTION_DFU
+#ifdef CONFIG_DFU_OVER_TFTP
+#ifdef CONFIG_DFU_OVER_USB
 	"dfu "
 #endif
 	"tftp <interface> <dev> [<addr>]\n"
diff --git a/common/Makefile b/common/Makefile
index cdd0ab19d8..7011dada99 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -67,7 +67,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_DFU_SUPPORT
-obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o
+obj-$(CONFIG_DFU_OVER_USB) += dfu.o
 endif
 obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o
 obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
@@ -130,7 +130,7 @@ endif
 
 obj-y += cli.o
 obj-$(CONFIG_FSL_DDR_INTERACTIVE) += cli_simple.o cli_readline.o
-obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o
+obj-$(CONFIG_DFU_OVER_USB) += dfu.o
 obj-y += command.o
 obj-$(CONFIG_$(SPL_)LOG) += log.o
 obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
index b077444059..51ab484c2a 100644
--- a/drivers/dfu/Kconfig
+++ b/drivers/dfu/Kconfig
@@ -2,21 +2,21 @@ menu "DFU support"
 
 config DFU
 	bool
-	imply USB_FUNCTION_DFU if USB_GADGET
+	imply DFU_OVER_USB if USB_GADGET
 
-config USB_FUNCTION_DFU
+config DFU_OVER_USB
 	bool
 	select HASH
 	depends on USB_GADGET
 
-config TFTP_FUNCTION_DFU
+config DFU_OVER_TFTP
 	bool
 	depends on NET
 
 if DFU
 config DFU_TFTP
 	bool "DFU via TFTP"
-	select TFTP_FUNCTION_DFU
+	select DFU_OVER_TFTP
 	help
 	  This option allows performing update of DFU-managed medium with data
 	  sent via TFTP boot.
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index ee8bc994c5..748366fb9f 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -26,7 +26,7 @@ obj-$(CONFIG_CI_UDC)	+= ci_udc.o
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o
 obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o
-obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o
+obj-$(CONFIG_DFU_OVER_USB) += f_dfu.o
 obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o
 obj-$(CONFIG_USB_FUNCTION_FASTBOOT) += f_fastboot.o
 obj-$(CONFIG_USB_FUNCTION_SDP) += f_sdp.o
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index aea8f1fb8e..3eb9dd2af9 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -11,7 +11,7 @@
 /*
  * Size of malloc() pool
  */
-#ifdef CONFIG_USB_FUNCTION_DFU
+#ifdef CONFIG_DFU_OVER_USB
 #define CONFIG_SYS_MALLOC_LEN	(SZ_4M + \
 					CONFIG_SYS_DFU_DATA_BUF_SIZE + \
 					CONFIG_SYS_DFU_MAX_FILE_SIZE)
-- 
2.15.1

