From patchwork Mon Jan 30 15:15:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734258 X-Patchwork-Delegate: trini@ti.com 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=OtkzUUE4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5CTZ5FGlz1yhq for ; Tue, 31 Jan 2023 02:56:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3557785797; Mon, 30 Jan 2023 16:56:01 +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="OtkzUUE4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3A98B85903; Mon, 30 Jan 2023 16:55:22 +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=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 9127D85803 for ; Mon, 30 Jan 2023 16:17:28 +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-x12b.google.com with SMTP id i6so1360838ilq.8 for ; Mon, 30 Jan 2023 07:17:28 -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=WlO2KkYnnjsIY6HNjeRix6fzog7uIiSVVPtJ169vcXI=; b=OtkzUUE4bhSoDbsiBLMnFsqRGGDUs0niosS9m8QC5HmbI8TOj49aUmMUdv9CzeBT5J rQQldOF0JH+U/cir3noaBl8QOHLtKoRB1BZKGp4XjX5xdfL6T/qOwkHXSaiwfYKXYaaI 2AA1KYGywCv2nVwaoVTHGE+aM29y35wxWYaVI= 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=WlO2KkYnnjsIY6HNjeRix6fzog7uIiSVVPtJ169vcXI=; b=zvRTMxmcuLfPIwYuIMGI1Hy+kGBOnXeQHdV5Sv3cRL/KhQ/GQOjzkUjx0QRvLll2k0 ogPjhpWLnZxo7lsqeszuLrEpkmypUoVOlw4LOIX8bpNwkr/QearH9wa0GBpi/DvhJR3n VzuonVIMpPhQTiS+MBg0lk9VKvTVFgSgsK4U6Q7aFQjXjL+DBZhYIthmYUEJLrPPZBcd GZYE/AiCU0/7zn9HSZ5Ek1miEDjltaJ/86RJy905mPy/DnEhfwVwELDiCyxcrA0vnYSJ YdKcGdU1qnUgBlTNn3Wu6ckrbpAuqTQFsP8OfAWRsr4V64gl/uV674Ma+J/4D91Cjyve zz1A== X-Gm-Message-State: AO0yUKVBKpryxfsRHkZGfWljVGfyJ7/lIdleQfgN1ZO42fBVZo4DkCdc uzICe5BOfcS3rRqx2gStJaMFwQEEEjt//BkY X-Google-Smtp-Source: AK7set/dvnzAr0IadVkIn+UHUN04cllZPDwQAIkL2RubgOYPBzb6wNrfx7nBWltZLsVRDi1xNkX7rw== X-Received: by 2002:a05:6e02:d94:b0:310:c2d5:dfd5 with SMTP id i20-20020a056e020d9400b00310c2d5dfd5mr7852436ilj.17.1675091835147; Mon, 30 Jan 2023 07:17:15 -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 o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 110/171] Correct SPL uses of MTD Date: Mon, 30 Jan 2023 08:15:11 -0700 Message-Id: <20230130151612.212732-111-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-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 2 usages of this option to the non-SPL form, since there is no SPL_MTD defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 2 +- board/st/common/stm32mp_dfu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 4b75397b1cc..9c4ba407ba0 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -1748,7 +1748,7 @@ static void stm32prog_end_phase(struct stm32prog_data *data, u64 offset) } } - if (CONFIG_IS_ENABLED(MTD) && + if (IS_ENABLED(CONFIG_MTD) && data->cur_part->bin_nb > 1) { if (stm32prog_copy_fsbl(data->cur_part)) { stm32prog_err("%s (0x%x): copy of fsbl failed", diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c index 19e9c3b2402..079ba15ddb1 100644 --- a/board/st/common/stm32mp_dfu.c +++ b/board/st/common/stm32mp_dfu.c @@ -123,7 +123,7 @@ void set_dfu_alt_info(char *interface, char *devstr) board_get_alt_info_mmc(dev, buf); } - if (CONFIG_IS_ENABLED(MTD)) { + if (IS_ENABLED(CONFIG_MTD)) { /* probe all MTD devices */ mtd_probe_devices();