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 06107C433EF for ; Thu, 10 Mar 2022 01:45:08 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A910F839C9; Thu, 10 Mar 2022 02:44:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id E1869839D7; Thu, 10 Mar 2022 02:44:23 +0100 (CET) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 4C1A0839CA for ; Thu, 10 Mar 2022 02:44:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f176.google.com with SMTP id b67so3322781qkc.6 for ; Wed, 09 Mar 2022 17:44:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gxdjFhzS4IX1dzqG6vO3mqTRb/Mjr7pevcds7Pc0VHA=; b=yd7Y+j8NSFe+5B7DJ9C9S/+pSmOV6wGwqQhqwJFJhJiMaliK1eti8wd8W67FAbIYyp MQYnrWRCqMqbV/CibbSrWxTszWO02XdMwRMpq76SVdIK2yVr2jghW39zQe7M+zkrDzlG N71yHnX8lh9Zzi5dCZVEWajowuXjwywXgMM2ncBr6nBLbPqy2VpfPluDn9EYvChJaj0y f9yVVHKWjCnc+VaF05zrtd7XO2R8p/MCSJwHmLNdf8mJz2xNY4CQUDoX6Pga8ed27ZKv B/HOmKV3SYjmEXfEWiERa0deXrvQzF5sg+OObIteYCcgNuck6/Mg+aZFby+2lcxmWFT0 O11g== X-Gm-Message-State: AOAM531tk2afA6WaZfaOxgoPxgyPLrXQGDPQ4klU51vjxOWDJG3NczvE ujMlCAiZwDjfpUiYtodrI6Z1QEdJSQ== X-Google-Smtp-Source: ABdhPJzX/7L6iuRC2Q4K5BtWRwg/OTP9W263qc4bIFQiOpKRsx+EnAr1NBHA5lUXCUPJNjWn0el76A== X-Received: by 2002:a37:a3cb:0:b0:67b:21ed:7f2d with SMTP id m194-20020a37a3cb000000b0067b21ed7f2dmr1669891qke.590.1646876654652; Wed, 09 Mar 2022 17:44:14 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id t7-20020a05622a180700b002e0ccf0aa49sm2486328qtc.62.2022.03.09.17.44.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 17:44:14 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 08/15] powerpc: Move CONFIG_BPTR_VIRT_ADDR out of CONFIG namespace Date: Wed, 9 Mar 2022 20:43:57 -0500 Message-Id: <20220310014404.1251636-8-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220310014404.1251636-1-trini@konsulko.com> References: <20220310014404.1251636-1-trini@konsulko.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 This is only used in one file, and is never overridden. Move this out of CONFIG namespace. Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/mp.c | 6 +++--- arch/powerpc/include/asm/config.h | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c index b1b002c90021..84eb8b466b71 100644 --- a/arch/powerpc/cpu/mpc85xx/mp.c +++ b/arch/powerpc/cpu/mpc85xx/mp.c @@ -456,18 +456,18 @@ void setup_mp(void) flush_cache(bootpg, 4096); /* look for the tlb covering the reset page, there better be one */ - i = find_tlb_idx((void *)CONFIG_BPTR_VIRT_ADDR, 1); + i = find_tlb_idx((void *)BPTR_VIRT_ADDR, 1); /* we found a match */ if (i != -1) { /* map reset page to bootpg so we can copy code there */ disable_tlb(i); - set_tlb(1, CONFIG_BPTR_VIRT_ADDR, bootpg, /* tlb, epn, rpn */ + set_tlb(1, BPTR_VIRT_ADDR, bootpg, /* tlb, epn, rpn */ MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, /* perms, wimge */ 0, i, BOOKE_PAGESZ_4K, 1); /* ts, esel, tsize, iprot */ - memcpy((void *)CONFIG_BPTR_VIRT_ADDR, (void *)fixup, 4096); + memcpy((void *)BPTR_VIRT_ADDR, (void *)fixup, 4096); plat_mp_up(bootpg_map, pagesize); } else { diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 354137124d89..059ffe1fd4f9 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -31,9 +31,7 @@ * Freescale's default e500 reset page. */ #if (defined(CONFIG_E500) && defined(CONFIG_MP)) -#ifndef CONFIG_BPTR_VIRT_ADDR -#define CONFIG_BPTR_VIRT_ADDR 0xfffff000 -#endif +#define BPTR_VIRT_ADDR 0xfffff000 #endif /* Since so many PPC SOCs have a semi-common LBC, define this here */ -- 2.25.1