From patchwork Fri Feb 16 15:41:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 874501 X-Patchwork-Delegate: lukma@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aE36b5ox"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjd402qV2z9s7h for ; Sat, 17 Feb 2018 02:54:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BC6DBC21FDB; Fri, 16 Feb 2018 15:49:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E9964C22131; Fri, 16 Feb 2018 15:42:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 92208C220E1; Fri, 16 Feb 2018 15:41:26 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id 38DA2C22041 for ; Fri, 16 Feb 2018 15:41:26 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id l43so3330001wrc.2 for ; Fri, 16 Feb 2018 07:41:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dzmxQCz7NDDmESqztuJa8Q9ZYU+cUZYtzJE0Y/PObLg=; b=aE36b5oxZ2lz7yGggLyVXzWQDfnL8JkXt6Fw2FQvMCD6cN7e61ZALTkHygMb/MH17l ndMFCQLBQodz99jtizN638USFWAd4GH7sGrAzYQMJ6NDThxB+o06FrqI03x2w4tanyRQ WOiH6m7+15rVOB9cDJhtibwKoP4pHIGSSQLuGesx+QvO1weCFQoAKE9afVYfRYa3fLib 8ZCFcG8qFpydas6qnbvNACJRI0d9NJJ9t4EcnnsCKBQlYduhZZ38veRcwECnkYcpDxGO p6KwPofrka5PnK+6kydzSzFM85nUOifLKMdixt5/kFMXlLLGAYNBy70gDJqZ1aSSmoA1 kHXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dzmxQCz7NDDmESqztuJa8Q9ZYU+cUZYtzJE0Y/PObLg=; b=jV8rH5Aiqtw53pD//ch9MSumcprDuFCby5lYenGidg/iZS+QkU7lQL16fe52eguTM9 6KVi6HFsJhAwSxexFENny74j14ul2EYC3e2x9bQld2oB8N3tWVB/PvHpObPTMyHoy8qL xg4aeQ8nWMhQ8v40aN7RSyBw2YaZaLEO/vXm0NY7HGuV/IouIOCJLmmBSJ0kETgJPHRp G5Ot1EuHF0i5CT91YMX5nvEL7lNNkJNlDTJA45AzEXEKGrlLH+R0MSCnkLffZFLfsCea BEPWw4G5loDWwwSuFe06mYs8EmXVpb+ACDFrCybA9m2i6+ov3/fR0TdFnVvedNk9Hfso U07Q== X-Gm-Message-State: APf1xPDbAAIbx4QkMZdYICpnFiHMI9nxZ/xXCOsnQtvlPzFQEwRycEER xKYQgkG7aJyvjE+ShUQNthe/Mf4t X-Google-Smtp-Source: AH8x224EZKNp1Ns1vYOzsRO6uiLJxvtYoY+X8vNPYm0H8NprTM1we77j5ADB7mbDZoFiq0XG0G/Myg== X-Received: by 10.223.185.24 with SMTP id k24mr6539328wrf.83.1518795685509; Fri, 16 Feb 2018 07:41:25 -0800 (PST) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id k125sm31547172wmd.48.2018.02.16.07.41.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Feb 2018 07:41:24 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 16:41:18 +0100 Message-Id: <20180216154119.3084-2-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180216154119.3084-1-marek.vasut+renesas@gmail.com> References: <20180216154119.3084-1-marek.vasut+renesas@gmail.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/3] dfu: Rename _FUNCTION_DFU to DFU_OVER_ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Cc: Lukasz Majewski --- 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 " [list]\n" " - device firmware upgrade via \n" " on device , attached to interface\n" " \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 []\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)