Commit bb4059a53bc13615f12b5e21252872bf7e02dce4
Committed by
Marek Vasut
Marek Vasut
1 parent
0f44d33536
Exists in
smarc_8mq_lf_v2020.04
and in
17 other branches
dfu: Rename _FUNCTION_DFU to DFU_OVER_
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@gmail.com> Cc: Lukasz Majewski <lukma@denx.de>
Showing 7 changed files with 17 additions and 17 deletions Side-by-side Diff
README
| ... | ... | @@ -1198,7 +1198,7 @@ |
| 1198 | 1198 | key for the Replay Protection Memory Block partition in eMMC. |
| 1199 | 1199 | |
| 1200 | 1200 | - USB Device Firmware Update (DFU) class support: |
| 1201 | - CONFIG_USB_FUNCTION_DFU | |
| 1201 | + CONFIG_DFU_OVER_USB | |
| 1202 | 1202 | This enables the USB portion of the DFU USB class |
| 1203 | 1203 | |
| 1204 | 1204 | CONFIG_DFU_MMC |
board/siemens/common/factoryset.c
| ... | ... | @@ -144,7 +144,7 @@ |
| 144 | 144 | unsigned char eeprom_buf[0x3c00], hdr[4], buf[MAX_STRING_LENGTH]; |
| 145 | 145 | unsigned char *cp, *cp1; |
| 146 | 146 | |
| 147 | -#if defined(CONFIG_USB_FUNCTION_DFU) | |
| 147 | +#if defined(CONFIG_DFU_OVER_USB) | |
| 148 | 148 | factory_dat.usb_vendor_id = CONFIG_USB_GADGET_VENDOR_NUM; |
| 149 | 149 | factory_dat.usb_product_id = CONFIG_USB_GADGET_PRODUCT_NUM; |
| 150 | 150 | #endif |
| ... | ... | @@ -202,7 +202,7 @@ |
| 202 | 202 | cp1 += 3; |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | -#if defined(CONFIG_USB_FUNCTION_DFU) | |
| 205 | +#if defined(CONFIG_DFU_OVER_USB) | |
| 206 | 206 | /* read vid and pid for dfu mode */ |
| 207 | 207 | if (0 <= get_factory_record_val(cp, size, (uchar *)"USBD1", |
| 208 | 208 | (uchar *)"vid", buf, |
cmd/dfu.c
| ... | ... | @@ -25,14 +25,14 @@ |
| 25 | 25 | if (argc < 4) |
| 26 | 26 | return CMD_RET_USAGE; |
| 27 | 27 | |
| 28 | -#ifdef CONFIG_USB_FUNCTION_DFU | |
| 28 | +#ifdef CONFIG_DFU_OVER_USB | |
| 29 | 29 | char *usb_controller = argv[1]; |
| 30 | 30 | #endif |
| 31 | 31 | char *interface = argv[2]; |
| 32 | 32 | char *devstring = argv[3]; |
| 33 | 33 | |
| 34 | 34 | int ret = 0; |
| 35 | -#ifdef CONFIG_TFTP_FUNCTION_DFU | |
| 35 | +#ifdef CONFIG_DFU_OVER_TFTP | |
| 36 | 36 | unsigned long addr = 0; |
| 37 | 37 | if (!strcmp(argv[1], "tftp")) { |
| 38 | 38 | if (argc == 5) |
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 | return update_tftp(addr, interface, devstring); |
| 42 | 42 | } |
| 43 | 43 | #endif |
| 44 | -#ifdef CONFIG_USB_FUNCTION_DFU | |
| 44 | +#ifdef CONFIG_DFU_OVER_USB | |
| 45 | 45 | ret = dfu_init_env_entities(interface, devstring); |
| 46 | 46 | if (ret) |
| 47 | 47 | goto done; |
| 48 | 48 | |
| ... | ... | @@ -64,15 +64,15 @@ |
| 64 | 64 | |
| 65 | 65 | U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu, |
| 66 | 66 | "Device Firmware Upgrade", |
| 67 | -#ifdef CONFIG_USB_FUNCTION_DFU | |
| 67 | +#ifdef CONFIG_DFU_OVER_USB | |
| 68 | 68 | "<USB_controller> <interface> <dev> [list]\n" |
| 69 | 69 | " - device firmware upgrade via <USB_controller>\n" |
| 70 | 70 | " on device <dev>, attached to interface\n" |
| 71 | 71 | " <interface>\n" |
| 72 | 72 | " [list] - list available alt settings\n" |
| 73 | 73 | #endif |
| 74 | -#ifdef CONFIG_TFTP_FUNCTION_DFU | |
| 75 | -#ifdef CONFIG_USB_FUNCTION_DFU | |
| 74 | +#ifdef CONFIG_DFU_OVER_TFTP | |
| 75 | +#ifdef CONFIG_DFU_OVER_USB | |
| 76 | 76 | "dfu " |
| 77 | 77 | #endif |
| 78 | 78 | "tftp <interface> <dev> [<addr>]\n" |
common/Makefile
| ... | ... | @@ -67,7 +67,7 @@ |
| 67 | 67 | |
| 68 | 68 | ifdef CONFIG_SPL_BUILD |
| 69 | 69 | ifdef CONFIG_SPL_DFU_SUPPORT |
| 70 | -obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o | |
| 70 | +obj-$(CONFIG_DFU_OVER_USB) += dfu.o | |
| 71 | 71 | endif |
| 72 | 72 | obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o |
| 73 | 73 | obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o |
| ... | ... | @@ -130,7 +130,7 @@ |
| 130 | 130 | |
| 131 | 131 | obj-y += cli.o |
| 132 | 132 | obj-$(CONFIG_FSL_DDR_INTERACTIVE) += cli_simple.o cli_readline.o |
| 133 | -obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o | |
| 133 | +obj-$(CONFIG_DFU_OVER_USB) += dfu.o | |
| 134 | 134 | obj-y += command.o |
| 135 | 135 | obj-$(CONFIG_$(SPL_)LOG) += log.o |
| 136 | 136 | obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o |
drivers/dfu/Kconfig
| ... | ... | @@ -2,21 +2,21 @@ |
| 2 | 2 | |
| 3 | 3 | config DFU |
| 4 | 4 | bool |
| 5 | - imply USB_FUNCTION_DFU if USB_GADGET | |
| 5 | + imply DFU_OVER_USB if USB_GADGET | |
| 6 | 6 | |
| 7 | -config USB_FUNCTION_DFU | |
| 7 | +config DFU_OVER_USB | |
| 8 | 8 | bool |
| 9 | 9 | select HASH |
| 10 | 10 | depends on USB_GADGET |
| 11 | 11 | |
| 12 | -config TFTP_FUNCTION_DFU | |
| 12 | +config DFU_OVER_TFTP | |
| 13 | 13 | bool |
| 14 | 14 | depends on NET |
| 15 | 15 | |
| 16 | 16 | if DFU |
| 17 | 17 | config DFU_TFTP |
| 18 | 18 | bool "DFU via TFTP" |
| 19 | - select TFTP_FUNCTION_DFU | |
| 19 | + select DFU_OVER_TFTP | |
| 20 | 20 | help |
| 21 | 21 | This option allows performing update of DFU-managed medium with data |
| 22 | 22 | sent via TFTP boot. |
drivers/usb/gadget/Makefile
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 | ifndef CONFIG_SPL_BUILD |
| 27 | 27 | obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o |
| 28 | 28 | obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o |
| 29 | -obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o | |
| 29 | +obj-$(CONFIG_DFU_OVER_USB) += f_dfu.o | |
| 30 | 30 | obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o |
| 31 | 31 | obj-$(CONFIG_USB_FUNCTION_FASTBOOT) += f_fastboot.o |
| 32 | 32 | obj-$(CONFIG_USB_FUNCTION_SDP) += f_sdp.o |
include/configs/tegra-common-post.h