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 BB3DAC4321E for ; Sun, 4 Dec 2022 15:08:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BBB45853F8; Sun, 4 Dec 2022 16:06:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="BU95ncY8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DF94985319; Sun, 4 Dec 2022 16:06:11 +0100 (CET) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 82783852F1 for ; Sun, 4 Dec 2022 16:06:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-ej1-x62e.google.com with SMTP id bj12so22252465ejb.13 for ; Sun, 04 Dec 2022 07:06:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Kf3B3uUreSVkIi2WL/nmjGZ8Te4AsWhrC5FiUhXpddk=; b=BU95ncY8U9CioId1fDFxzB8FxqkrssTix8YnSNjlSiBtyXADCeLgQDe015TUzvSgw0 jhqFzr4nNsseUVpnioT1j2HpQ+AYHNNqTlV1Gm9iazz7emYgd0JueCry6jORUXhnSNZx GBpEj8n5DhcSKEvGsX018GONKBbJfii7f6VEk= 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kf3B3uUreSVkIi2WL/nmjGZ8Te4AsWhrC5FiUhXpddk=; b=lH3pcym0lQYROzxPt1xgq7hDEoI+yJp4uI2Y1fOviiDaOoeM78hAxbXPyWK2q4HEFD KejlVrDLtSEWhkNClvJUrhIf4jdFxVmhuggAHvhcF5PtCqQp1s7aHqP7OXKuT5Duvggh CowIVmvLGsBv0pTKhiFUIOcaC88sSmLgKB1sn5Ivj5UiasHZwjcP9xFMAuml06k+8Oyi nNiwpb6jZj6lrJVmfLDc2X+JF26A8SzpOpMxP2ow5iWWB2MWr064fcDKCJtKtY9JQVky m53aGS4VoKEa5a8ohj7GKfP1q0M3CXL+gKyH6StLM4bALiDAe7FBAYxZSzK/9ZruhlUK +s9Q== X-Gm-Message-State: ANoB5pnNjYBMzp1J5T0QenXIbbGZ8gczrrBMWryUWkk1taEpDjjtdgbD Cgmfor691w1hFkWa73pfgGz1ZYpE4JICA6pH X-Google-Smtp-Source: AA0mqf59biCVa8NeYHgcT3dIQCL6yF8udadcM/QDyap5q0hcQsBZaHXl4QrxF3sFSk06seLA3rzOmw== X-Received: by 2002:a17:906:5052:b0:7a9:6107:572a with SMTP id e18-20020a170906505200b007a96107572amr67170782ejk.729.1670166368806; Sun, 04 Dec 2022 07:06:08 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0073dc5bb7c32sm5240058eja.64.2022.12.04.07.06.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:08 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 011/149] global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG Date: Sun, 4 Dec 2022 10:03:36 -0500 Message-Id: <20221204150554.4165941-11-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204150554.4165941-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.6 at phobos.denx.de X-Virus-Status: Clean Perform a simple rename of CONFIG_ARM_GIC_BASE_ADDRESS to CFG_ARM_GIC_BASE_ADDRESS Signed-off-by: Tom Rini --- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- arch/arm/cpu/armv7/virt-v7.c | 4 ++-- include/configs/arndale.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 39aeeb423f08..b6d144f065d2 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry) ENDPROC(_do_nonsec_entry) .macro get_cbar_addr addr -#ifdef CONFIG_ARM_GIC_BASE_ADDRESS - ldr \addr, =CONFIG_ARM_GIC_BASE_ADDRESS +#ifdef CFG_ARM_GIC_BASE_ADDRESS + ldr \addr, =CFG_ARM_GIC_BASE_ADDRESS #else mrc p15, 4, \addr, c15, c0, 0 @ read CBAR bfc \addr, #0, #15 @ clear reserved bits diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index 5ffeca13d913..c82b215b6f9c 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void) static unsigned long get_gicd_base_address(void) { -#ifdef CONFIG_ARM_GIC_BASE_ADDRESS - return CONFIG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET; +#ifdef CFG_ARM_GIC_BASE_ADDRESS + return CFG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET; #else unsigned periphbase; diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 7a244769e30a..8acc525b11c9 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -19,6 +19,6 @@ #define CONFIG_SMP_PEN_ADDR 0x02020000 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ -#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000 +#define CFG_ARM_GIC_BASE_ADDRESS 0x10480000 #endif /* __CONFIG_H */ -- 2.25.1