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 04F46C636CD for ; Mon, 6 Feb 2023 00:59:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 084C385C52; Mon, 6 Feb 2023 01:58:14 +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="f+510lBN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 60D7485BBC; Mon, 6 Feb 2023 01:58:08 +0100 (CET) Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) (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 B0E0A85BC1 for ; Mon, 6 Feb 2023 01:58:04 +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-io1-xd36.google.com with SMTP id y2so3952171iot.4 for ; Sun, 05 Feb 2023 16:58:04 -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=OXIg6fX8rl5GK0L3fYcK1jGpBVITL+eLmf6ZwF4d3eQ=; b=f+510lBNLhRM/2gE51SsyJGWmnea6Ej0nq2Yrik9XE58nHOkZIY08qfshpV1hdrr/d 6LsYxchFIBorE+woRc1QKKkfuS0re40FenxSkMO/ADuROSNbSHxKB5apdKBAJGw46wft nmRXjsiQXNNIbqJsX8BSkXonzjRyKb+oAAmyo= 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=OXIg6fX8rl5GK0L3fYcK1jGpBVITL+eLmf6ZwF4d3eQ=; b=NW+gOM7/V3iBwm5shgCYPj7G46PhUC0/f4x3HQxpOfdNB1kIMkJa9q8lg9NDP90X4O efftPT9Lycgf+g1eVd/ycKhQsla8yYYLskfFM3i/Impj02zj8+FSv4I8qi8H7NwAiQgH 19vAw3q2lONhAb/G3d5dZQ5vWRDGidlMv7jWlH37K6Dlihcpx7nMgKJfLaRuzeE2KPHz +Z/B1Ug/9d//FkImEu3OQ+IkAk3TDBjJWVG5kK5TPzpiQndyP+m9vJEyW4kTt85l8XSc Ey19ZjO6ic+qp+pHbGuTQC2zNnbDxVsTyPyvahrsSu7LWU8vbas1Tz4/GyORJpNAIkv2 JkOg== X-Gm-Message-State: AO0yUKVQdzCQyWqqHpIVtucUR7KeeEb9eKrUF6JBqZkXyoMCOI94lXwQ sZ0QFocSlX6ByLDVC4GegzS1hqNGg0USkfhp X-Google-Smtp-Source: AK7set/s1BUK7EXrhxYLpYkne0ZaSyhllGycdpuRtOwRoFw9uQFhz3DoUDms/Vq7U+Ov3jbhuMj03g== X-Received: by 2002:a05:6602:2748:b0:704:c2fe:d923 with SMTP id b8-20020a056602274800b00704c2fed923mr8442245ioe.2.1675645083351; Sun, 05 Feb 2023 16:58:03 -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 b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:58:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 132/169] Correct SPL uses of ROCKCHIP_OTP Date: Sun, 5 Feb 2023 17:54:59 -0700 Message-Id: <20230206005537.254541-133-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-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_ROCKCHIP_OTP defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-rockchip/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 437c7cf896a..b350f18f114 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -60,7 +60,7 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, const u32 cpuid_length, u8 *cpuid) { -#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || IS_ENABLED(CONFIG_ROCKCHIP_OTP) struct udevice *dev; int ret; @@ -68,7 +68,7 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, #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) +#elif IS_ENABLED(CONFIG_ROCKCHIP_OTP) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(rockchip_otp), &dev); #endif -- 2.39.1.519.gcb327c4b5f-goog