diff mbox

[U-Boot,v2,06/12] SPL: Port SPL framework to powerpc

Message ID 1346064667-29692-7-git-send-email-sr@denx.de
State Superseded
Headers show

Commit Message

Stefan Roese Aug. 27, 2012, 10:51 a.m. UTC 
This patch enables the SPL framework to be used on powerpc platforms
and not only ARM.

Signed-off-by: Stefan Roese <sr@denx.de>
---
Changes in v2:
- Add option to skip copying of the mkimage header
- Rebased on Tom's SPL framework patches v4

 arch/powerpc/lib/Makefile |  1 +
 arch/powerpc/lib/spl.c    | 42 ++++++++++++++++++++++++++++++++++++++++++
 common/spl/spl.c          | 16 ++++++++++++++--
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 arch/powerpc/lib/spl.c

Comments

Tom Rini Aug. 27, 2012, 4:27 p.m. UTC | #1 
On Mon, Aug 27, 2012 at 12:51:01PM +0200, Stefan Roese wrote:

> This patch enables the SPL framework to be used on powerpc platforms
> and not only ARM.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
[snip]
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index 61936ee..3eb269e 100644
> --- a/common/spl/spl.c
> +++ b/common/spl/spl.c
[snip]
> @@ -36,6 +35,9 @@
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  
> +#ifndef CONFIG_SYS_UBOOT_START
> +#define CONFIG_SYS_UBOOT_START	CONFIG_SYS_TEXT_BASE
> +#endif
>  #ifndef CONFIG_SYS_MONITOR_LEN
>  #define CONFIG_SYS_MONITOR_LEN	(200 * 1024)
>  #endif
[snip]
> @@ -104,7 +116,7 @@ void spl_parse_image_header(const struct image_header *header)
>  			header->ih_magic);
>  		/* Let's assume U-Boot will not be more than 200 KB */
>  		spl_image.size = CONFIG_SYS_MONITOR_LEN;
> -		spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
> +		spl_image.entry_point = CONFIG_SYS_UBOOT_START;
>  		spl_image.load_addr = CONFIG_SYS_TEXT_BASE;
>  		spl_image.os = IH_OS_U_BOOT;
>  		spl_image.name = "U-Boot";

Can you post this as it's own patch?  I'll pick that up for v5.
Stefan Roese Aug. 28, 2012, 8:21 a.m. UTC | #2 
On 08/27/2012 06:27 PM, Tom Rini wrote:
> On Mon, Aug 27, 2012 at 12:51:01PM +0200, Stefan Roese wrote:
> 
>> This patch enables the SPL framework to be used on powerpc platforms
>> and not only ARM.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
> [snip]
>> diff --git a/common/spl/spl.c b/common/spl/spl.c
>> index 61936ee..3eb269e 100644
>> --- a/common/spl/spl.c
>> +++ b/common/spl/spl.c
> [snip]
>> @@ -36,6 +35,9 @@
>>  
>>  DECLARE_GLOBAL_DATA_PTR;
>>  
>> +#ifndef CONFIG_SYS_UBOOT_START
>> +#define CONFIG_SYS_UBOOT_START	CONFIG_SYS_TEXT_BASE
>> +#endif
>>  #ifndef CONFIG_SYS_MONITOR_LEN
>>  #define CONFIG_SYS_MONITOR_LEN	(200 * 1024)
>>  #endif
> [snip]
>> @@ -104,7 +116,7 @@ void spl_parse_image_header(const struct image_header *header)
>>  			header->ih_magic);
>>  		/* Let's assume U-Boot will not be more than 200 KB */
>>  		spl_image.size = CONFIG_SYS_MONITOR_LEN;
>> -		spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
>> +		spl_image.entry_point = CONFIG_SYS_UBOOT_START;
>>  		spl_image.load_addr = CONFIG_SYS_TEXT_BASE;
>>  		spl_image.os = IH_OS_U_BOOT;
>>  		spl_image.name = "U-Boot";
> 
> Can you post this as it's own patch?  I'll pick that up for v5.

Okay. Will do.

Thanks,
Stefan
diff mbox

Patch

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index cdd62a2..9c86c96 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -51,6 +51,7 @@  COBJS-y	+= cache.o
 COBJS-y	+= extable.o
 COBJS-y	+= interrupts.o
 COBJS-$(CONFIG_CMD_KGDB) += kgdb.o
+COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
 COBJS-y	+= time.o
 
 # Workaround for local bus unaligned access problems
diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c
new file mode 100644
index 0000000..502c93b
--- /dev/null
+++ b/arch/powerpc/lib/spl.c
@@ -0,0 +1,42 @@ 
+/*
+ * Copyright 2012 Stefan Roese <sr@denx.de>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+#include <common.h>
+#include <config.h>
+#include <spl.h>
+#include <image.h>
+#include <linux/compiler.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * This function jumps to an image with argument. Normally an FDT or ATAGS
+ * image.
+ * arg: Pointer to paramter image in RAM
+ */
+#ifdef CONFIG_SPL_OS_BOOT
+void __noreturn jump_to_image_linux(void *arg)
+{
+	debug("Entering kernel arg pointer: 0x%p\n", arg);
+	typedef void (*image_entry_arg_t)(void *, ulong r4, ulong r5, ulong r6,
+					  ulong r7, ulong r8, ulong r9)
+		__attribute__ ((noreturn));
+	image_entry_arg_t image_entry =
+		(image_entry_arg_t)spl_image.entry_point;
+
+	image_entry(arg, 0, 0, EPAPR_MAGIC, CONFIG_SYS_BOOTMAPSZ, 0, 0);
+}
+#endif /* CONFIG_SPL_OS_BOOT */
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 61936ee..3eb269e 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -25,7 +25,6 @@ 
 #include <common.h>
 #include <spl.h>
 #include <asm/u-boot.h>
-#include <asm/utils.h>
 #include <nand.h>
 #include <fat.h>
 #include <version.h>
@@ -36,6 +35,9 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifndef CONFIG_SYS_UBOOT_START
+#define CONFIG_SYS_UBOOT_START	CONFIG_SYS_TEXT_BASE
+#endif
 #ifndef CONFIG_SYS_MONITOR_LEN
 #define CONFIG_SYS_MONITOR_LEN	(200 * 1024)
 #endif
@@ -71,6 +73,16 @@  __weak int spl_start_uboot(void)
 }
 #endif
 
+/*
+ * Weak default function for board specific cleanup/preparation before
+ * Linux boot. Some boards/platforms might now need it, so just provide
+ * an empty stub here.
+ */
+__weak void spl_board_prepare_for_linux(void)
+{
+	/* Nothing to do! */
+}
+
 void spl_parse_image_header(const struct image_header *header)
 {
 	u32 header_size = sizeof(struct image_header);
@@ -104,7 +116,7 @@  void spl_parse_image_header(const struct image_header *header)
 			header->ih_magic);
 		/* Let's assume U-Boot will not be more than 200 KB */
 		spl_image.size = CONFIG_SYS_MONITOR_LEN;
-		spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
+		spl_image.entry_point = CONFIG_SYS_UBOOT_START;
 		spl_image.load_addr = CONFIG_SYS_TEXT_BASE;
 		spl_image.os = IH_OS_U_BOOT;
 		spl_image.name = "U-Boot";