From: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] armv7: Move save_boot_params_default() to start.S
Date: Fri, 10 Aug 2012 23:59:09 +0200 (CEST) [thread overview]
Message-ID: <1530446365.2284382.1344635949755.JavaMail.root@advansee.com> (raw)
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 <benoit.thebaudeau@advansee.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
---
.../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 <asm/cache.h>
#include <asm/armv7.h>
-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
*/
next reply other threads:[~2012-08-10 21:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 21:59 Benoît Thébaudeau [this message]
2012-08-10 22:44 ` [U-Boot] [PATCH] armv7: Move save_boot_params_default() to start.S Tom Rini
2012-08-10 23:12 ` Benoît Thébaudeau
2012-08-11 0:42 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1530446365.2284382.1344635949755.JavaMail.root@advansee.com \
--to=benoit.thebaudeau@advansee.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox