From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D1FFDC4332F for ; Sun, 20 Nov 2022 14:24:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3DEB18540D; Sun, 20 Nov 2022 15:18:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="jfw32AtB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0243E8540D; Sun, 20 Nov 2022 15:17:57 +0100 (CET) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8E31A854A5 for ; Sun, 20 Nov 2022 15:17:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x733.google.com with SMTP id p18so6544525qkg.2 for ; Sun, 20 Nov 2022 06:17:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pt/a0slZ36TPOonEJWviMAXTIisbiUM3/Pj4QLR5adE=; b=jfw32AtBJCKgXKf4LpyUZTVo6FayGD3eoqolPEFHcqNfi4g0lwZ5uy25pBuP+iZEY4 52sePIhB3ncYJAa59WEI6Da/ZszbZ/NozpAaAUGsgCj6QoNQbEqZA1QHQ4KvcBs/rlPd 6FF+aA7XC903jtR7yddCMFEBpiNdWrg4o4qC8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pt/a0slZ36TPOonEJWviMAXTIisbiUM3/Pj4QLR5adE=; b=L4ymwl8UcDdhcGxvWaZFMOd/iMnTmuhORgkdu5ZyW7lnkVnXHVctuHZRn3jhodfRJX 6SaELNcjK4JF9fFZcpjh1+iZ1aapkm+2sB9n52T7H6EgTu3yJ2ykXbgwaLzeViMoz8Rp E3f4TVTxMrupSwsyhTds+9ztsWnXb/FuAbxusY4/hWsPxd168cM5xN6oLAs8uEsNaDoX QotHr/Gs7LdglqvH6cmNOrYUF4SYNxqj7iLntHptRkNL/QW2MCzflOb8S++HKPNdzeBz vrwHtCoZ4kN/DJ4ZlSjOIxlqZ0yQrAlwozmFJ/1w2kTcPoGgMGSMZ81Xa0DKDwgn9nPp 9qUw== X-Gm-Message-State: ANoB5pkPVpsn9T5IdCUG/qWkuSybSgUI0NzQFtqeNZr2mAMh7SN7rTGG MHl2y1QYBqUtiYsN0W2vyG8dyO87qQsjxw== X-Google-Smtp-Source: AA0mqf4jHpu2e21A291a4Ydr67Bn4vB2zM72aGHpKulKzxCf8PIuD/DyfCXERb1rFNKkttAZD/iTCA== X-Received: by 2002:a37:ba82:0:b0:6ee:c002:1f64 with SMTP id k124-20020a37ba82000000b006eec0021f64mr12850556qkf.165.1668953870990; Sun, 20 Nov 2022 06:17:50 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6400114qkb.35.2022.11.20.06.17.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:50 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 210/241] global: Migrate CONFIG_THOR_RESET_OFF to CFG Date: Sun, 20 Nov 2022 09:17:12 -0500 Message-Id: <20221120141743.3059310-11-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120141743.3059310-1-trini@konsulko.com> References: <20221120140829.3057894-90-trini@konsulko.com> <20221120141743.3059310-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- 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