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 30135C433F5 for ; Thu, 26 May 2022 13:42:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3BB4E84311; Thu, 26 May 2022 15:42:33 +0200 (CEST) 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 51FD08433E; Thu, 26 May 2022 15:42:23 +0200 (CEST) Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (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 5293584329 for ; Thu, 26 May 2022 15:42:18 +0200 (CEST) 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-qt1-f171.google.com with SMTP id bl14so449033qtb.1 for ; Thu, 26 May 2022 06:42:18 -0700 (PDT) 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=kWC9cZystJ3ZZVeDZtNtzKXCOSVhx5TG4K2oM8HyO0c=; b=b/wtzyVoz1jdAbbfqD+A8m0qNODbu8MkC7XeOVIZAPm2odzHjWmJe9ZelUWZQgZqh0 GQ5gxRDmwBA/z9gpgPXwMpcYFK6unlCtaD8mAjCpuZm1G2w7teRcJfMPjS25myiZ4sEF wkweu+LmfhofVDg5uUK2f+/X2KtI0xAhTuQripbmZYGtEI+KkwGU2tiBUzKhpvVXUKVt IE7mz9Xprn8TN+vPQFnOJTC5zQBgx0QLGF7zQNWy/Tbk/N/4JP/U5S559c8EpXI8JnsY JNeLOB4KlUqSxA3tyQUfCIgpccbT3gJ4aoF1vU5yjsg19gc8vxQhVW2LlHhhwqmm8tGe CS6Q== X-Gm-Message-State: AOAM532hwIhkqSMrLF6DCyCN09BPQkp49RVGhqyd5r8Ip2hrl6usFoUh YjQ3dnYhmjh6bFidtUey1Xfey/jDYg== X-Google-Smtp-Source: ABdhPJzio8Je5oGlSclFSAHBOBKBxM2+VJI1KKOptCpZUbX1r4+NyAgQ2Q7FL5He8+GGPI6gHvmQGA== X-Received: by 2002:a05:622a:18a9:b0:2f9:3fbd:60cb with SMTP id v41-20020a05622a18a900b002f93fbd60cbmr12176806qtc.544.1653572536761; Thu, 26 May 2022 06:42:16 -0700 (PDT) Received: from localhost.localdomain (2603-6081-7b00-25fd-0000-0000-0000-1003.res6.spectrum.com. [2603:6081:7b00:25fd::1003]) by smtp.gmail.com with ESMTPSA id j22-20020a05620a0a5600b006a10aa7908dsm1124264qka.38.2022.05.26.06.42.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 06:42:16 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 05/11] arm: Stop using CONFIG_SYS_GBL_DATA_OFFSET Date: Thu, 26 May 2022 09:42:01 -0400 Message-Id: <20220526134207.3147526-5-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220526134207.3147526-1-trini@konsulko.com> References: <20220526134207.3147526-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 value is only referenced by PowerPC code in a way other than directly as CONFIG_SYS_INIT_SP_ADDR. Switch to CONFIG_SYS_INIT_SP_ADDR directly. Signed-off-by: Tom Rini --- include/configs/integrator-common.h | 3 +-- include/configs/vexpress_common.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index d578b0246051..927daa71ad18 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -32,10 +32,9 @@ #define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \ +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET /* * FLASH and environment organization diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index f27280af99ef..86cb56e7a189 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -139,10 +139,9 @@ /* additions for new relocation code */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_RAM_SIZE 0x1000 -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \ +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET /* Basic environment settings */ #define BOOT_TARGET_DEVICES(func) \ -- 2.25.1