diff mbox

[U-Boot,v2,01/27] spl: Move spl_board_load_image() into a generic header

Message ID 1474762817-23091-2-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Simon Glass Sept. 25, 2016, 12:19 a.m. UTC 
At present this is only used on ARM and sandbox, but it is just as
applicable to other architectures. Move the function prototype into the
generic SPL header.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 arch/arm/include/asm/spl.h     | 9 ---------
 arch/sandbox/include/asm/spl.h | 8 --------
 include/spl.h                  | 8 ++++++++
 3 files changed, 8 insertions(+), 17 deletions(-)

Comments

Tom Rini Oct. 7, 2016, 12:32 a.m. UTC | #1 
On Sat, Sep 24, 2016 at 06:19:51PM -0600, Simon Glass wrote:

> At present this is only used on ARM and sandbox, but it is just as
> applicable to other architectures. Move the function prototype into the
> generic SPL header.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index 6f312d6..a0bda28 100644
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -33,15 +33,6 @@  enum {
 };
 #endif
 
-/**
- * Board specific load method for boards that have a special way of loading
- * U-Boot, which does not fit with the existing SPL code.
- *
- * @return 0 on success, negative errno value on failure.
- */
-
-int spl_board_load_image(void);
-
 /* Linker symbols. */
 extern char __bss_start[], __bss_end[];
 
diff --git a/arch/sandbox/include/asm/spl.h b/arch/sandbox/include/asm/spl.h
index 59f2401..eb3cb56 100644
--- a/arch/sandbox/include/asm/spl.h
+++ b/arch/sandbox/include/asm/spl.h
@@ -8,14 +8,6 @@ 
 
 #define CONFIG_SPL_BOARD_LOAD_IMAGE
 
-/**
- * Board-specific load method for boards that have a special way of loading
- * U-Boot, which does not fit with the existing SPL code.
- *
- * @return 0 on success, negative errno value on failure.
- */
-int spl_board_load_image(void);
-
 enum {
 	BOOT_DEVICE_BOARD,
 };
diff --git a/include/spl.h b/include/spl.h
index 8afa085..6c397ca 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -144,4 +144,12 @@  void spl_board_init(void);
  */
 bool spl_was_boot_source(void);
 
+/**
+ * Board-specific load method for boards that have a special way of loading
+ * U-Boot, which does not fit with the existing SPL code.
+ *
+ * @return 0 on success, negative errno value on failure.
+ */
+int spl_board_load_image(void);
+
 #endif