From patchwork Fri Apr 26 09:10:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 239770 X-Patchwork-Delegate: wd@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3D2892C0112 for ; Fri, 26 Apr 2013 19:10:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5490C4A3C6; Fri, 26 Apr 2013 11:10:12 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XmEfkl1GHtw7; Fri, 26 Apr 2013 11:10:12 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 888034A3C7; Fri, 26 Apr 2013 11:10:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 695924A3C7 for ; Fri, 26 Apr 2013 11:10:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IHxOWqj1U6Tp for ; Fri, 26 Apr 2013 11:10:05 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mo-p05-ob.rzone.de (mo-p05-ob.rzone.de [81.169.146.181]) by theia.denx.de (Postfix) with ESMTP id 5B39A4A3C6 for ; Fri, 26 Apr 2013 11:10:03 +0200 (CEST) X-RZG-AUTH: :IW0NeWC7b/q2i6W/qstXb1SBUuFnrGohdvpEkce+Ub4+ReKfHD+mCPIMpYA6 X-RZG-CLASS-ID: mo05 Received: from ubuntu-2012.fritz.box (p57B94762.dip0.t-ipconnect.de [87.185.71.98]) by smtp.strato.de (josoe mo43) (RZmta 31.27 DYNA|AUTH) with ESMTPA id Q06cb7p3Q8YDp9 for ; Fri, 26 Apr 2013 11:10:02 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Date: Fri, 26 Apr 2013 11:10:02 +0200 Message-Id: <1366967402-8804-1-git-send-email-sr@denx.de> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1366805986-30415-1-git-send-email-sr@denx.de> References: <1366805986-30415-1-git-send-email-sr@denx.de> Subject: [U-Boot] [PATCH 1/2 v2] mpc5200: a3m071/a4m2k: Fix problem with increased global_data struct X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The v2013.04 release has this patch set included: 5cb48582 "Add architecture-specific global data" With this, the global_data struct is now common and new variables have been added. Resulting in a bigger struct. Unfortunately the currently allocated 128 bytes are just a bit too small for this new struct. This patch now uses the automatically generated struct size instead to not run into this problem again. Please note that this problem might hit some other platforms which currently reserve a tight space of 128 bytes for the global_data struct! Signed-off-by: Stefan Roese --- v2: - Use automatically generated struct size instead instead of a fixed value include/configs/a3m071.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 13f3226..bcf3853 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -121,10 +121,8 @@ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM #define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE - -#define CONFIG_SYS_GBL_DATA_SIZE 128 #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \ - CONFIG_SYS_GBL_DATA_SIZE) + GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE