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 26AC7C54EAA for ; Mon, 30 Jan 2023 15:11:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 95BA385813; Mon, 30 Jan 2023 16:10: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="C3bnzNkK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D51488585D; Mon, 30 Jan 2023 16:01:46 +0100 (CET) Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 D551B85821 for ; Mon, 30 Jan 2023 15:55:34 +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-x134.google.com with SMTP id l15so1366424ilj.5 for ; Mon, 30 Jan 2023 06:55:34 -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=X1wgbvk1ssnh5CiQDbqbIJXAlCajdKpZbQ1ZSm+d0Wg=; b=C3bnzNkKXXQFgSM/pVfJOvUUKAcwcTNpHBvSlk/I+hgG5DFv93FGHCOOLDuugNCOfU kmjm5QPuPVz2m2eoqZ98klcg3WZGBcKjmOju5hBpEj6fxmBnBpKuXuF0H4TxyxZ3XjDz TY17vZ6zWVLhhPLeNOvSBw47pCe6FdnX1dIp4= 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=X1wgbvk1ssnh5CiQDbqbIJXAlCajdKpZbQ1ZSm+d0Wg=; b=zOErThkTUzI+eqzBHr7/2ApAkg7sWsNfWG64Ju4bf/bo7qm8UVCdsiHKxt+Bt12gD3 xB1MU/pZu/SkcbBLgAZa6fAv2M5M6Io3fp3yAKCv36qYK6r595IQkFkW4To+5KtE5ZER MIw4Y55/ELto4PgLv11rn/JAwt5BQ4HHrOgmfA555MH622yM+ozYluJaiRvM3duA78T2 NgGXtV9yBLuhR8YpNqM/7qKng7RXUygugKx9ZLuDPwDf7e8hWfkttw8RhocX3Yli4vrQ 3WgUtp62SFvgimdTbzxAq2UJA+DpKYUH8Ub76lVCk62c3pmcqOX/X4CY2cRpXbWKLhcp OQWA== X-Gm-Message-State: AO0yUKVWoW29rF7lXup8Kj1wgz53CELg7u/u38PEOfC4Nr1iV2ys2GZF WkmzMCm9YrEhMvKr0bLsJn8YXY0gVHZMTX0k X-Google-Smtp-Source: AK7set9446N+O/zkMYSrTc+I5eez/a5rIMzRIa1ZGHTxJb+lKSlFQtRN1JqRL1fH7xk+lZKFUAC0gg== X-Received: by 2002:a05:6e02:1c0f:b0:310:e9f4:1e32 with SMTP id l15-20020a056e021c0f00b00310e9f41e32mr5246681ilh.19.1675090527219; Mon, 30 Jan 2023 06:55:27 -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 g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:26 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek , Ovidiu Panait Subject: [PATCH 064/171] Correct SPL uses of CPU_MICROBLAZE Date: Mon, 30 Jan 2023 07:41:37 -0700 Message-Id: <20230130144324.206208-65-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-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_CPU_MICROBLAZE defined in Kconfig Signed-off-by: Simon Glass --- arch/microblaze/cpu/cpuinfo.c | 2 +- arch/microblaze/include/asm/cpuinfo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/microblaze/cpu/cpuinfo.c b/arch/microblaze/cpu/cpuinfo.c index f021f4e5e25..6b15d6ca41c 100644 --- a/arch/microblaze/cpu/cpuinfo.c +++ b/arch/microblaze/cpu/cpuinfo.c @@ -8,7 +8,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(CPU_MICROBLAZE) +#if IS_ENABLED(CONFIG_CPU_MICROBLAZE) /* These key value are as per MBV field in PVR0 */ static const struct microblaze_version_map cpu_ver_lookup[] = { {"5.00.a", 0x01}, diff --git a/arch/microblaze/include/asm/cpuinfo.h b/arch/microblaze/include/asm/cpuinfo.h index 86d2c8a034d..3c58e52217c 100644 --- a/arch/microblaze/include/asm/cpuinfo.h +++ b/arch/microblaze/include/asm/cpuinfo.h @@ -26,7 +26,7 @@ struct microblaze_cpuinfo { u32 dcache_size; u32 dcache_line_length; -#if CONFIG_IS_ENABLED(CPU_MICROBLAZE) +#if IS_ENABLED(CONFIG_CPU_MICROBLAZE) u32 use_mmu; u32 cpu_freq; u32 addr_size; -- 2.39.1.456.gfc5497dd1b-goog