Message ID | 20230130144324.206208-86-sjg@chromium.org |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=JeSzXdRM; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BYy2ztkz23hS for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:15:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C2A098583E; Mon, 30 Jan 2023 16:14:34 +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="JeSzXdRM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D559D85843; Mon, 30 Jan 2023 15:59:06 +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-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (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 6CA6185826 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 15:58:52 +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-x130.google.com with SMTP id u8so5181839ilq.13 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 06:58:52 -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=MwtWqZOkEv4bBWrXFUleBD29E0V6d6KzA67PH6zFy2Y=; b=JeSzXdRMsEA/7rVJWiWHc6nO4qYHCb2GA9hY+9fsEeqE2pMBVRe4TJp4OY9pFQfP5a S1LTqWTEgtjR+EiCRukbA3tkZA+nm2lCrnP+KJv/53ONYyQ754yWL+SbbWVqPrVCLWgB 7ySB0BeNBA7Oo9y8DRsSKXQvD8xdVvWwnjX30= 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=MwtWqZOkEv4bBWrXFUleBD29E0V6d6KzA67PH6zFy2Y=; b=MdO0B1taJ0LTUFMC5D7zVYD4F3+V9BxBWKaIuoxGhZlSNmeHqdEc3PA8o+7p+W43E/ l8+VKryaBEX53MOZT7OarH50VuuUzDoCjy+eSDdnbOk4TyQIe+RFU5b5Uv+1v6g5CLV4 5lshBRynfktTt6NDv1UthwDNi1I+QQAlUaVNp+iRJfGYeaTsdOAfcSGSjuRjfpcdVXKR gu36XSHQa2cpWYTvIyfFuuaj3HuWU+XVmH0gY/3gK8viMwiRrGJ7S7to92/FxEIe/Eyj IzPZlPwM24DLmiy0Xk4D0RxYmvjgOsDyWw5rHgycdfHomzI67zUtcDT84+ezStfT+wWd 6aTw== X-Gm-Message-State: AO0yUKVguAwpLoohQXZqlIlSlWdkfGtqNnZIMLnet6TEp0nCVRrM7rdp jfR9f/3bM5yCkqKtDdJcLzWoYJyyGvT9OagF X-Google-Smtp-Source: AK7set+WrkKxp0q1jZvtJTnyIcaGyiCr1ppyDKOwkV+RM8L6aYpcqXyrVfsjSRQHWed+Le3wx1P+Zg== X-Received: by 2002:a05:6e02:168d:b0:310:9a14:9662 with SMTP id f13-20020a056e02168d00b003109a149662mr21967518ila.16.1675090704136; Mon, 30 Jan 2023 06:58:24 -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.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:23 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Kever Yang <kever.yang@rock-chips.com>, Philipp Tomsich <philipp.tomsich@vrull.eu> Subject: [PATCH 085/171] Correct SPL uses of FASTBOOT Date: Mon, 30 Jan 2023 07:41:58 -0700 Message-Id: <20230130144324.206208-86-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 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
Kconfig: More cleanup of CONFIG options
|
expand
|
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)
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 <sjg@chromium.org> --- 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(-)