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 B70B1C4332F for ; Tue, 31 May 2022 18:15:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F04184271; Tue, 31 May 2022 20:15:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="grM0vQnT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D4ECE83D84; Tue, 31 May 2022 20:15:17 +0200 (CEST) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (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 2C80A83EF9 for ; Tue, 31 May 2022 20:14:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ovpanait@gmail.com Received: by mail-wr1-x432.google.com with SMTP id x17so10701570wrg.6 for ; Tue, 31 May 2022 11:14:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cHFgLV9vSyclCZhk1ebGO0X73o+7iVVOulsPGzC0kUk=; b=grM0vQnTv9cSAdTekYBjhbE2PRqi9vtd+RbcOQH4t4wkdFJ36GswYmlU8GCMo5FjkN 7ZaJGd5fsl1ujrWdi5qFNT/08XFhjuP/XUCjfGNIFUpetC1Jn+LnWwz8b7j4EQBUgadu 8mrujLpsbjgBEcGpwbjYwwp0fMQ2NfFCAjYFPbKqenKkEw4aegsNSOZqKW1SEQdzyfXT irD3ZVyzyuTE3IBoum0sHjtP7RrYViNMt8vXFj9tUQpD8KgMQvBzhjK6DbAFrXbZoD+F 4hrgELwgnn0spwwV4h/T+f++Q9VgBqaEBvWHylCasHo6ixifeoId3Vyn8nuoHLs8sr7u 0V8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cHFgLV9vSyclCZhk1ebGO0X73o+7iVVOulsPGzC0kUk=; b=mfoTJQMeuOr35J+jSYRXog2yGbX3Y2daRr4JaQiRbWHLfLGRqTjgNFBXNUKE/qiLqH miv3uFVgl30C54gbKw1uqQvelX8D+536TirXohowDMh5ocFLl/fEt6ar8gJiDlF+E7Vt /qejfUeCGQkV9vcLwMjkWUyi5K8fjOiJa41pgp3M1ZuZIPsXF6keNtt4HHAz1OqieOqy 9nQdmatMMV35nyfm1tReWCCQ60NZURI6pbRHwF9o4Q+BZFuRhxIsFOzKNnBYeNNZbsoW FWX5ta7/t/3PjfkM8/CWPI918quJsmEWtU4wjLAeuM61WlEeLf8SddNzcSLlTKXjFqwr Sr9A== X-Gm-Message-State: AOAM5335TIKDSX49HuAYqRSRwEEHiV629EBPX55PdamHOI3sSG/cg+0x epY8pidhZ4GpgKYfs8Enmutgk28lS90= X-Google-Smtp-Source: ABdhPJzJYBpNJj6mJuaIGhMISFuH2EyPTeUox8zbxgKoW5QpCDN52xTyZUQI3xPW0/4G8O+kV+of6w== X-Received: by 2002:a5d:5281:0:b0:20c:d5be:331c with SMTP id c1-20020a5d5281000000b0020cd5be331cmr50404934wrv.9.1654020892769; Tue, 31 May 2022 11:14:52 -0700 (PDT) Received: from localhost.localdomain ([2a02:2f0e:c003:7c00:45d1:29c0:7802:f752]) by smtp.gmail.com with ESMTPSA id l3-20020a1c7903000000b003974027722csm2682980wme.47.2022.05.31.11.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 11:14:52 -0700 (PDT) From: Ovidiu Panait To: u-boot@lists.denx.de Cc: monstr@monstr.eu, Ovidiu Panait , Alexandru Gagniuc , Marek Vasut , Michal Simek , Simon Glass Subject: [PATCH v2 04/14] microblaze: cache: replace XILINX_USE_DCACHE -> CONFIG_DCACHE Date: Tue, 31 May 2022 21:14:25 +0300 Message-Id: <20220531181435.3473549-4-ovpanait@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220531181435.3473549-1-ovpanait@gmail.com> References: <20220531181435.3473549-1-ovpanait@gmail.com> 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.5 at phobos.denx.de X-Virus-Status: Clean XILINX_USE_DCACHE macro was removed in 7556fa09e0e ("microblaze: Simplify cache handling"), but it was still used in a couple of places. Replace those occurences with CONFIG_DCACHE. Signed-off-by: Ovidiu Panait --- (no changes since v1) arch/microblaze/cpu/cache.c | 2 +- arch/microblaze/lib/bootm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c index aa832d6be6..b6126de194 100644 --- a/arch/microblaze/cpu/cache.c +++ b/arch/microblaze/cpu/cache.c @@ -49,7 +49,7 @@ void dcache_enable(void) void dcache_disable(void) { -#ifdef XILINX_USE_DCACHE +#ifdef CONFIG_DCACHE flush_cache(0, XILINX_DCACHE_BYTE_SIZE); #endif MSRCLR(0x80); diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 12ea32488e..b652d2767a 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -57,7 +57,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) "(fake run for tracing)" : ""); bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); -#ifdef XILINX_USE_DCACHE +#ifdef CONFIG_DCACHE flush_cache(0, XILINX_DCACHE_BYTE_SIZE); #endif -- 2.25.1