Patchwork [U-Boot,RFC,v2,08/12] sf: Add spi_boot() to allow booting from SPI flash in an SPL

login
register
mail settings
Submitter Christian Riesch
Date Nov. 21, 2011, 4:33 p.m.
Message ID <1321893227-19545-10-git-send-email-christian.riesch@omicron.at>
Download mbox | patch
Permalink /patch/126833/
State Superseded
Headers show

Comments

Christian Riesch - Nov. 21, 2011, 4:33 p.m.
Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Heiko Schocher <hs@denx.de>
---
 doc/README.SPL                 |    1 +
 drivers/mtd/spi/Makefile       |    6 ++++
 drivers/mtd/spi/spi_spl_load.c |   60 ++++++++++++++++++++++++++++++++++++++++
 include/spi_flash.h            |    2 +
 lib/Makefile                   |    2 +
 5 files changed, 71 insertions(+), 0 deletions(-)
 create mode 100644 drivers/mtd/spi/spi_spl_load.c
Mike Frysinger - Nov. 21, 2011, 7:07 p.m.
On Monday 21 November 2011 11:33:43 Christian Riesch wrote:
> --- a/drivers/mtd/spi/Makefile
> +++ b/drivers/mtd/spi/Makefile
> 
> +ifdef CONFIG_SPL_BUILD
> +ifdef CONFIG_SPL_SPI_LOAD
> +COBJS-y += spi_spl_load.o
> +endif
> +endif

if it's SPL only, then it should probably be in the spl/ tree somewhere ?

> --- /dev/null
> +++ b/drivers/mtd/spi/spi_spl_load.c
>
> +	puts("Probing SPI flash...\n");

useless noise ?

> +	flash = spi_flash_probe(0, 0, CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3);

hardcoding bus/cs 0:0 doesn't make much sense.  push them it into the 
arguments to the func, or add dedicated SPL defines for them which default to 
0:0.

> --- a/include/spi_flash.h
> +++ b/include/spi_flash.h
>
> +__attribute__((noreturn)) void spi_boot(void);

void spi_boot(void) __noreturn;

> --- a/lib/Makefile
> +++ b/lib/Makefile
>
>  COBJS-$(CONFIG_SHA256) += sha256.o
>  COBJS-y	+= strmhz.o
>  COBJS-$(CONFIG_RBTREE)	+= rbtree.o
> +else
> +COBJS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += display_options.o
>  endif

unrelated change ?
-mike
Scott Wood - Nov. 21, 2011, 7:13 p.m.
On 11/21/2011 01:07 PM, Mike Frysinger wrote:
> On Monday 21 November 2011 11:33:43 Christian Riesch wrote:
>> --- a/drivers/mtd/spi/Makefile
>> +++ b/drivers/mtd/spi/Makefile
>>
>> +ifdef CONFIG_SPL_BUILD
>> +ifdef CONFIG_SPL_SPI_LOAD
>> +COBJS-y += spi_spl_load.o
>> +endif
>> +endif
> 
> if it's SPL only, then it should probably be in the spl/ tree somewhere ?

That's not how the NAND stuff got done -- we should be consistent here.
 I think it's nice to keep all drivers, SPL or not, for a given type of
hardware in one place.

-Scott
Christian Riesch - Nov. 22, 2011, 7:35 a.m.
Hello Mike,
Thank you for your comments.

On Mon, Nov 21, 2011 at 8:07 PM, Mike Frysinger <vapier@gentoo.org> wrote:
> On Monday 21 November 2011 11:33:43 Christian Riesch wrote:
>> --- a/drivers/mtd/spi/Makefile
>> +++ b/drivers/mtd/spi/Makefile
>>
>> +ifdef CONFIG_SPL_BUILD
>> +ifdef CONFIG_SPL_SPI_LOAD
>> +COBJS-y += spi_spl_load.o
>> +endif
>> +endif
>
> if it's SPL only, then it should probably be in the spl/ tree somewhere ?

As Scott already posted, something similar was introduced for nand in
commit 435199f38020c294659a44607ca0e1b6f0ed1542 and it is in
drivers/mtd/nand.

>> --- /dev/null
>> +++ b/drivers/mtd/spi/spi_spl_load.c
>>
>> +     puts("Probing SPI flash...\n");
>
> useless noise ?

Yes :-) Will be removed.

>
>> +     flash = spi_flash_probe(0, 0, CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3);
>
> hardcoding bus/cs 0:0 doesn't make much sense.  push them it into the
> arguments to the func, or add dedicated SPL defines for them which default to
> 0:0.

Ok, I'll change that.

>> --- a/include/spi_flash.h
>> +++ b/include/spi_flash.h
>>
>> +__attribute__((noreturn)) void spi_boot(void);
>
> void spi_boot(void) __noreturn;
>
>> --- a/lib/Makefile
>> +++ b/lib/Makefile
>>
>>  COBJS-$(CONFIG_SHA256) += sha256.o
>>  COBJS-y      += strmhz.o
>>  COBJS-$(CONFIG_RBTREE)       += rbtree.o
>> +else
>> +COBJS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += display_options.o
>>  endif
>
> unrelated change ?

Not completely unrelated. It's a dependency to make
CONFIG_SPL_SPI_FLASH_SUPPORT compile. But it should probably be moved
to a separate patch.

Regards, Christian

Patch

diff --git a/doc/README.SPL b/doc/README.SPL
index 89d24a7..f01a8bd 100644
--- a/doc/README.SPL
+++ b/doc/README.SPL
@@ -65,3 +65,4 @@  CONFIG_SPL_NAND_SUPPORT (drivers/mtd/nand/libnand.o)
 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)
diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
index 57112af..071e2b6 100644
--- a/drivers/mtd/spi/Makefile
+++ b/drivers/mtd/spi/Makefile
@@ -25,6 +25,12 @@  include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libspi_flash.o
 
+ifdef CONFIG_SPL_BUILD
+ifdef CONFIG_SPL_SPI_LOAD
+COBJS-y += spi_spl_load.o
+endif
+endif
+
 COBJS-$(CONFIG_SPI_FLASH)	+= spi_flash.o
 COBJS-$(CONFIG_SPI_FLASH_ATMEL)	+= atmel.o
 COBJS-$(CONFIG_SPI_FLASH_EON)	+= eon.o
diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c
new file mode 100644
index 0000000..d434457
--- /dev/null
+++ b/drivers/mtd/spi/spi_spl_load.c
@@ -0,0 +1,60 @@ 
+/*
+ * Copyright (C) 2011 OMICRON electronics GmbH
+ *
+ * based on drivers/mtd/nand/nand_spl_load.c
+ *
+ * Copyright (C) 2011
+ * Heiko Schocher, DENX Software Engineering, hs@denx.de.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <spi_flash.h>
+
+/*
+ * The main entry for SPI booting. It's necessary that SDRAM is already
+ * configured and available since this code loads the main U-Boot image
+ * from SPI into SDRAM and starts it from there.
+ */
+void spi_boot(void)
+{
+	struct spi_flash *flash;
+	__attribute__((noreturn)) void (*uboot)(void);
+
+	/*
+	 * Load U-Boot image from SPI flash into RAM
+	 */
+
+	puts("Probing SPI flash...\n");
+	flash = spi_flash_probe(0, 0, CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3);
+	if (!flash) {
+		puts("failed.\n");
+		hang();
+	}
+
+	puts("Load image from SPI flash\n");
+	spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,
+		       CONFIG_SYS_SPI_U_BOOT_SIZE,
+		       (void *) CONFIG_SYS_TEXT_BASE);
+	puts("Loading finished, starting u-boot...\n");
+
+	/*
+	 * Jump to U-Boot image
+	 */
+	uboot = (void *) CONFIG_SYS_TEXT_BASE;
+	(*uboot)();
+}
diff --git a/include/spi_flash.h b/include/spi_flash.h
index 2671ab5..e22e294 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -68,4 +68,6 @@  static inline int spi_flash_erase(struct spi_flash *flash, u32 offset,
 	return flash->erase(flash, offset, len);
 }
 
+__attribute__((noreturn)) void spi_boot(void);
+
 #endif /* _SPI_FLASH_H_ */
diff --git a/lib/Makefile b/lib/Makefile
index 54708c2..35ba7ff 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -50,6 +50,8 @@  COBJS-$(CONFIG_SHA1) += sha1.o
 COBJS-$(CONFIG_SHA256) += sha256.o
 COBJS-y	+= strmhz.o
 COBJS-$(CONFIG_RBTREE)	+= rbtree.o
+else
+COBJS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += display_options.o
 endif
 
 COBJS-y += ctype.o