From patchwork Sun Feb 12 23:16:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1741255 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=f75+nqQZ; 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 4PFP3t3zNmz23h0 for ; Mon, 13 Feb 2023 10:35:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CE66854EA; Mon, 13 Feb 2023 00:32:45 +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="f75+nqQZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 45C87857A3; Mon, 13 Feb 2023 00:32:39 +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=unavailable autolearn_force=no version=3.4.2 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 E9B1085811 for ; Mon, 13 Feb 2023 00:18: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=sjg@chromium.org Received: by mail-io1-xd2a.google.com with SMTP id 65so3949828iou.3 for ; Sun, 12 Feb 2023 15:18:07 -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=ko7eg3hujpwJ49eiVD6gsYK/Hm0EQ8zI48m9brU1X18=; b=f75+nqQZf9vc/1WO5rbgEsd1aFD73l8IOLiV33E7KhpVJE1YZCsW4YPeTGuOE2Et1A T6RvnFVWdwAbIUJmFg+Qe0fG89DT8o8x7J68Ia7+U5J8XkcxZiEqLoLKXi9MfduuJXYa UmI/uqAkkfjVEXJNMgqf7n62ZT08/Dr5Qzv/w= 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=ko7eg3hujpwJ49eiVD6gsYK/Hm0EQ8zI48m9brU1X18=; b=pW6L1jRsIkREo/ATrEHf6V+cnc7yVIRL/39aVAedgv45LGc7RPRmc5F4yYAvhQxPUe idtdEv6/BLboQWMN6PhKDLTwRGmWtOgQbebzjk1Pw4Dk/XEK6YXCsf/peizOFV5+YVWA 1CW4mNcgzZEbaTNg259nsezqEnNyxSE0fUkTAcW+lewihW9GEeHDv6q4k9C/0WbqWVgE btG1Gqz/tGSQO1GBLMDFkNyboyP4swaWwjlNSVdCFSs1/rynqhW0RdiGeakrpuI8zq7w mOtWqWe9OOzYNRwu7wKYSmADJ5OjOSQPAliySi4HXm+e5aU++spC7fPISxBzBTeCTmfc t/sA== X-Gm-Message-State: AO0yUKUHDuNPe2S/gi02uONvq8Hf/FHw/aQnUSJ1R9W9FG1tPoiInfDg TF9S3lysSOR4K69HrhGpYsX3dq2RynzNDWv3 X-Google-Smtp-Source: AK7set9bHO25cR7njYl6OFtTzcd3b+3qxaW7ov0gwn2NfSn3ftTIJKbNf4graE4xEsiOaEKFq307vw== X-Received: by 2002:a5d:9e47:0:b0:73c:137c:8ccc with SMTP id i7-20020a5d9e47000000b0073c137c8cccmr5975930ioi.0.1676243887043; Sun, 12 Feb 2023 15:18:07 -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 n16-20020a6b8b10000000b006dfbd35e995sm3627849iod.21.2023.02.12.15.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 15:18:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Dinh Nguyen , Marek Vasut , Simon Goldschmidt , Tien Fong Chee Subject: [PATCH v3 68/95] socfpga: Use the correct condition for SYS_L2_PL310 Date: Sun, 12 Feb 2023 16:16:11 -0700 Message-Id: <20230212231638.1134219-69-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog In-Reply-To: <20230212231638.1134219-1-sjg@chromium.org> References: <20230212231638.1134219-1-sjg@chromium.org> MIME-Version: 1.0 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 Update this to use the PPL condition instead, so that nothing changes when building for SPL with split config. Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-socfpga/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 5b5a81a255d..b09b898051b 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -32,7 +32,7 @@ phys_addr_t socfpga_clkmgr_base __section(".data"); phys_addr_t socfpga_rstmgr_base __section(".data"); phys_addr_t socfpga_sysmgr_base __section(".data"); -#ifdef CONFIG_SYS_L2_PL310 +#ifdef CONFIG_PPL_SYS_L2_PL310 static const struct pl310_regs *const pl310 = (struct pl310_regs *)CFG_SYS_PL310_BASE; #endif @@ -66,7 +66,7 @@ void enable_caches(void) #endif } -#ifdef CONFIG_SYS_L2_PL310 +#ifdef CONFIG_PPL_SYS_L2_PL310 void v7_outer_cache_enable(void) { struct udevice *dev;