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 7B6A9C636CC for ; Mon, 6 Feb 2023 00:57:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DE11385B6E; Mon, 6 Feb 2023 01:56:59 +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="LBi2PCR9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C050685AEA; Mon, 6 Feb 2023 01:56:57 +0100 (CET) Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) (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 7ED4185B9B for ; Mon, 6 Feb 2023 01:56:51 +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-io1-xd36.google.com with SMTP id j17so2065109ioa.9 for ; Sun, 05 Feb 2023 16:56:51 -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=ceYTDHySHJOx9K0ev2F3vGmwPVAW5XbHJVpwsOpwR9I=; b=LBi2PCR9MfM4n9oldChnC+GVVEH9BlO/QxcpvDa4Xwlplvy+KJhtFryA3f+gAn4DhT SsO7W4q+uGcpaxo65EixDE9WfUT50+dhNJ64Be+VE83vQuVWdQO2iEbyOGarcdMeu/Rh r4sftjQUNuTI3z/wSs0OPZNWXP6RI0gpETEtk= 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=ceYTDHySHJOx9K0ev2F3vGmwPVAW5XbHJVpwsOpwR9I=; b=04FFkLeUhcMQ3RX+ONALaHrAnk7m+2u7iJTaQ0dNcp47AxJLOhjQ46gEulcD9eMBL7 9DC0ZJTHpMZ6dV7gau+0N8XmNT5Vf4Ika0CiR1hMaljNKEgAEQQgos5mUi1HSvjiNKoC mWJRnLpb4iAfp2WTCFg82aMfsvqgtv25Mif1Dtruhbs/4eUjkqW0utsgAsX1KuhENkY3 kVA2Lq5db4e/fChPIGP6gzLAl7MVaFAjnYBveJYCFOw8HhK7IfmUGXHGhwhwPpuJrPlv I0Sw2HRX4W/utPgHb2v9pf4rqt7f6xOTezsBFCiEH7IdP2w2ZeMOwrINkCBWORv2wKZ7 GPNg== X-Gm-Message-State: AO0yUKVHh8F4Bca87RTe+2oGC7albybMWXcWOophnOpXU0a0sMWnyks6 FaE6eDdiCKOFfpfQHe1fAVp9w4k/nUpdSXTN X-Google-Smtp-Source: AK7set9QdoE+GKiVo7SUULAv2rQPGqcT7NniRtacYbawsWlYPPqumc9N37aPyxIUMUm/uDJb9EvD4g== X-Received: by 2002:a6b:ef0a:0:b0:721:4772:72ac with SMTP id k10-20020a6bef0a000000b00721477272acmr12311797ioh.4.1675645009977; Sun, 05 Feb 2023 16:56:49 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:56:49 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 083/169] Correct SPL uses of FASTBOOT Date: Sun, 5 Feb 2023 17:54:10 -0700 Message-Id: <20230206005537.254541-84-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-sjg@chromium.org> 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_FASTBOOT defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-rockchip/board.c | 2 +- board/ti/am57xx/board.c | 2 +- board/ti/dra7xx/evm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 6e05a8f76ef..ebffb6c3ff0 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -306,7 +306,7 @@ int board_usb_init(int index, enum usb_init_type init) #endif /* CONFIG_USB_GADGET */ -#if CONFIG_IS_ENABLED(FASTBOOT) +#if IS_ENABLED(CONFIG_FASTBOOT) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 0e57ee566b3..9ea507a8e96 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -1172,7 +1172,7 @@ int board_fit_config_name_match(const char *name) } #endif -#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) +#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 568c8fb0411..a8a216d034a 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -1049,7 +1049,7 @@ int board_fit_config_name_match(const char *name) } #endif -#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) +#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) -- 2.39.1.519.gcb327c4b5f-goog