Message ID | 20230130151612.212732-134-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=Gppx+F7P; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4P5CTL2hBJz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:56:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 81FDE8595C; Mon, 30 Jan 2023 16:55:56 +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="Gppx+F7P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D3FA48599F; Mon, 30 Jan 2023 16:55:24 +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-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (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 E62E4859A3 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:19:00 +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-x129.google.com with SMTP id i6so1361537ilq.8 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:19:00 -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=y6hsvwAeziUSfcWd3RQC1943JEssBVYvkpZOvbLBjcc=; b=Gppx+F7PCcMPJr4j8loZGLl35Hww6+GzgLaD54kRLU9lySBo4BIE9ZBxlqhRR+GTL8 Ynhc6icF/RU4I/vxyEU2meZCBR6GbQD/pSxO/8uu1LMCcNzNYypapyuJi86iH/r4GSds iYrePmsLY/xRUQ0+pRTE+yNT+EqPay/4Q4Mu4= 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=y6hsvwAeziUSfcWd3RQC1943JEssBVYvkpZOvbLBjcc=; b=jqjWu2092zAjBY5oZyTGoNJq/U9sqNQJiSlFQln3n1eDrIwpLuHrQjqmYraZWKG2aK BuXWV/QE8f14VlUMdt3+fI1SVDG6CUSM0Gxb+qFWGOZVRn3/pNybkD6m28lplIqmUtJo o+TzRde8WBG+pZWvlGA0YbC3byyoY0t+ixiM3d0Be//aArvPREjO2wFewlWTEmT0n4wl LiRW9ia6kVCmoC+sFpuH17Ul36vvrHYkGV+OcQVzHZEs9t+wbKwpWM3pbbC8y6sx5gsH lo4RUS5Jp5pZodyXC58HUA+eCjTsNAET0E0b0VMv+pUlLenyYefTeZtA/mkDYdZwI9l5 UQtg== X-Gm-Message-State: AO0yUKU6jvOoSPWV39ZGJ/z9yn34e6Lv7oTvGWljhB/MNWQmEoJ++ogD qgt8UFjREXDK5U0jfHvqdFiSOVwl6fYNQejE X-Google-Smtp-Source: AK7set8yV2mAyS3f+eOjRiGpwreHXHB9Tc8o8+8HavpONnl8bDTJKUCjBrBGCQL4PqXo15mfibNNgg== X-Received: by 2002:a05:6e02:1cad:b0:310:fdd5:c1ec with SMTP id x13-20020a056e021cad00b00310fdd5c1ecmr1656763ill.22.1675091866534; Mon, 30 Jan 2023 07:17:46 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:46 -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 133/171] Correct SPL uses of ROCKCHIP_EFUSE Date: Mon, 30 Jan 2023 08:15:34 -0700 Message-Id: <20230130151612.212732-134-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 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 |
None
|
expand
|
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 01aedadf2c6..437c7cf896a 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -60,12 +60,12 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, const u32 cpuid_length, u8 *cpuid) { -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) struct udevice *dev; int ret; /* retrieve the device */ -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(rockchip_efuse), &dev); #elif CONFIG_IS_ENABLED(ROCKCHIP_OTP)
This converts 2 usages of this option to the non-SPL form, since there is no SPL_ROCKCHIP_EFUSE defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/mach-rockchip/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)