From patchwork Mon Jan 30 15:15:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734275 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=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=Ul5E2I4U; 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 4P5DND1WWhz23hS for ; Tue, 31 Jan 2023 03:36:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 14A9385920; Mon, 30 Jan 2023 17:36:35 +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="Ul5E2I4U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E0EE980465; Mon, 30 Jan 2023 17:35:34 +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-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 619838597A for ; Mon, 30 Jan 2023 16:17:40 +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-x131.google.com with SMTP id g16so5237552ilr.1 for ; Mon, 30 Jan 2023 07:17:38 -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=qyGL2L3QJPQ78qLXPrkGajaBDmXxjm24YRHWvCvpXao=; b=Ul5E2I4UbT0Omokz7pr3STk1UJqeAiDvxbOy48UesVBS/1qORj9rtwH+GKPawPp6FP fe5wb0Udc/Py/ILuhb+lcYPEBGtZGWiqbRQtcebuh4p1AswDrG8l3kPIAYn1YS1od3Rx te7DIZtp+QBAi6Oixhod8QtC+Y1O3jVcwn/zE= 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=qyGL2L3QJPQ78qLXPrkGajaBDmXxjm24YRHWvCvpXao=; b=YjyomJZsu0s8dQiUNeb0NoMtD6w3gPb/bFI+pbLvwp4NMis/ozR+1ycE+u9aKZlOZN 1+7gqvKk5Xr5XsEB6LXoXVDsE9DQoqUd99aqSpkl7p5TzWbVS+2lM8gPCkWEaGR+WGwI qjLJUHfltpF2jNCokEphpe8x/56TO+uJZ8jN0Zr2MvO0MS05sEEv+L53+9HULrV0XsXa FP+oZaHZq/TebftcWFHZhI2FcYJeSsaDefhDH/QZreP8nasVes1KIj2DGFDx2YjKiaOL oLPVADmvsw46QRrD9hCPrA8XxHwArRKVc5IcGY483BIzo21iiIIOvpjSY/NhRxxvqkeA HbEg== X-Gm-Message-State: AO0yUKUqbSal5ohJXbbpG+QeAmlvbOgUxEllTqVfVNvg5s4W8y2elpBP TsO2sYk+PzOiyJaYphNTnOu4FNTvuzyp2skx X-Google-Smtp-Source: AK7set86swOD4fiRECvW28Av8QF779dEqU+e7QGShJH0jAWtweNu5RfxuRV6GG+UyEM/u5nqMZE6Og== X-Received: by 2002:a05:6e02:152a:b0:310:c730:b427 with SMTP id i10-20020a056e02152a00b00310c730b427mr7303374ilu.18.1675091858323; Mon, 30 Jan 2023 07:17:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aleksandar Gerasimovski , Priyanka Jain Subject: [PATCH 122/171] Correct SPL uses of PG_WCOM_UBOOT_BOOTPACKAGE Date: Mon, 30 Jan 2023 08:15:23 -0700 Message-Id: <20230130151612.212732-123-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_PG_WCOM_UBOOT_BOOTPACKAGE defined in Kconfig Signed-off-by: Simon Glass Signed-off-by: Simon Glass Reviewed-by: Aleksandar Gerasimovski --- board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 0252ada93ff..9cf5b71655c 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -79,9 +79,9 @@ int set_km_env(void) } #if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) -#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ +#if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ - (CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ + (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif