[U-Boot] [PATCHv1] ARM: Add Altera SOCFPGA Cyclone5

Pavel Machek
2012-08-30T18:05:32Z

Hi!

> >>> diff --git a/common/spl/spl.c b/common/spl/spl.c
> >>> index eaea1c8..5adbf0e 100644
> >>> --- a/common/spl/spl.c
> >>> +++ b/common/spl/spl.c
> >>> @@ -78,6 +78,7 @@ void spl_parse_image_header(const struct image_header *header)
> >>> u32 header_size = sizeof(struct image_header);
> >>>
> >>> if (__be32_to_cpu(header->ih_magic) == IH_MAGIC) {
> >>> + /* Valid image. Extract information out of header */
> >>> spl_image.size = __be32_to_cpu(header->ih_size) + header_size;
> >>> spl_image.entry_point = __be32_to_cpu(header->ih_load);
> >>> /* Load including the header */
> >>
> >> Just an extra comment, drop please. Or split out if you feel it's
> >> really helpful. No strong opinion here other than not in the same patch
> >> as the rest.
> >
> > Ok, I'll drop it, and the omap cleanup also. Not worth the merge
> > effort.
> >
> > spl_ram_load_image... will I need to create some kind of #ifdef? Or
> > would #ifdef BOOT_DEVICE_RAM do the trick?
>
> Good point, yes, we should add CONFIG_SPL_RAM_DEVICE and document it in
> docs/README.SPL and the toplevel README.

Ok, something like this? Posting separately, maybe it makes sense to
merge to your PATCH v6...?

[And mental note that HEAP_SIZE needs to be cleaned up in socfpga].

Thanks,
Pavel
commit 644da18450edd725263f3bf4a721654707a700af
Author: Pavel <pavel@ucw.cz>
Date: Thu Aug 30 20:03:42 2012 +0200

Introduce CONFIG_SPL_RAM_DEVICE, as suggested by Tom.

Signed-off-by: Pavel Machek <pavel@denx.de>

diff --git a/README b/README
index ddbeb1b..e782cce 100644
--- a/README
+++ b/README
@@ -2636,6 +2636,9 @@ FIT uImage format:
CONFIG_SPL_SPI_SUPPORT
Support for drivers/spi/libspi.o in SPL binary

+ CONFIG_SPL_RAM_DEVICE
+ Support for running image already present in ram, in SPL binary
+
CONFIG_SPL_LIBGENERIC_SUPPORT
Support for lib/libgeneric.o in SPL binary

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 229fd01..fb96a75 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -115,6 +115,7 @@ static void __noreturn jump_to_image_no_args(void)
image_entry((u32 *)boot_params_ptr_addr);
}

+#ifdef CONFIG_SPL_RAM_DEVICE
static void spl_ram_load_image(void)
{
const struct image_header *header;
@@ -128,6 +129,7 @@ static void spl_ram_load_image(void)

spl_parse_image_header(header);
}
+#endif

void board_init_r(gd_t *dummy1, ulong dummy2)
{
@@ -146,9 +148,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
boot_device = spl_boot_device();
debug("boot device - %d\n", boot_device);
switch (boot_device) {
+#ifdef CONFIG_SPL_RAM_DEVICE
case BOOT_DEVICE_RAM:
spl_ram_load_image();
break;
+#endif
#ifdef CONFIG_SPL_MMC_SUPPORT
case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2:
diff --git a/doc/README.SPL b/doc/README.SPL
index e4a5ac3..2acafba 100644
--- a/doc/README.SPL
+++ b/doc/README.SPL
@@ -66,6 +66,7 @@ CONFIG_SPL_DMA_SUPPORT (drivers/dma/libdma.o)
CONFIG_SPL_POST_MEM_SUPPORT (post/drivers/memory.o)
CONFIG_SPL_NAND_LOAD (drivers/mtd/nand/nand_spl_load.o)
CONFIG_SPL_SPI_LOAD (drivers/mtd/spi/spi_spl_load.o)
+CONFIG_SPL_RAM_DEVICE (common/spl/spl.c)

Normally CPU is assumed to be the same between the SPL and normal

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html