From patchwork Mon Jan 30 14:41:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=DV7p7N5A; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Byh0Zqgz23j6 for ; Tue, 31 Jan 2023 02:33:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 32D298598A; Mon, 30 Jan 2023 16:25:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="DV7p7N5A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E49A185803; Mon, 30 Jan 2023 16:15:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (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 BE13A8563A for ; Mon, 30 Jan 2023 15:55:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id u8so5177751ilq.13 for ; Mon, 30 Jan 2023 06:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mjw6+I5HSu8KAilzlhSizZRmxsEmZfjRLdHFJ650kwY=; b=DV7p7N5A6bCnDS/pLvmA6Nk3sgCjq5NcSA6R5S7eKWyvqZFMQ9LvFSxVwNKi513u1Z lqYNMaXW4lhwYKi0OTLP+5szet3LliglU9ZN92qXsa/98v3SUCKuwGXFCuDyrI7nOeyb 6BMkrjY6ftE7UX160tEPFw4KBhmdmh7fp+yyg= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mjw6+I5HSu8KAilzlhSizZRmxsEmZfjRLdHFJ650kwY=; b=q2hdQYpa1KPKsDQWa7HVAWetTP26/oZkA4fRHJembF0xU87JH8rojrFrfi+p241fM4 E6f2SFQu5J5COrJdqx/HIG7bS0yCg2f7Ra5MWomQFRgGaNU8ZxJF6PDWFOQxODiUaZAv kE7TROOJ6vLE9fr5Y8RcTi2QYHStBzUHg/E9bXKaT9LIXC2idXigZzK9+PFWevqnI/e0 HY14B761mUsNNdI0dSHLtOkrNwIpWEGNjRYWhEzLLK3LviMdF4uZQTxYg3TbWYRoCSPO DF3WPZltzlII3Y3GsfoiNUp8yySnPGoWXxdRxMTGzTIXVI8cV+jgxCsv+k47rD/DL0pb x9NQ== X-Gm-Message-State: AO0yUKVLVhb/IfgnT862HZOM09ezwBvEaQcYEPGzTT/S8mrSH29MApzt GELFHuy8fFW8YkUzOieAfmxSo5kdxLDTG1wZ X-Google-Smtp-Source: AK7set/bi+D/U2oqABCEIcFaECati99tHqgYG/yCEsEDG7Jw+XvDRsr00B2jP8kZXmQvIWaZfEr9Mg== X-Received: by 2002:a05:6e02:2199:b0:30d:b3c3:f94c with SMTP id j25-20020a056e02219900b0030db3c3f94cmr8249672ila.2.1675090528998; Mon, 30 Jan 2023 06:55:28 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:28 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Lukasz Majewski , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 066/171] Correct SPL uses of DFU_VIRT Date: Mon, 30 Jan 2023 07:41:39 -0700 Message-Id: <20230130144324.206208-67-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_DFU_VIRT defined in Kconfig Signed-off-by: Simon Glass --- board/st/common/stm32mp_dfu.c | 2 +- drivers/dfu/Makefile | 2 +- include/dfu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c index 0096f71dfc1..19e9c3b2402 100644 --- a/board/st/common/stm32mp_dfu.c +++ b/board/st/common/stm32mp_dfu.c @@ -159,7 +159,7 @@ void set_dfu_alt_info(char *interface, char *devstr) puts("DFU alt info setting: done\n"); } -#if CONFIG_IS_ENABLED(DFU_VIRT) +#if IS_ENABLED(CONFIG_DFU_VIRT) #include #include diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile index dfbf64da667..df88f4be59a 100644 --- a/drivers/dfu/Makefile +++ b/drivers/dfu/Makefile @@ -10,4 +10,4 @@ obj-$(CONFIG_$(SPL_)DFU_NAND) += dfu_nand.o obj-$(CONFIG_$(SPL_)DFU_RAM) += dfu_ram.o obj-$(CONFIG_$(SPL_)DFU_SF) += dfu_sf.o obj-$(CONFIG_$(SPL_)DFU_WRITE_ALT) += dfu_alt.o -obj-$(CONFIG_$(SPL_)DFU_VIRT) += dfu_virt.o +obj-$(CONFIG_DFU_VIRT) += dfu_virt.o diff --git a/include/dfu.h b/include/dfu.h index 07922224ef1..06efbf4b208 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -495,7 +495,7 @@ static inline int dfu_fill_entity_mtd(struct dfu_entity *dfu, char *devstr, } #endif -#if CONFIG_IS_ENABLED(DFU_VIRT) +#if IS_ENABLED(CONFIG_DFU_VIRT) int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, char **argv, int argc); int dfu_write_medium_virt(struct dfu_entity *dfu, u64 offset,