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 C5AB4C433FE for ; Sun, 20 Nov 2022 13:34:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 65BB685119; Sun, 20 Nov 2022 14:34:06 +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="Nz2MoGnG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9F3FB851BB; Sun, 20 Nov 2022 14:34:01 +0100 (CET) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (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 C2F9084F7C for ; Sun, 20 Nov 2022 14:33:57 +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-qk1-x731.google.com with SMTP id p18so6506688qkg.2 for ; Sun, 20 Nov 2022 05:33:57 -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=bVuo/rbdSq+jcj9c6IUF8OUpix0Wv67yAeBeTYcDZWw=; b=Nz2MoGnG3C4XtDDFPZ3tXnHK1BisBC7IRDgIgEpWqXiylLEz1x0BwVBafo6ZqLjitX 5qHafMgarnqc2R4OCD/PlrnbTuWcoSM0TfS+m8b3qb15zyU4DhKngfpIL65QTTkF0th0 lLBOGXo+RQU8pA6TKJ1/r/f9D83j5fLpp4wKE= 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=bVuo/rbdSq+jcj9c6IUF8OUpix0Wv67yAeBeTYcDZWw=; b=Sv28hux5Hic7qb2cvXH1Z3NeNFMqcHxP8oCUcqPFgl7O/KaVKhRXYON6IlMaOctQDR NmxCvRS3++e4ElIQzyDenPFU5J7BglSpfH7RVzVBmTeqrJtOB77WgeLN1CgPt0x+36yh b9HEfvqncNF22D/bI6JsMWWDvL4BwUpKtcOv9/IBk/4Q8fp1glfC1HMwFvGdl/c3EceG fCXjbEJrI0LuT4zILTlXJk9qpnsJhVi7SPJL08pxvk2MrD6TnSffnVfZqnE7t6GIuIHG Hg1Fng4kMufyiQlmXzPuwFUd0uUeF306xnyMT+cuWDvUy0I9wuV9Ic6sd/GEd3WApmvP hb0Q== X-Gm-Message-State: ANoB5pn5lqC1V+77rlDtk3/8h9V0m7rwPeUfo0vh2FbP6AURGy2ZFSHm 2zyNtTcl6B8UPdVx8+plBJBeUgFxCmK8Tg== X-Google-Smtp-Source: AA0mqf5cZbb7ZPhMNQzqlCcNMoI+GnnbWfjxktTe5xiBcHtbUuWWctwigXDvAo8yZ3xoWQNXuecShw== X-Received: by 2002:a05:620a:c95:b0:6fa:91f9:c84d with SMTP id q21-20020a05620a0c9500b006fa91f9c84dmr12647293qki.724.1668951236424; Sun, 20 Nov 2022 05:33:56 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.33.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:33:56 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 001/241] global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG Date: Sun, 20 Nov 2022 08:29:52 -0500 Message-Id: <20221120133352.3055600-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-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 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 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 6 insertions(+), 6 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 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 39e1071236bd..0d2cbddeed40 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1,4 +1,4 @@ -CONFIG_ARM_GIC_BASE_ADDRESS +CFG_ARM_GIC_BASE_ADDRESS CONFIG_BOARDDIR CONFIG_DFU_ALT CONFIG_DFU_ALT_BOOT_EMMC -- 2.25.1