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 29FC5C636CC for ; Sun, 5 Feb 2023 22:59:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B796885A95; Sun, 5 Feb 2023 23:52:07 +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="A3g/iBhu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 23A9485A22; Sun, 5 Feb 2023 23:51:49 +0100 (CET) Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 81C0B85AE0 for ; Sun, 5 Feb 2023 23:43:16 +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-x136.google.com with SMTP id j12so630970ila.1 for ; Sun, 05 Feb 2023 14:43:16 -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=3y/FZrf1D56sj+D7c7x04ZFS0xaZJ+g3XJMEP33L2PI=; b=A3g/iBhuIxFtv9Ow9fNGk0DyA+9eEbRCaPbHuNpjIxjrceufEGQ5Ehv+WzrDJaMmhL +NGVRlwcER7Y4ExLtzpBPNmsKR7oz5xyvorFyApJmOvUdtPw6d5NlmDVg7TIfpNwMfMd sJYSibly7OJ50dFNmOIPdmLmsCVu34PTcflmA= 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=3y/FZrf1D56sj+D7c7x04ZFS0xaZJ+g3XJMEP33L2PI=; b=J8XELvSNpLYdom0gKIvEhSSmYZFL4wp3JahzFYscfb6EC+3StfT6ZCTIAutTB8aKqG iyoZZ50xk2K3ZKYdSjqoyGc1e9+cli5NF569g0Brr6fcrCGu/NZzvmAEpBge7I9YbCJr 2O08aEEGJ5PDbRnGsNCKct4KohCWmio4HNlis0+fBj1gXZ3Jd24emcbPyKijZxjInHYG x3S2k8pPYUW/9vH2hAgblUQb8vBcBupA1c65WWBWiGpPYadbYai8A2N3VDwgW4NsY3AM xtUihlg8CYeKXPlw2uFcyr5l6ZkVjESq78kbvv4yfK7JFT0b6D0LbAk8+UzwGanYNnWd cdhw== X-Gm-Message-State: AO0yUKXG68OvNwLzx01c1b7Sxx6AnVmwfhop9kHauk526LUNzbTJ8cSZ YMi1+XV9e3cNlYefk0Fz+YsHpWBp5tmnKe86 X-Google-Smtp-Source: AK7set+DbeIkmjYuLzMOPx8IMOi8BZgeyN6zKC2j2ts4WHLvnqsTBk1/N2BcF3XNbTV6gwPyD9Tm1g== X-Received: by 2002:a05:6e02:1746:b0:310:f91c:edc9 with SMTP id y6-20020a056e02174600b00310f91cedc9mr16610979ill.5.1675636993041; Sun, 05 Feb 2023 14:43:13 -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 z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 120/169] Correct SPL uses of PG_WCOM_UBOOT_BOOTPACKAGE Date: Sun, 5 Feb 2023 15:40:29 -0700 Message-Id: <20230205224118.233425-121-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 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 Aleksandar Gerasimovski --- (no changes since v1) 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 -- 2.39.1.519.gcb327c4b5f-goog