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 58D1DC636CC for ; Tue, 31 Jan 2023 16:57:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F137485B55; Tue, 31 Jan 2023 17:57:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="Di63RtvZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0545485B6E; Tue, 31 Jan 2023 17:57:37 +0100 (CET) Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (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 3DC4785B71 for ; Tue, 31 Jan 2023 17:57:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mkorpershoek@baylibre.com Received: by mail-wm1-x329.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so12945727wma.1 for ; Tue, 31 Jan 2023 08:57:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=IWXknRyG5VVJDDe8JI/Luxfrc7yjHOxmbpb8Y/BEFfg=; b=Di63RtvZjZThhdvHwfVq2uLJ9hRZQ3dl4SWfJ0ySKYa2BLUJ9zjHJuaF+IBHpRSJn6 gFV9z/COVxzIvOJq62JoX1BE6pgT/Xcc2i+ekqSM0gNkEJJagf7MQeVqR9GSAq4rYzlo MY7/NWbfgo0ccH3t5CM8VJhCTKxG5/gtjWFRzPFh2PpH3+PtMFz4FuyUsZBQs4fwpMNR VCvT2b5/53rQUUNWN50lBfEWDFADTd1BEjmCIimXxLWekcC+/JqDQyrpfWScb+YwkpLq VR9PPwSImoOTy70ypAMcXcmGjWWU3b4TMN5gZz06XPS5uKg6jaIwGvwebNkXw6CnAuhs DYEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IWXknRyG5VVJDDe8JI/Luxfrc7yjHOxmbpb8Y/BEFfg=; b=oSV11R98DsIxSjzL5mCv8zxHWa/29qd8gY+78WrWcmndpqibdAPuKqahd88boGqnne sQzlV1UiNAEFcVzxGYuRJH6xlODBAESH0yhsgVM8p6eOtqTB5Mgmsf9L2pAw8zIHZKnm hVFnOa5x1A8jjMSHpOrKAyJs7tLgVAnWYs2FNbhZsh/BU/xWMJxL68DVPElOA30Kmk5d tsGgKfgu4JItdtRH/jxGJJ/JJrEboSKBQFpMCL6LsS7K6WGDnfCpzoCMzXkB/JpOR9ef hLNIdJlsZKQrWeekto/SUjzEDuqqqBeEiVS3NRV9YdxHidDOTWK4zjJ2yGJpaR4RvT5g fsAQ== X-Gm-Message-State: AO0yUKUQzooaH4TYRstUXzDTuI/0fZKVEXk+FocUMq//LWRrF9GKs7uS sHxkVklwJHJzsTEZWIw2aiN3Mw== X-Google-Smtp-Source: AK7set9DFknqoiknzdpn66/qpXtQELakHrJMGhwMpzUASO1UeZiIlczN6rjSJoMM5SWUmWGyuv8YAA== X-Received: by 2002:a1c:7205:0:b0:3dc:523c:22b4 with SMTP id n5-20020a1c7205000000b003dc523c22b4mr10612801wmc.27.1675184253725; Tue, 31 Jan 2023 08:57:33 -0800 (PST) Received: from localhost ([82.66.159.240]) by smtp.gmail.com with ESMTPSA id j22-20020a05600c485600b003cffd3c3d6csm15965171wmo.12.2023.01.31.08.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 08:57:33 -0800 (PST) From: Mattijs Korpershoek To: Simon Glass , U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heiko Schocher , Patrick Delaunay , Sean Anderson Subject: Re: [PATCH 087/171] Correct SPL uses of FASTBOOT_FLASH_MMC In-Reply-To: <20230130144324.206208-88-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> <20230130144324.206208-88-sjg@chromium.org> Date: Tue, 31 Jan 2023 17:57:32 +0100 Message-ID: <87h6w6k5fn.fsf@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain 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 On Mon, Jan 30, 2023 at 07:42, Simon Glass wrote: > This converts 5 usages of this option to the non-SPL form, since there is > no SPL_FASTBOOT_FLASH_MMC defined in Kconfig > > Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek > --- > > drivers/fastboot/fb_command.c | 4 ++-- > drivers/fastboot/fb_common.c | 2 +- > drivers/fastboot/fb_getvar.c | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c > index 67a94798287..5a3fb69b3f7 100644 > --- a/drivers/fastboot/fb_command.c > +++ b/drivers/fastboot/fb_command.c > @@ -295,7 +295,7 @@ void fastboot_data_complete(char *response) > */ > static void __maybe_unused flash(char *cmd_parameter, char *response) > { > - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) > + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) > fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr, > image_size, response); > > @@ -315,7 +315,7 @@ static void __maybe_unused flash(char *cmd_parameter, char *response) > */ > static void __maybe_unused erase(char *cmd_parameter, char *response) > { > - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) > + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) > fastboot_mmc_erase(cmd_parameter, response); > > if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) > diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c > index 7563650d07d..57b6182c46a 100644 > --- a/drivers/fastboot/fb_common.c > +++ b/drivers/fastboot/fb_common.c > @@ -99,7 +99,7 @@ int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) > const int mmc_dev = config_opt_enabled(CONFIG_FASTBOOT_FLASH_MMC, > CONFIG_FASTBOOT_FLASH_MMC_DEV, -1); > > - if (!CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) > + if (!IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) > return -EINVAL; > > if (reason >= FASTBOOT_REBOOT_REASONS_COUNT) > diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c > index bcef8f866f3..de4879dadfb 100644 > --- a/drivers/fastboot/fb_getvar.c > +++ b/drivers/fastboot/fb_getvar.c > @@ -62,7 +62,7 @@ static const struct { > .variable = "has-slot", > .dispatch = getvar_has_slot > #endif > -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) > +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC) > }, { > .variable = "partition-type", > .dispatch = getvar_partition_type > @@ -99,7 +99,7 @@ static int getvar_get_part_info(const char *part_name, char *response, > struct disk_partition disk_part; > struct part_info *part_info; > > - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) { > + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) { > r = fastboot_mmc_get_part_info(part_name, &dev_desc, &disk_part, > response); > if (r >= 0 && size) > -- > 2.39.1.456.gfc5497dd1b-goog