From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 15/19] spl: Make CONFIG_SPL_FRAMEWORK board_init_f __weak
Date: Wed, 22 Aug 2012 16:19:41 -0700 [thread overview]
Message-ID: <1345677585-15696-16-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1345677585-15696-1-git-send-email-trini@ti.com>
Some platforms may need to do more than simply call relocate_code prior
to board_init_r, or perhaps perform more work prior to calling
relocate_code. Make our default weak to allow for this. Part of this
requires us to add an extern for 'gdata' so that others can also call
relocate_code.
Signed-off-by: Tom Rini <trini@ti.com>
---
common/spl/spl.c | 4 ++--
include/spl.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index b314ed7..d8ade27 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -40,7 +40,7 @@ u32 *boot_params_ptr = NULL;
struct spl_image_info spl_image;
/* Define global data structure pointer to it*/
-static gd_t gdata __attribute__ ((section(".data")));
+gd_t gdata __attribute__ ((section(".data")));
static bd_t bdata __attribute__ ((section(".data")));
inline void hang(void)
@@ -50,7 +50,7 @@ inline void hang(void)
;
}
-void board_init_f(ulong dummy)
+void __weak board_init_f(ulong dummy)
{
/*
* We call relocate_code() with relocation target same as the
diff --git a/include/spl.h b/include/spl.h
index af9ef71..83e9f21 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -41,6 +41,7 @@ struct spl_image_info {
extern struct spl_image_info spl_image;
extern u32 *boot_params_ptr;
+extern gd_t gdata;
/* SPL common functions */
void preloader_console_init(void);
--
1.7.9.5
next prev parent reply other threads:[~2012-08-22 23:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 01/19] Makefile: Move SPL files to clobber, remove from clean Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 02/19] spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORT Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 03/19] omap-common: SPL: Add CONFIG_SPL_DISPLAY_PRINT / spl_display_print() Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 04/19] omap-common: Fix typo in save_boot_params() in lowlevel_init.S Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 05/19] ARM: SPL: Rename omap_boot_device to spl_boot_device Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 06/19] ARM: SPL: Rename omap_boot_mode to spl_boot_mode() Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 07/19] ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.c Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 08/19] ARM: SPL: Only call mem_malloc_init if configured Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 09/19] ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h> Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 10/19] ARM: SPL: Make spl_mmc.c more generic Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 11/19] ARM: SPL: Clean up spl.c / spl_nand.c slightly Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 12/19] ARM: SPL: Start hooking in the current SPI SPL support Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 13/19] ARM: SPL: Move gpmc_init() to spl_board_init() Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 14/19] SPL: Move the omap SPL framework to common/spl Tom Rini
2012-08-22 23:19 ` Tom Rini [this message]
2012-08-22 23:19 ` [U-Boot] [PATCH v3 16/19] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK Tom Rini
2012-08-23 13:14 ` Christian Riesch
2012-08-23 14:07 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 17/19] da850: Add README.da850 Tom Rini
2012-08-23 12:52 ` Christian Riesch
2012-08-23 16:17 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 18/19] SPL: Enhance drivers/mtd/nand/nand_spl_load.c Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 19/19] SPL: Enhance spi_spl_load to match the other load functions Tom Rini
2012-08-23 5:18 ` [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Prabhakar Lad
2012-08-23 11:22 ` Stefan Roese
2012-08-23 12:22 ` Stefano Babic
2012-08-23 12:33 ` Christian Riesch
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=1345677585-15696-16-git-send-email-trini@ti.com \
--to=trini@ti.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