From patchwork Thu May 26 13:42:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1635861 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L88Jv0WsMz9s07 for ; Thu, 26 May 2022 23:43:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 47EAE84342; Thu, 26 May 2022 15:42:42 +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 B3F3684344; Thu, 26 May 2022 15:42:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 25C16842F8 for ; Thu, 26 May 2022 15:42:20 +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-qv1-f44.google.com with SMTP id l1so1652477qvh.1 for ; Thu, 26 May 2022 06:42:20 -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=mRBB0bmVJ1OfO/WF4Hehs5mBrbdkuHv4fFHpZSy4XKU=; b=CzFMTYJrnvjBIy+pwdqgmFos9HhAl1InipsjLTyntcqT0p4BzIZSxazyDItyfzIez6 /03iXqKRqKXLNEuj9Zvu1CahOeNq0SZGc/KN9bZlyqBJQ13euo8mY3DJP5+kMcuwByBB uOcy8UU6SKED+I8dm6uUGKXAY/JQK+MgziAEUNKe3OYKFZMp7m0n3r2lm3St38ucCfec g51Fm1OjB7AJagpbml2Kmf7MwJjoSTZrELhUBydi1pMAWsp55v5rcg5htbnchN3g9cO8 VvQg3luT2EmSGXci75ztNgUruDHRNTSsCoFffo6gCN9huMyCzOn2ZULWIJt26IsfXmW6 8UFg== X-Gm-Message-State: AOAM533wxObX6DDi1nUs+AtqqZD0e9C5cKeyNhnwA85k69BCEpCJ7WGK XAMwzUZxlLhLIkFxEY4G+HeldRGb2w== X-Google-Smtp-Source: ABdhPJz5scSmc7eoNuirduzJfbny9lws4ZXSTQlSlV83dfo+XKg2O7V+AFwmcVgTseVjj3/BCvVjFg== X-Received: by 2002:a05:6214:c4d:b0:45b:47b:c39a with SMTP id r13-20020a0562140c4d00b0045b047bc39amr30023939qvj.20.1653572538752; Thu, 26 May 2022 06:42:18 -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.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 06:42:17 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 07/11] mpc85xx: Switch to setting the initial stack pointer more clearly Date: Thu, 26 May 2022 09:42:03 -0400 Message-Id: <20220526134207.3147526-7-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 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 Currently, since we know that in the combination of CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET all of the "high" bits are in CONFIG_SYS_INIT_RAM_ADDR and "low" bits are in CONFIG_SYS_GBL_DATA_OFFSET we reference this separately in start.S, but added together everywhere else. For clarity consistency, reference the combined value here instead. Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/start.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 7a079edb691e..48f06f51c8fd 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1160,8 +1160,8 @@ _start_cont: bne 1b #if CONFIG_VAL(SYS_MALLOC_F_LEN) - lis r4,(CONFIG_SYS_INIT_RAM_ADDR)@h - ori r4,r4,(CONFIG_SYS_GBL_DATA_OFFSET)@l + lis r4,(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)@h + ori r4,r4,(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)@l addi r3,r3,16 /* Pre-relocation malloc area */ stw r3,GD_MALLOC_BASE(r4)