From patchwork Fri Aug 10 21:59:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 176630 X-Patchwork-Delegate: trini@ti.com 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 42F272C008A for ; Sat, 11 Aug 2012 07:54:02 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C74F6280D0; Fri, 10 Aug 2012 23:54:00 +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 touiLrTkLkpO; Fri, 10 Aug 2012 23:54:00 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 58C2F280D1; Fri, 10 Aug 2012 23:53:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 308FC280D0 for ; Fri, 10 Aug 2012 23:53:56 +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 jBkYkltRz3j0 for ; Fri, 10 Aug 2012 23:53:55 +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 zose-mta11.web4all.fr (zose-mta11.web4all.fr [178.33.204.87]) by theia.denx.de (Postfix) with ESMTP id 0A64C280CF for ; Fri, 10 Aug 2012 23:53:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zose-mta11.web4all.fr (Postfix) with ESMTP id 3E68D4601D; Fri, 10 Aug 2012 23:58:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at zose1.web4all.fr Received: from zose-mta11.web4all.fr ([127.0.0.1]) by localhost (zose-mta11.web4all.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l2fHI73ecybj; Fri, 10 Aug 2012 23:58:39 +0200 (CEST) Received: from zose-store12.web4all.fr (zose-store12.web4all.fr [178.33.204.49]) by zose-mta11.web4all.fr (Postfix) with ESMTP id EB28F4601A; Fri, 10 Aug 2012 23:58:39 +0200 (CEST) Date: Fri, 10 Aug 2012 23:59:09 +0200 (CEST) From: =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?= To: u-boot@lists.denx.de Message-ID: <1530446365.2284382.1344635949755.JavaMail.root@advansee.com> MIME-Version: 1.0 X-Originating-IP: [88.188.188.98] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Win)/7.2.0_GA_2669) Subject: [U-Boot] [PATCH] armv7: Move save_boot_params_default() to start.S 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de save_boot_params() is called by start.S, so move its default implementation to this file too. This is also useful for boards willing to use nand_spl since cpu.c is not built in this case. Signed-off-by: Benoît Thébaudeau Cc: Albert Aribaud --- .../arch/arm/cpu/armv7/cpu.c | 7 ------- .../arch/arm/cpu/armv7/start.S | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git u-boot-4d3c95f.orig/arch/arm/cpu/armv7/cpu.c u-boot-4d3c95f/arch/arm/cpu/armv7/cpu.c index c6fa8ef..b0677f4 100644 --- u-boot-4d3c95f.orig/arch/arm/cpu/armv7/cpu.c +++ u-boot-4d3c95f/arch/arm/cpu/armv7/cpu.c @@ -37,13 +37,6 @@ #include #include -void save_boot_params_default(u32 r0, u32 r1, u32 r2, u32 r3) -{ -} - -void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) - __attribute__((weak, alias("save_boot_params_default"))); - int cleanup_before_linux(void) { /* diff --git u-boot-4d3c95f.orig/arch/arm/cpu/armv7/start.S u-boot-4d3c95f/arch/arm/cpu/armv7/start.S index aee27fd..6df9c91 100644 --- u-boot-4d3c95f.orig/arch/arm/cpu/armv7/start.S +++ u-boot-4d3c95f/arch/arm/cpu/armv7/start.S @@ -119,6 +119,13 @@ FIQ_STACK_START: IRQ_STACK_START_IN: .word 0x0badc0de +.globl save_boot_params_default +save_boot_params_default: + mov pc, lr + +.weak save_boot_params +save_boot_params = save_boot_params_default + /* * the actual reset code */