* [U-Boot] [PATCH v3 01/19] Makefile: Move SPL files to clobber, remove from clean
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 ` 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
` (21 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
The 'clean' target has been removing all of spl but not u-boot itself.
For consistency and ease of testing, only remove SPL binaries / maps in
the clobber target, just like for full U-Boot
Signed-off-by: Tom Rini <trini@ti.com>
---
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 73c8e39..57bb0b9 100644
--- a/Makefile
+++ b/Makefile
@@ -763,12 +763,6 @@ clean:
@rm -f $(obj)lib/asm-offsets.s
@rm -f $(obj)include/generated/asm-offsets.h
@rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
- @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map}
- @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}
- @rm -f $(ONENAND_BIN)
- @rm -f $(obj)onenand_ipl/u-boot.lds
- @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map}
- @rm -f $(obj)MLO
@rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
@find $(OBJTREE) -type f \
\( -name 'core' -o -name '*.bak' -o -name '*~' -o -name '*.su' \
@@ -793,6 +787,12 @@ clobber: tidy
@rm -f $(obj)u-boot.dtb
@rm -f $(obj)u-boot.sb
@rm -f $(obj)u-boot.spr
+ @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map}
+ @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}
+ @rm -f $(ONENAND_BIN)
+ @rm -f $(obj)onenand_ipl/u-boot.lds
+ @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map}
+ @rm -f $(obj)MLO
@rm -f $(obj)tools/xway-swap-bytes
@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
@rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 02/19] spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORT
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 ` 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
` (20 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/spl_mmc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
index 2f921bb..7552f6c 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
@@ -84,6 +84,7 @@ end:
}
}
+#ifdef CONFIG_SPL_FAT_SUPPORT
static void mmc_load_image_fat(struct mmc *mmc)
{
s32 err;
@@ -116,6 +117,7 @@ end:
hang();
}
}
+#endif
void spl_mmc_load_image(void)
{
@@ -140,9 +142,11 @@ void spl_mmc_load_image(void)
if (boot_mode == MMCSD_MODE_RAW) {
debug("boot mode - RAW\n");
mmc_load_image_raw(mmc);
+#ifdef CONFIG_SPL_FAT_SUPPORT
} else if (boot_mode == MMCSD_MODE_FAT) {
debug("boot mode - FAT\n");
mmc_load_image_fat(mmc);
+#endif
} else {
puts("spl: wrong MMC boot mode\n");
hang();
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 03/19] omap-common: SPL: Add CONFIG_SPL_DISPLAY_PRINT / spl_display_print()
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 ` 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
` (19 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Only omap4/5 currently have a meaningful set of display text and overo
had been adding a function to display nothing. Change how this works to
be opt-in and only turned on for omap4/5 now.
Signed-off-by: Tom Rini <trini@ti.com>
---
README | 4 ++++
arch/arm/cpu/armv7/omap-common/hwinit-common.c | 5 +++++
arch/arm/cpu/armv7/omap-common/spl.c | 9 +++------
arch/arm/include/asm/arch-omap4/sys_proto.h | 1 -
arch/arm/include/asm/arch-omap5/sys_proto.h | 1 -
arch/arm/include/asm/omap_common.h | 2 +-
board/overo/overo.c | 10 ----------
include/configs/omap4_common.h | 1 +
include/configs/omap5_evm.h | 1 +
9 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/README b/README
index fb9d904..f1a12a5 100644
--- a/README
+++ b/README
@@ -2564,6 +2564,10 @@ FIT uImage format:
CONFIG_SYS_SPL_MALLOC_SIZE
The size of the malloc pool used in SPL.
+ CONFIG_SPL_DISPLAY_PRINT
+ For ARM, enable an optional function to print more information
+ about the running system.
+
CONFIG_SPL_LIBCOMMON_SUPPORT
Support for common/libcommon.o in SPL binary
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
index 459ebb5..4d7ef5c 100644
--- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
@@ -92,6 +92,11 @@ static void init_boot_params(void)
{
boot_params_ptr = (u32 *) &boot_params;
}
+
+void spl_display_print(void)
+{
+ omap_rev_string();
+}
#endif
/*
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 4d1ac85..b10832a 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -219,10 +219,7 @@ void preloader_console_init(void)
printf("\nU-Boot SPL %s (%s - %s)\n", u_boot_rev, U_BOOT_DATE,
U_BOOT_TIME);
- omap_rev_string();
-}
-
-void __weak omap_rev_string()
-{
- printf("Texas Instruments Revision detection unimplemented\n");
+#ifdef CONFIG_SPL_DISPLAY_PRINT
+ spl_display_print();
+#endif
}
diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h
index d633573..b48f81d 100644
--- a/arch/arm/include/asm/arch-omap4/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap4/sys_proto.h
@@ -42,7 +42,6 @@ void sr32(void *, u32, u32, u32);
u32 wait_on_value(u32, u32, void *, u32);
void sdelay(unsigned long);
void set_pl310_ctrl_reg(u32 val);
-void omap_rev_string(void);
void setup_clocks_for_console(void);
void prcm_init(void);
void bypass_dpll(u32 *const base);
diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h
index 74feb90..72e9df7 100644
--- a/arch/arm/include/asm/arch-omap5/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap5/sys_proto.h
@@ -42,7 +42,6 @@ void set_muxconf_regs_non_essential(void);
void sr32(void *, u32, u32, u32);
u32 wait_on_value(u32, u32, void *, u32);
void sdelay(unsigned long);
-void omap_rev_string(void);
void setup_clocks_for_console(void);
void prcm_init(void);
void bypass_dpll(u32 *const base);
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 4e95eee..19df5ea 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -94,9 +94,9 @@ u32 omap_boot_mode(void);
/* SPL common function s*/
void spl_parse_image_header(const struct image_header *header);
-void omap_rev_string(void);
void spl_board_prepare_for_linux(void);
int spl_start_uboot(void);
+void spl_display_print(void);
/* NAND SPL functions */
void spl_nand_load_image(void);
diff --git a/board/overo/overo.c b/board/overo/overo.c
index f973870..c6d50a0 100644
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -101,16 +101,6 @@ int board_init(void)
}
/*
- * Routine: omap_rev_string
- * Description: For SPL builds output board rev
- */
-#ifdef CONFIG_SPL_BUILD
-void omap_rev_string(void)
-{
-}
-#endif
-
-/*
* Routine: get_board_revision
* Description: Returns the board revision
*/
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 2192c2b..685fde9 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -249,6 +249,7 @@
#define CONFIG_SPL_TEXT_BASE 0x40304350
#define CONFIG_SPL_MAX_SIZE (38 * 1024)
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
+#define CONFIG_SPL_DISPLAY_PRINT
/*
* 64 bytes before this address should be set aside for u-boot.img's
diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h
index c5874bb..ef4034c 100644
--- a/include/configs/omap5_evm.h
+++ b/include/configs/omap5_evm.h
@@ -246,6 +246,7 @@
#define CONFIG_SPL_TEXT_BASE 0x40300350
#define CONFIG_SPL_MAX_SIZE 0x19000 /* 100K */
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
+#define CONFIG_SPL_DISPLAY_PRINT
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 04/19] omap-common: Fix typo in save_boot_params() in lowlevel_init.S
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (2 preceding siblings ...)
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 ` 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
` (18 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
index ccc6bb6..48a296c 100644
--- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
@@ -63,7 +63,7 @@ ENTRY(save_boot_params)
blt 2f
cmp r2, #7
bgt 2f
- /* Store the boot mode (raw/FAT) in omap_boot_mode */
+ /* Store the boot mode (raw/FAT) in omap_bootmode */
ldr r2, [r0, #DEV_DESC_PTR_OFFSET] @ get the device descriptor ptr
ldr r2, [r2, #DEV_DATA_PTR_OFFSET] @ get the pDeviceData ptr
ldr r2, [r2, #BOOT_MODE_OFFSET] @ get the boot mode
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 05/19] ARM: SPL: Rename omap_boot_device to spl_boot_device
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (3 preceding siblings ...)
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 ` 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
` (17 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/boot-common.c | 2 +-
arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 4 ++--
arch/arm/cpu/armv7/omap-common/spl.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl_mmc.c | 2 +-
arch/arm/cpu/armv7/omap3/board.c | 4 ++--
arch/arm/include/asm/omap_common.h | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index f211f76..102a381 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -37,7 +37,7 @@ struct omap_boot_parameters boot_params __attribute__ ((section(".data")));
*/
u32 omap_bootmode = MMCSD_MODE_FAT;
-u32 omap_boot_device(void)
+u32 spl_boot_device(void)
{
return (u32) (boot_params.omap_bootdevice);
}
diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
index 48a296c..dafe18b 100644
--- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
@@ -52,11 +52,11 @@ ENTRY(save_boot_params)
ldr r1, =boot_params
str r0, [r1]
#ifdef CONFIG_SPL_BUILD
- /* Store the boot device in omap_boot_device */
+ /* Store the boot device in spl_boot_device */
ldrb r2, [r0, #BOOT_DEVICE_OFFSET] @ r1 <- value of boot device
and r2, #BOOT_DEVICE_MASK
ldr r3, =boot_params
- strb r2, [r3, #BOOT_DEVICE_OFFSET] @ omap_boot_device <- r1
+ strb r2, [r3, #BOOT_DEVICE_OFFSET] @ spl_boot_device <- r1
/* boot mode is passed only for devices that can raw/fat mode */
cmp r2, #2
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index b10832a..4d33f99 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -156,7 +156,7 @@ void board_init_r(gd_t *id, ulong dummy)
spl_board_init();
#endif
- boot_device = omap_boot_device();
+ boot_device = spl_boot_device();
debug("boot device - %d\n", boot_device);
switch (boot_device) {
#ifdef CONFIG_SPL_MMC_SUPPORT
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
index 7552f6c..3ad382b 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
@@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis)
{
- switch (omap_boot_device()) {
+ switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1:
omap_mmc_init(0, 0, 0);
break;
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index f2e52e9..b4f4fee 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -71,7 +71,7 @@ u32 omap3_boot_device = BOOT_DEVICE_NAND;
/* auto boot mode detection is not possible for OMAP3 - hard code */
u32 omap_boot_mode(void)
{
- switch (omap_boot_device()) {
+ switch (spl_boot_device()) {
case BOOT_DEVICE_MMC2:
return MMCSD_MODE_RAW;
case BOOT_DEVICE_MMC1:
@@ -86,7 +86,7 @@ u32 omap_boot_mode(void)
}
}
-u32 omap_boot_device(void)
+u32 spl_boot_device(void)
{
return omap3_boot_device;
}
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 19df5ea..a3853ce 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -89,7 +89,7 @@ struct spl_image_info {
extern struct spl_image_info spl_image;
extern u32* boot_params_ptr;
-u32 omap_boot_device(void);
+u32 spl_boot_device(void);
u32 omap_boot_mode(void);
/* SPL common function s*/
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 06/19] ARM: SPL: Rename omap_boot_mode to spl_boot_mode()
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (4 preceding siblings ...)
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 ` 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
` (16 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/boot-common.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl_mmc.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl_nand.c | 2 +-
arch/arm/cpu/armv7/omap3/board.c | 2 +-
arch/arm/include/asm/omap_common.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 102a381..53568ac 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -42,7 +42,7 @@ u32 spl_boot_device(void)
return (u32) (boot_params.omap_bootdevice);
}
-u32 omap_boot_mode(void)
+u32 spl_boot_mode(void)
{
return omap_bootmode;
}
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
index 3ad382b..62b308b 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
@@ -138,7 +138,7 @@ void spl_mmc_load_image(void)
printf("spl: mmc init failed: err - %d\n", err);
hang();
}
- boot_mode = omap_boot_mode();
+ boot_mode = spl_boot_mode();
if (boot_mode == MMCSD_MODE_RAW) {
debug("boot mode - RAW\n");
mmc_load_image_raw(mmc);
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c
index 8cf55c9..ea7cc8a 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c
@@ -35,7 +35,7 @@ void spl_nand_load_image(void)
int *src __attribute__((unused));
int *dst __attribute__((unused));
- switch (omap_boot_mode()) {
+ switch (spl_boot_mode()) {
case NAND_MODE_HW_ECC:
debug("spl: nand - using hw ecc\n");
gpmc_init();
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index b4f4fee..1640696 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -69,7 +69,7 @@ const struct gpio_bank *const omap_gpio_bank = gpio_bank_34xx;
u32 omap3_boot_device = BOOT_DEVICE_NAND;
/* auto boot mode detection is not possible for OMAP3 - hard code */
-u32 omap_boot_mode(void)
+u32 spl_boot_mode(void)
{
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC2:
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index a3853ce..9ac0cc2 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -90,7 +90,7 @@ extern struct spl_image_info spl_image;
extern u32* boot_params_ptr;
u32 spl_boot_device(void);
-u32 omap_boot_mode(void);
+u32 spl_boot_mode(void);
/* SPL common function s*/
void spl_parse_image_header(const struct image_header *header);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 07/19] ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.c
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (5 preceding siblings ...)
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 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 08/19] ARM: SPL: Only call mem_malloc_init if configured Tom Rini
` (15 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
This detection code doesn't (and can't) do anything currently, so
remove.
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/spl_nand.c | 13 +++----------
arch/arm/cpu/armv7/omap3/board.c | 3 ---
arch/arm/include/asm/omap_common.h | 1 -
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c
index ea7cc8a..39221d5 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c
@@ -35,16 +35,9 @@ void spl_nand_load_image(void)
int *src __attribute__((unused));
int *dst __attribute__((unused));
- switch (spl_boot_mode()) {
- case NAND_MODE_HW_ECC:
- debug("spl: nand - using hw ecc\n");
- gpmc_init();
- nand_init();
- break;
- default:
- puts("spl: ERROR: This bootmode is not implemented - hanging");
- hang();
- }
+ debug("spl: nand - using hw ecc\n");
+ gpmc_init();
+ nand_init();
/*use CONFIG_SYS_TEXT_BASE as temporary storage area */
header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 1640696..a487374 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -77,9 +77,6 @@ u32 spl_boot_mode(void)
case BOOT_DEVICE_MMC1:
return MMCSD_MODE_FAT;
break;
- case BOOT_DEVICE_NAND:
- return NAND_MODE_HW_ECC;
- break;
default:
puts("spl: ERROR: unknown device - can't select boot mode\n");
hang();
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 9ac0cc2..1e8f59b 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -76,7 +76,6 @@ void preloader_console_init(void);
#define MMCSD_MODE_UNDEFINED 0
#define MMCSD_MODE_RAW 1
#define MMCSD_MODE_FAT 2
-#define NAND_MODE_HW_ECC 3
struct spl_image_info {
const char *name;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 08/19] ARM: SPL: Only call mem_malloc_init if configured
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (6 preceding siblings ...)
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 ` 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
` (14 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
We can only attempt to setup a malloc pool if
CONFIG_SYS_SPL_MALLOC_START is defined, and not all boards require it.
Make the call depend on the define.
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/spl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 4d33f99..71a467e 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -149,8 +149,10 @@ void board_init_r(gd_t *id, ulong dummy)
u32 boot_device;
debug(">>spl:board_init_r()\n");
+#ifdef CONFIG_SYS_SPL_MALLOC_START
mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
CONFIG_SYS_SPL_MALLOC_SIZE);
+#endif
#ifdef CONFIG_SPL_BOARD_INIT
spl_board_init();
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 09/19] ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h>
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (7 preceding siblings ...)
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 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 10/19] ARM: SPL: Make spl_mmc.c more generic Tom Rini
` (13 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Move the SPL prototypes from <asm/omap_common.h> into <asm/spl.h> and
add <asm/arch/spl.h> for arch specific portions of CONFIG_SPL_FRAMEWORK.
Signed-off-by: Tom Rini <trini@ti.com>
---
Changes in v2:
- Fix checkpatch warning (u32* boot_params_ptr -> u32 *boot_params_ptr)
arch/arm/cpu/armv7/am33xx/board.c | 2 +-
arch/arm/cpu/armv7/omap-common/hwinit-common.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl_mmc.c | 1 +
arch/arm/cpu/armv7/omap-common/spl_nand.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl_ymodem.c | 2 +-
arch/arm/cpu/armv7/omap3/board.c | 1 +
arch/arm/include/asm/arch-am33xx/spl.h | 31 +++++++++++
arch/arm/include/asm/arch-omap3/spl.h | 34 ++++++++++++
arch/arm/include/asm/arch-omap4/spl.h | 35 ++++++++++++
arch/arm/include/asm/arch-omap5/spl.h | 35 ++++++++++++
arch/arm/include/asm/omap_common.h | 71 ------------------------
arch/arm/include/asm/spl.h | 61 ++++++++++++++++++++
13 files changed, 203 insertions(+), 76 deletions(-)
create mode 100644 arch/arm/include/asm/arch-am33xx/spl.h
create mode 100644 arch/arm/include/asm/arch-omap3/spl.h
create mode 100644 arch/arm/include/asm/arch-omap4/spl.h
create mode 100644 arch/arm/include/asm/arch-omap5/spl.h
create mode 100644 arch/arm/include/asm/spl.h
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
index 71309a7..fadc6e7 100644
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -25,7 +25,7 @@
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/common_def.h>
#include <asm/io.h>
-#include <asm/omap_common.h>
+#include <asm/spl.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
index 4d7ef5c..d5fde38 100644
--- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
@@ -31,7 +31,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/sizes.h>
#include <asm/emif.h>
-#include <asm/omap_common.h>
+#include <asm/spl.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 71a467e..81991b2 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -23,6 +23,7 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <asm/spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <asm/arch/sys_proto.h>
@@ -30,7 +31,6 @@
#include <mmc.h>
#include <fat.h>
#include <version.h>
-#include <asm/omap_common.h>
#include <asm/arch/mmc_host_def.h>
#include <i2c.h>
#include <image.h>
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
index 62b308b..fe44538 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
@@ -23,6 +23,7 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <asm/spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c
index 39221d5..6552a5d 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c
@@ -21,13 +21,13 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <asm/spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <asm/arch/sys_proto.h>
#include <asm/io.h>
#include <nand.h>
#include <version.h>
-#include <asm/omap_common.h>
void spl_nand_load_image(void)
{
diff --git a/arch/arm/cpu/armv7/omap-common/spl_ymodem.c b/arch/arm/cpu/armv7/omap-common/spl_ymodem.c
index 47663f7..65565e3 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_ymodem.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_ymodem.c
@@ -26,11 +26,11 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <asm/spl.h>
#include <xyzModem.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <asm/arch/sys_proto.h>
-#include <asm/omap_common.h>
#define BUF_SIZE 1024
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index a487374..45976f9 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -39,6 +39,7 @@
#include <asm/cache.h>
#include <asm/armv7.h>
#include <asm/arch/gpio.h>
+#include <asm/spl.h>
#include <asm/omap_common.h>
#include <i2c.h>
#include <linux/compiler.h>
diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
new file mode 100644
index 0000000..f25afe4
--- /dev/null
+++ b/arch/arm/include/asm/arch-am33xx/spl.h
@@ -0,0 +1,31 @@
+/*
+ * (C) Copyright 2012
+ * Texas Instruments, <www.ti.com>
+ *
+ * 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.
+ *
+ * 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
+ */
+#ifndef _ASM_ARCH_SPL_H_
+#define _ASM_SPL_H_
+
+#define BOOT_DEVICE_NAND 5
+#define BOOT_DEVICE_MMC1 8
+#define BOOT_DEVICE_MMC2 0
+#define BOOT_DEVICE_UART 65
+#define BOOT_DEVICE_MMC2_2 0xFF
+#endif
diff --git a/arch/arm/include/asm/arch-omap3/spl.h b/arch/arm/include/asm/arch-omap3/spl.h
new file mode 100644
index 0000000..404e16a
--- /dev/null
+++ b/arch/arm/include/asm/arch-omap3/spl.h
@@ -0,0 +1,34 @@
+/*
+ * (C) Copyright 2012
+ * Texas Instruments, <www.ti.com>
+ *
+ * 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.
+ *
+ * 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
+ */
+#ifndef _ASM_ARCH_SPL_H_
+#define _ASM_SPL_H_
+
+#define BOOT_DEVICE_NONE 0
+#define BOOT_DEVICE_XIP 1
+#define BOOT_DEVICE_NAND 2
+#define BOOT_DEVICE_ONE_NAND 3
+#define BOOT_DEVICE_MMC2 5 /*emmc*/
+#define BOOT_DEVICE_MMC1 6
+#define BOOT_DEVICE_XIPWAIT 7
+#define BOOT_DEVICE_MMC2_2 0xFF
+#endif
diff --git a/arch/arm/include/asm/arch-omap4/spl.h b/arch/arm/include/asm/arch-omap4/spl.h
new file mode 100644
index 0000000..cec84dc
--- /dev/null
+++ b/arch/arm/include/asm/arch-omap4/spl.h
@@ -0,0 +1,35 @@
+/*
+ * (C) Copyright 2012
+ * Texas Instruments, <www.ti.com>
+ *
+ * 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.
+ *
+ * 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
+ */
+#ifndef _ASM_ARCH_SPL_H_
+#define _ASM_SPL_H_
+
+#define BOOT_DEVICE_NONE 0
+#define BOOT_DEVICE_XIP 1
+#define BOOT_DEVICE_XIPWAIT 2
+#define BOOT_DEVICE_NAND 3
+#define BOOT_DEVICE_ONE_NAND 4
+#define BOOT_DEVICE_MMC1 5
+#define BOOT_DEVICE_MMC2 6
+#define BOOT_DEVICE_MMC2_2 0xFF
+
+#endif
diff --git a/arch/arm/include/asm/arch-omap5/spl.h b/arch/arm/include/asm/arch-omap5/spl.h
new file mode 100644
index 0000000..d125c61
--- /dev/null
+++ b/arch/arm/include/asm/arch-omap5/spl.h
@@ -0,0 +1,35 @@
+/*
+ * (C) Copyright 2012
+ * Texas Instruments, <www.ti.com>
+ *
+ * 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.
+ *
+ * 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
+ */
+#ifndef _ASM_ARCH_SPL_H_
+#define _ASM_SPL_H_
+
+#define BOOT_DEVICE_NONE 0
+#define BOOT_DEVICE_XIP 1
+#define BOOT_DEVICE_XIPWAIT 2
+#define BOOT_DEVICE_NAND 3
+#define BOOT_DEVICE_ONE_NAND 4
+#define BOOT_DEVICE_MMC1 5
+#define BOOT_DEVICE_MMC2 6
+#define BOOT_DEVICE_MMC2_2 7
+
+#endif
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 1e8f59b..775ab6c 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -34,82 +34,11 @@
#define OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL 2
#define OMAP_INIT_CONTEXT_UBOOT_AFTER_CH 3
-void preloader_console_init(void);
-
-/* Boot device */
-#ifdef CONFIG_OMAP54XX
-#define BOOT_DEVICE_NONE 0
-#define BOOT_DEVICE_XIP 1
-#define BOOT_DEVICE_XIPWAIT 2
-#define BOOT_DEVICE_NAND 3
-#define BOOT_DEVICE_ONE_NAND 4
-#define BOOT_DEVICE_MMC1 5
-#define BOOT_DEVICE_MMC2 6
-#define BOOT_DEVICE_MMC2_2 7
-#elif defined(CONFIG_OMAP44XX) /* OMAP4 */
-#define BOOT_DEVICE_NONE 0
-#define BOOT_DEVICE_XIP 1
-#define BOOT_DEVICE_XIPWAIT 2
-#define BOOT_DEVICE_NAND 3
-#define BOOT_DEVICE_ONE_NAND 4
-#define BOOT_DEVICE_MMC1 5
-#define BOOT_DEVICE_MMC2 6
-#define BOOT_DEVICE_MMC2_2 0xFF
-#elif defined(CONFIG_OMAP34XX) /* OMAP3 */
-#define BOOT_DEVICE_NONE 0
-#define BOOT_DEVICE_XIP 1
-#define BOOT_DEVICE_NAND 2
-#define BOOT_DEVICE_ONE_NAND 3
-#define BOOT_DEVICE_MMC2 5 /*emmc*/
-#define BOOT_DEVICE_MMC1 6
-#define BOOT_DEVICE_XIPWAIT 7
-#define BOOT_DEVICE_MMC2_2 0xFF
-#elif defined(CONFIG_AM33XX) /* AM33XX */
-#define BOOT_DEVICE_NAND 5
-#define BOOT_DEVICE_MMC1 8
-#define BOOT_DEVICE_MMC2 0
-#define BOOT_DEVICE_UART 65
-#define BOOT_DEVICE_MMC2_2 0xFF
-#endif
-
/* Boot type */
#define MMCSD_MODE_UNDEFINED 0
#define MMCSD_MODE_RAW 1
#define MMCSD_MODE_FAT 2
-struct spl_image_info {
- const char *name;
- u8 os;
- u32 load_addr;
- u32 entry_point;
- u32 size;
-};
-
-extern struct spl_image_info spl_image;
-
-extern u32* boot_params_ptr;
-u32 spl_boot_device(void);
-u32 spl_boot_mode(void);
-
-/* SPL common function s*/
-void spl_parse_image_header(const struct image_header *header);
-void spl_board_prepare_for_linux(void);
-int spl_start_uboot(void);
-void spl_display_print(void);
-
-/* NAND SPL functions */
-void spl_nand_load_image(void);
-
-/* MMC SPL functions */
-void spl_mmc_load_image(void);
-
-/* YMODEM SPL functions */
-void spl_ymodem_load_image(void);
-
-#ifdef CONFIG_SPL_BOARD_INIT
-void spl_board_init(void);
-#endif
-
static inline u32 omap_revision(void)
{
extern u32 *const omap_si_rev;
diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
new file mode 100644
index 0000000..19e6c50
--- /dev/null
+++ b/arch/arm/include/asm/spl.h
@@ -0,0 +1,61 @@
+/*
+ * (C) Copyright 2012
+ * Texas Instruments, <www.ti.com>
+ *
+ * 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.
+ *
+ * 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
+ */
+#ifndef _ASM_SPL_H_
+#define _ASM_SPL_H_
+
+/* Platform-specific defines */
+#include <asm/arch/spl.h>
+
+struct spl_image_info {
+ const char *name;
+ u8 os;
+ u32 load_addr;
+ u32 entry_point;
+ u32 size;
+};
+
+extern struct spl_image_info spl_image;
+extern u32 *boot_params_ptr;
+
+/* SPL common functions */
+void preloader_console_init(void);
+u32 spl_boot_device(void);
+u32 spl_boot_mode(void);
+void spl_parse_image_header(const struct image_header *header);
+void spl_board_prepare_for_linux(void);
+int spl_start_uboot(void);
+void spl_display_print(void);
+
+/* NAND SPL functions */
+void spl_nand_load_image(void);
+
+/* MMC SPL functions */
+void spl_mmc_load_image(void);
+
+/* YMODEM SPL functions */
+void spl_ymodem_load_image(void);
+
+#ifdef CONFIG_SPL_BOARD_INIT
+void spl_board_init(void);
+#endif
+#endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 10/19] ARM: SPL: Make spl_mmc.c more generic
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (8 preceding siblings ...)
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 ` 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
` (12 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Move the default omap/related-centric board_mmc_init to
arch/arm/cpu/armv7/omap-common/boot-common.c and move the type defines
to <asm/spl.h>
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/boot-common.c | 16 ++++++++++++++++
arch/arm/cpu/armv7/omap-common/spl_mmc.c | 17 -----------------
arch/arm/cpu/armv7/omap3/board.c | 15 +++++++++++++++
arch/arm/include/asm/omap_common.h | 5 -----
arch/arm/include/asm/spl.h | 5 +++++
5 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 53568ac..3406cfb 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -17,8 +17,10 @@
*/
#include <common.h>
+#include <asm/spl.h>
#include <asm/omap_common.h>
#include <asm/arch/omap.h>
+#include <asm/arch/mmc_host_def.h>
/*
* This is used to verify if the configuration header
@@ -46,4 +48,18 @@ u32 spl_boot_mode(void)
{
return omap_bootmode;
}
+
+int board_mmc_init(bd_t *bis)
+{
+ switch (spl_boot_device()) {
+ case BOOT_DEVICE_MMC1:
+ omap_mmc_init(0, 0, 0);
+ break;
+ case BOOT_DEVICE_MMC2:
+ case BOOT_DEVICE_MMC2_2:
+ omap_mmc_init(1, 0, 0);
+ break;
+ }
+ return 0;
+}
#endif
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
index fe44538..5c65ba5 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
@@ -30,27 +30,10 @@
#include <mmc.h>
#include <fat.h>
#include <version.h>
-#include <asm/omap_common.h>
#include <asm/arch/mmc_host_def.h>
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_GENERIC_MMC
-int board_mmc_init(bd_t *bis)
-{
- switch (spl_boot_device()) {
- case BOOT_DEVICE_MMC1:
- omap_mmc_init(0, 0, 0);
- break;
- case BOOT_DEVICE_MMC2:
- case BOOT_DEVICE_MMC2_2:
- omap_mmc_init(1, 0, 0);
- break;
- }
- return 0;
-}
-#endif
-
static void mmc_load_image_raw(struct mmc *mmc)
{
u32 image_size_sectors, err;
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 45976f9..3d74f09 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -41,6 +41,7 @@
#include <asm/arch/gpio.h>
#include <asm/spl.h>
#include <asm/omap_common.h>
+#include <asm/arch/mmc_host_def.h>
#include <i2c.h>
#include <linux/compiler.h>
@@ -89,6 +90,20 @@ u32 spl_boot_device(void)
return omap3_boot_device;
}
+int board_mmc_init(bd_t *bis)
+{
+ switch (spl_boot_device()) {
+ case BOOT_DEVICE_MMC1:
+ omap_mmc_init(0, 0, 0);
+ break;
+ case BOOT_DEVICE_MMC2:
+ case BOOT_DEVICE_MMC2_2:
+ omap_mmc_init(1, 0, 0);
+ break;
+ }
+ return 0;
+}
+
void spl_board_init(void)
{
#ifdef CONFIG_SPL_I2C_SUPPORT
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 775ab6c..2a40b89 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -34,11 +34,6 @@
#define OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL 2
#define OMAP_INIT_CONTEXT_UBOOT_AFTER_CH 3
-/* Boot type */
-#define MMCSD_MODE_UNDEFINED 0
-#define MMCSD_MODE_RAW 1
-#define MMCSD_MODE_FAT 2
-
static inline u32 omap_revision(void)
{
extern u32 *const omap_si_rev;
diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index 19e6c50..fdb78b5 100644
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -26,6 +26,11 @@
/* Platform-specific defines */
#include <asm/arch/spl.h>
+/* Boot type */
+#define MMCSD_MODE_UNDEFINED 0
+#define MMCSD_MODE_RAW 1
+#define MMCSD_MODE_FAT 2
+
struct spl_image_info {
const char *name;
u8 os;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 11/19] ARM: SPL: Clean up spl.c / spl_nand.c slightly
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (9 preceding siblings ...)
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 ` 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
` (11 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
- Remove includes we don't need
- Switch some printf statements to puts
- Convert some printf statements to debug, introduce new puts statements
- In most cases saying just "No mkimage signature, assuming
u-boot.bin" or similar is sufficient. This also means the non-DEBUG
case doesn't need printf, in the core of SPL.
- The other case here is that PLAIN_VERSION provided what we wanted
already, so just use it.
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/spl.c | 23 ++++++++---------------
arch/arm/cpu/armv7/omap-common/spl_nand.c | 1 -
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 81991b2..3a1029f 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -26,12 +26,9 @@
#include <asm/spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
-#include <asm/arch/sys_proto.h>
#include <nand.h>
-#include <mmc.h>
#include <fat.h>
#include <version.h>
-#include <asm/arch/mmc_host_def.h>
#include <i2c.h>
#include <image.h>
#include <malloc.h>
@@ -78,8 +75,8 @@ void board_init_f(ulong dummy)
#ifdef CONFIG_SPL_OS_BOOT
__weak int spl_start_uboot(void)
{
- printf("SPL: Please implement spl_start_uboot() for your board\n");
- printf("SPL: Direct Linux boot not active!\n");
+ puts("SPL: Please implement spl_start_uboot() for your board\n");
+ puts("SPL: Direct Linux boot not active!\n");
return 1;
}
#endif
@@ -99,9 +96,9 @@ void spl_parse_image_header(const struct image_header *header)
spl_image.name, spl_image.load_addr, spl_image.size);
} else {
/* Signature not found - assume u-boot.bin */
- printf("mkimage signature not found - ih_magic = %x\n",
+ puts("mkimage signature not found, assuming u-boot.bin ..\n");
+ debug("mkimage signature not found - ih_magic = %x\n",
header->ih_magic);
- debug("Assuming u-boot.bin ..\n");
/* Let's assume U-Boot will not be more than 200 KB */
spl_image.size = 200 * 1024;
spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
@@ -179,7 +176,8 @@ void board_init_r(gd_t *id, ulong dummy)
break;
#endif
default:
- printf("SPL: Un-supported Boot Device - %d!!!\n", boot_device);
+ puts("SPL: Un-supported Boot Device\n");
+ debug("Found: %d\n", boot_device);
hang();
break;
}
@@ -205,8 +203,6 @@ void board_init_r(gd_t *id, ulong dummy)
/* This requires UART clocks to be enabled */
void preloader_console_init(void)
{
- const char *u_boot_rev = U_BOOT_VERSION;
-
gd = &gdata;
gd->bd = &bdata;
gd->flags |= GD_FLG_RELOC;
@@ -216,11 +212,8 @@ void preloader_console_init(void)
gd->have_console = 1;
- /* Avoid a second "U-Boot" coming from this string */
- u_boot_rev = &u_boot_rev[7];
-
- printf("\nU-Boot SPL %s (%s - %s)\n", u_boot_rev, U_BOOT_DATE,
- U_BOOT_TIME);
+ puts("\nU-Boot SPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \
+ U_BOOT_TIME ")\n");
#ifdef CONFIG_SPL_DISPLAY_PRINT
spl_display_print();
#endif
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c
index 6552a5d..3e2f359 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c
@@ -24,7 +24,6 @@
#include <asm/spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
-#include <asm/arch/sys_proto.h>
#include <asm/io.h>
#include <nand.h>
#include <version.h>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 12/19] ARM: SPL: Start hooking in the current SPI SPL support
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (10 preceding siblings ...)
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 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 13/19] ARM: SPL: Move gpmc_init() to spl_board_init() Tom Rini
` (10 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/spl.c | 5 +++++
arch/arm/include/asm/spl.h | 3 +++
2 files changed, 8 insertions(+)
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 3a1029f..dc26750 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -175,6 +175,11 @@ void board_init_r(gd_t *id, ulong dummy)
spl_ymodem_load_image();
break;
#endif
+#ifdef CONFIG_SPL_SPI_SUPPORT
+ case BOOT_DEVICE_SPI:
+ spi_boot();
+ break;
+#endif
default:
puts("SPL: Un-supported Boot Device\n");
debug("Found: %d\n", boot_device);
diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index fdb78b5..47ca1b6 100644
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -60,6 +60,9 @@ void spl_mmc_load_image(void);
/* YMODEM SPL functions */
void spl_ymodem_load_image(void);
+/* SPI SPL functions */
+void spi_boot(void);
+
#ifdef CONFIG_SPL_BOARD_INIT
void spl_board_init(void);
#endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 13/19] ARM: SPL: Move gpmc_init() to spl_board_init()
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (11 preceding siblings ...)
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 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 14/19] SPL: Move the omap SPL framework to common/spl Tom Rini
` (9 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
This is an OMAP/related-specific function, move calling it to
spl_board_init() and turn on CONFIG_SPL_BOARD_INIT on the boards that
enabled NAND and didn't enable this already.
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/boot-common.c | 7 +++++++
arch/arm/cpu/armv7/omap-common/spl_nand.c | 1 -
arch/arm/cpu/armv7/omap3/board.c | 3 +++
include/configs/am3517_crane.h | 1 +
include/configs/am3517_evm.h | 1 +
include/configs/mcx.h | 1 +
include/configs/tam3517-common.h | 1 +
7 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 3406cfb..ed398fd 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -49,6 +49,13 @@ u32 spl_boot_mode(void)
return omap_bootmode;
}
+void spl_board_init(void)
+{
+#ifdef CONFIG_SPL_NAND_SUPPORT
+ gpmc_init();
+#endif
+}
+
int board_mmc_init(bd_t *bis)
{
switch (spl_boot_device()) {
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c
index 3e2f359..1e6b5f0 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c
@@ -35,7 +35,6 @@ void spl_nand_load_image(void)
int *dst __attribute__((unused));
debug("spl: nand - using hw ecc\n");
- gpmc_init();
nand_init();
/*use CONFIG_SYS_TEXT_BASE as temporary storage area */
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 3d74f09..52196c8 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -106,6 +106,9 @@ int board_mmc_init(bd_t *bis)
void spl_board_init(void)
{
+#ifdef CONFIG_SPL_NAND_SUPPORT
+ gpmc_init();
+#endif
#ifdef CONFIG_SPL_I2C_SUPPORT
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 54ab3eb..b312028 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -322,6 +322,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index ed0a601..ab2ddc0 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -321,6 +321,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 970c882..d9cfc10 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -309,6 +309,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_NAND_SOFTECC
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 777f77c..e194b46 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -241,6 +241,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_CONSOLE
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_NAND_SOFTECC
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 14/19] SPL: Move the omap SPL framework to common/spl
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (12 preceding siblings ...)
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 ` Tom Rini
2012-08-22 23:19 ` [U-Boot] [PATCH v3 15/19] spl: Make CONFIG_SPL_FRAMEWORK board_init_f __weak Tom Rini
` (8 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Add a new flag, CONFIG_SPL_FRAMEWORK to opt into the common/spl SPL
framework, enable on all of the previously using boards. We move the
spl_ymodem.c portion to common/ and spl_mmc.c to drivers/mmc/. We leave
the NAND one in-place as we plan to replace it later in this series.
We use common/spl to avoid linker problems with respect to merging
constant strings in objects. Otherwise all strings in common/ will be
linked in and kept which grows SPL in size too much.
Signed-off-by: Tom Rini <trini@ti.com>
---
Changes in v2:
- Place files into common/spl (due to gcc bug #54303) and include/spl.h
- Reorder all of the patches that used to follow this to precede.
Changes in v3:
- Fix checkpatch.pl warning
README | 5 ++
arch/arm/cpu/armv7/am33xx/board.c | 2 +-
arch/arm/cpu/armv7/omap-common/Makefile | 7 --
arch/arm/cpu/armv7/omap-common/boot-common.c | 2 +-
arch/arm/cpu/armv7/omap-common/hwinit-common.c | 2 +-
arch/arm/cpu/armv7/omap-common/spl_nand.c | 2 +-
arch/arm/cpu/armv7/omap3/board.c | 2 +-
arch/arm/include/asm/spl.h | 40 ------------
common/spl/Makefile | 37 +++++++++++
.../arm/cpu/armv7/omap-common => common/spl}/spl.c | 4 +-
.../armv7/omap-common => common/spl}/spl_ymodem.c | 3 +-
drivers/mmc/Makefile | 5 ++
.../armv7/omap-common => drivers/mmc}/spl_mmc.c | 2 +-
include/configs/am335x_evm.h | 1 +
include/configs/am3517_crane.h | 1 +
include/configs/am3517_evm.h | 1 +
include/configs/devkit8000.h | 1 +
include/configs/mcx.h | 1 +
include/configs/omap3_beagle.h | 1 +
include/configs/omap3_evm_common.h | 1 +
include/configs/omap3_overo.h | 1 +
include/configs/omap4_common.h | 1 +
include/configs/omap5_evm.h | 1 +
include/configs/tam3517-common.h | 1 +
include/configs/tricorder.h | 1 +
include/spl.h | 69 ++++++++++++++++++++
spl/Makefile | 1 +
27 files changed, 138 insertions(+), 57 deletions(-)
create mode 100644 common/spl/Makefile
rename {arch/arm/cpu/armv7/omap-common => common/spl}/spl.c (99%)
rename {arch/arm/cpu/armv7/omap-common => common/spl}/spl_ymodem.c (97%)
rename {arch/arm/cpu/armv7/omap-common => drivers/mmc}/spl_mmc.c (99%)
create mode 100644 include/spl.h
diff --git a/README b/README
index f1a12a5..ddbeb1b 100644
--- a/README
+++ b/README
@@ -2564,6 +2564,11 @@ FIT uImage format:
CONFIG_SYS_SPL_MALLOC_SIZE
The size of the malloc pool used in SPL.
+ CONFIG_SPL_FRAMEWORK
+ Enable the SPL framework under common/. This framework
+ supports MMC, NAND and YMODEM loading of U-Boot and NAND
+ NAND loading of the Linux Kernel.
+
CONFIG_SPL_DISPLAY_PRINT
For ARM, enable an optional function to print more information
about the running system.
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
index fadc6e7..d759a98 100644
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -17,6 +17,7 @@
*/
#include <common.h>
+#include <spl.h>
#include <asm/arch/cpu.h>
#include <asm/arch/hardware.h>
#include <asm/arch/omap.h>
@@ -25,7 +26,6 @@
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/common_def.h>
#include <asm/io.h>
-#include <asm/spl.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 2a6625f..837e22e 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -46,16 +46,9 @@ SOBJS += lowlevel_init.o
endif
ifdef CONFIG_SPL_BUILD
-COBJS += spl.o
ifdef CONFIG_SPL_NAND_SUPPORT
COBJS += spl_nand.o
endif
-ifdef CONFIG_SPL_MMC_SUPPORT
-COBJS += spl_mmc.o
-endif
-ifdef CONFIG_SPL_YMODEM_SUPPORT
-COBJS += spl_ymodem.o
-endif
endif
ifndef CONFIG_SPL_BUILD
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index ed398fd..0f19141 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -17,7 +17,7 @@
*/
#include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
#include <asm/omap_common.h>
#include <asm/arch/omap.h>
#include <asm/arch/mmc_host_def.h>
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
index d5fde38..ad8b5ac 100644
--- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
@@ -28,10 +28,10 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <spl.h>
#include <asm/arch/sys_proto.h>
#include <asm/sizes.h>
#include <asm/emif.h>
-#include <asm/spl.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c
index 1e6b5f0..9e9206c 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c
@@ -21,7 +21,7 @@
* MA 02111-1307 USA
*/
#include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 52196c8..42e2fd9 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -33,13 +33,13 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <spl.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/mem.h>
#include <asm/cache.h>
#include <asm/armv7.h>
#include <asm/arch/gpio.h>
-#include <asm/spl.h>
#include <asm/omap_common.h>
#include <asm/arch/mmc_host_def.h>
#include <i2c.h>
diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index 47ca1b6..ad61990 100644
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -26,44 +26,4 @@
/* Platform-specific defines */
#include <asm/arch/spl.h>
-/* Boot type */
-#define MMCSD_MODE_UNDEFINED 0
-#define MMCSD_MODE_RAW 1
-#define MMCSD_MODE_FAT 2
-
-struct spl_image_info {
- const char *name;
- u8 os;
- u32 load_addr;
- u32 entry_point;
- u32 size;
-};
-
-extern struct spl_image_info spl_image;
-extern u32 *boot_params_ptr;
-
-/* SPL common functions */
-void preloader_console_init(void);
-u32 spl_boot_device(void);
-u32 spl_boot_mode(void);
-void spl_parse_image_header(const struct image_header *header);
-void spl_board_prepare_for_linux(void);
-int spl_start_uboot(void);
-void spl_display_print(void);
-
-/* NAND SPL functions */
-void spl_nand_load_image(void);
-
-/* MMC SPL functions */
-void spl_mmc_load_image(void);
-
-/* YMODEM SPL functions */
-void spl_ymodem_load_image(void);
-
-/* SPI SPL functions */
-void spi_boot(void);
-
-#ifdef CONFIG_SPL_BOARD_INIT
-void spl_board_init(void);
-#endif
#endif
diff --git a/common/spl/Makefile b/common/spl/Makefile
new file mode 100644
index 0000000..b61b438
--- /dev/null
+++ b/common/spl/Makefile
@@ -0,0 +1,37 @@
+#
+# (C) Copyright 2012
+# Texas Instruments Incorporated - http://www.ti.com/
+# Aneesh V <aneesh@ti.com>
+#
+# This file is released under the terms of GPL v2 and any later version.
+# See the file COPYING in the root directory of the source tree for details.
+#
+# Based on common/Makefile.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)libspl.o
+
+ifdef CONFIG_SPL_BUILD
+COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
+COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o
+endif
+
+COBJS := $(sort $(COBJS-y))
+SRCS := $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS-y))
+
+all: $(obj).depend $(LIB)
+
+$(LIB): $(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/common/spl/spl.c
similarity index 99%
rename from arch/arm/cpu/armv7/omap-common/spl.c
rename to common/spl/spl.c
index dc26750..b314ed7 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/common/spl/spl.c
@@ -23,7 +23,7 @@
* MA 02111-1307 USA
*/
#include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <nand.h>
@@ -36,7 +36,7 @@
DECLARE_GLOBAL_DATA_PTR;
-u32* boot_params_ptr = NULL;
+u32 *boot_params_ptr = NULL;
struct spl_image_info spl_image;
/* Define global data structure pointer to it*/
diff --git a/arch/arm/cpu/armv7/omap-common/spl_ymodem.c b/common/spl/spl_ymodem.c
similarity index 97%
rename from arch/arm/cpu/armv7/omap-common/spl_ymodem.c
rename to common/spl/spl_ymodem.c
index 65565e3..40e5035 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -26,11 +26,10 @@
* MA 02111-1307 USA
*/
#include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
#include <xyzModem.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
-#include <asm/arch/sys_proto.h>
#define BUF_SIZE 1024
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index c567737..9abaf1a 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -25,6 +25,11 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libmmc.o
+ifdef CONFIG_SPL_BUILD
+ifdef CONFIG_SPL_FRAMEWORK
+COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
+endif
+endif
COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o
COBJS-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o
COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/drivers/mmc/spl_mmc.c
similarity index 99%
rename from arch/arm/cpu/armv7/omap-common/spl_mmc.c
rename to drivers/mmc/spl_mmc.c
index 5c65ba5..7ae7c37 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c
+++ b/drivers/mmc/spl_mmc.c
@@ -23,7 +23,7 @@
* MA 02111-1307 USA
*/
#include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <asm/arch/sys_proto.h>
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index d0fbc88..cda2c4f 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -126,6 +126,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_TEXT_BASE 0x402F0400
#define CONFIG_SPL_MAX_SIZE (46 * 1024)
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index b312028..9f4c386 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -322,6 +322,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index ab2ddc0..8f2ac89 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -321,6 +321,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 037a5bb..47187cf 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -305,6 +305,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_LIBCOMMON_SUPPORT
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index d9cfc10..4f29da6 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -309,6 +309,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_NAND_SOFTECC
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 657780e..1b4e2ee 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -398,6 +398,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 20192a9..22f30f4 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -280,6 +280,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index d29b326..8e63802 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -300,6 +300,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 685fde9..1384522 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -246,6 +246,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_TEXT_BASE 0x40304350
#define CONFIG_SPL_MAX_SIZE (38 * 1024)
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h
index ef4034c..65a34fa 100644
--- a/include/configs/omap5_evm.h
+++ b/include/configs/omap5_evm.h
@@ -243,6 +243,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_TEXT_BASE 0x40300350
#define CONFIG_SPL_MAX_SIZE 0x19000 /* 100K */
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index e194b46..bb2cb7c 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -241,6 +241,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_CONSOLE
#define CONFIG_SPL_NAND_SIMPLE
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 56336ae..0679f18 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -275,6 +275,7 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_BOARD_INIT
diff --git a/include/spl.h b/include/spl.h
new file mode 100644
index 0000000..af9ef71
--- /dev/null
+++ b/include/spl.h
@@ -0,0 +1,69 @@
+/*
+ * (C) Copyright 2012
+ * Texas Instruments, <www.ti.com>
+ *
+ * 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.
+ *
+ * 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
+ */
+#ifndef _SPL_H_
+#define _SPL_H_
+
+/* Platform-specific defines */
+#include <asm/spl.h>
+
+/* Boot type */
+#define MMCSD_MODE_UNDEFINED 0
+#define MMCSD_MODE_RAW 1
+#define MMCSD_MODE_FAT 2
+
+struct spl_image_info {
+ const char *name;
+ u8 os;
+ u32 load_addr;
+ u32 entry_point;
+ u32 size;
+};
+
+extern struct spl_image_info spl_image;
+extern u32 *boot_params_ptr;
+
+/* SPL common functions */
+void preloader_console_init(void);
+u32 spl_boot_device(void);
+u32 spl_boot_mode(void);
+void spl_parse_image_header(const struct image_header *header);
+void spl_board_prepare_for_linux(void);
+int spl_start_uboot(void);
+void spl_display_print(void);
+
+/* NAND SPL functions */
+void spl_nand_load_image(void);
+
+/* MMC SPL functions */
+void spl_mmc_load_image(void);
+
+/* YMODEM SPL functions */
+void spl_ymodem_load_image(void);
+
+/* SPI SPL functions */
+void spi_boot(void);
+
+#ifdef CONFIG_SPL_BOARD_INIT
+void spl_board_init(void);
+#endif
+#endif
diff --git a/spl/Makefile b/spl/Makefile
index ea7d475..f96c08e 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -42,6 +42,7 @@ endif
LIBS-y += board/$(BOARDDIR)/lib$(BOARD).o
LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
+LIBS-$(CONFIG_SPL_FRAMEWORK) += common/spl/libspl.o
LIBS-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/libcommon.o
LIBS-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/libdisk.o
LIBS-$(CONFIG_SPL_I2C_SUPPORT) += drivers/i2c/libi2c.o
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 15/19] spl: Make CONFIG_SPL_FRAMEWORK board_init_f __weak
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (13 preceding siblings ...)
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
2012-08-22 23:19 ` [U-Boot] [PATCH v3 16/19] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK Tom Rini
` (7 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 16/19] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (14 preceding siblings ...)
2012-08-22 23:19 ` [U-Boot] [PATCH v3 15/19] spl: Make CONFIG_SPL_FRAMEWORK board_init_f __weak Tom Rini
@ 2012-08-22 23:19 ` Tom Rini
2012-08-23 13:14 ` Christian Riesch
2012-08-22 23:19 ` [U-Boot] [PATCH v3 17/19] da850: Add README.da850 Tom Rini
` (6 subsequent siblings)
22 siblings, 1 reply; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
- Convert the non-relocation part of board_init_f to spl_board_init,
turn on CONFIG_SPL_BOARD_INIT in the configs.
- Remove duplicated code.
- Add spl_boot_device() that returns the statically chosen boot device.
Signed-off-by: Tom Rini <trini@ti.com>
---
Changes in v2:
- Add CONFIG_SYS_SPL_MALLOC_START / SIZE defines from Christian Riesch
- Add arch/arm/cpu/arm926ejs/davinci/config.mk to build u-boot.ais
Changes in v3:
CONFIG_SPL_FRAMEWORK
perform early init. Fixes the cannot reset problem.
- Make u-boot.ais use u-boot.img not u-boot.bin, now that it uses
- Make use of board_init_f being a weak function now so that we can
Makefile | 4 +--
arch/arm/cpu/arm926ejs/davinci/config.mk | 16 +++++++++
arch/arm/cpu/arm926ejs/davinci/spl.c | 56 ++++++++++++------------------
arch/arm/include/asm/arch-davinci/spl.h | 28 +++++++++++++++
include/configs/cam_enc_4xx.h | 2 ++
include/configs/da850evm.h | 5 +++
include/configs/hawkboard.h | 2 ++
7 files changed, 77 insertions(+), 36 deletions(-)
create mode 100644 arch/arm/cpu/arm926ejs/davinci/config.mk
create mode 100644 arch/arm/include/asm/arch-davinci/spl.h
diff --git a/Makefile b/Makefile
index 57bb0b9..8738d55 100644
--- a/Makefile
+++ b/Makefile
@@ -441,7 +441,7 @@ $(obj)u-boot.ubl: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
rm $(obj)u-boot-ubl.bin
rm $(obj)spl/u-boot-spl-pad.bin
-$(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
+$(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img
$(obj)tools/mkimage -s -n /dev/null -T aisimage \
-e $(CONFIG_SPL_TEXT_BASE) \
-d $(obj)spl/u-boot-spl.bin \
@@ -449,7 +449,7 @@ $(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
$(OBJCOPY) ${OBJCFLAGS} -I binary \
--pad-to=$(CONFIG_SPL_MAX_SIZE) -O binary \
$(obj)spl/u-boot-spl.ais $(obj)spl/u-boot-spl-pad.ais
- cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \
+ cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.img > \
$(obj)u-boot.ais
rm $(obj)spl/u-boot-spl{,-pad}.ais
diff --git a/arch/arm/cpu/arm926ejs/davinci/config.mk b/arch/arm/cpu/arm926ejs/davinci/config.mk
new file mode 100644
index 0000000..42e55cc
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/davinci/config.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2012, Texas Instruments, Incorporated - http://www.ti.com/
+#
+# 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 "as is" WITHOUT ANY WARRANTY of any
+# kind, whether express or implied; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+ifndef CONFIG_SPL_BUILD
+ALL-y += $(obj)u-boot.ais
+endif
diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/spl.c
index 74632e5..46c0bfd 100644
--- a/arch/arm/cpu/arm926ejs/davinci/spl.c
+++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
@@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <nand.h>
@@ -29,14 +30,7 @@
#include <malloc.h>
#include <spi_flash.h>
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-
-DECLARE_GLOBAL_DATA_PTR;
-/* Define global data structure pointer to it*/
-static gd_t gdata __attribute__ ((section(".data")));
-static bd_t bdata __attribute__ ((section(".data")));
-
-#else
+#ifndef CONFIG_SPL_LIBCOMMON_SUPPORT
void puts(const char *str)
{
@@ -54,43 +48,37 @@ void putc(char c)
#endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
-inline void hang(void)
-{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;)
- ;
-}
-
void board_init_f(ulong dummy)
{
+ /* First, perform our low-level init. */
#ifdef CONFIG_SOC_DM365
dm36x_lowlevel_init(0);
#endif
#ifdef CONFIG_SOC_DA8XX
arch_cpu_init();
#endif
- relocate_code(CONFIG_SPL_STACK, NULL, CONFIG_SPL_TEXT_BASE);
+
+ /*
+ * Next we call relocate_code() with relocation target same as the
+ * CONFIG_SYS_SPL_TEXT_BASE. This will result in relocation getting
+ * skipped. Instead, only .bss initialization will happen.
+ */
+ relocate_code(CONFIG_SPL_STACK, &gdata, CONFIG_SPL_TEXT_BASE);
}
-void board_init_r(gd_t *id, ulong dummy)
+void spl_board_init(void)
{
-#ifdef CONFIG_SPL_NAND_LOAD
- nand_init();
- puts("Nand boot...\n");
- nand_boot();
-#endif
-#ifdef CONFIG_SPL_SPI_LOAD
- mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
- CONFIG_SYS_MALLOC_LEN);
-
- gd = &gdata;
- gd->bd = &bdata;
- gd->flags |= GD_FLG_RELOC;
- gd->baudrate = CONFIG_BAUDRATE;
- serial_init(); /* serial communications setup */
- gd->have_console = 1;
+ preloader_console_init();
+}
- puts("SPI boot...\n");
- spi_boot();
+u32 spl_boot_device(void)
+{
+#ifdef CONFIG_SPL_NAND_LOAD
+ return BOOT_DEVICE_NAND;
+#elif defined(CONFIG_SPL_SPI_LOAD)
+ return BOOT_DEVICE_SPI;
+#else
+ puts("Unknown boot device\n");
+ hang();
#endif
}
diff --git a/arch/arm/include/asm/arch-davinci/spl.h b/arch/arm/include/asm/arch-davinci/spl.h
new file mode 100644
index 0000000..f9c5131
--- /dev/null
+++ b/arch/arm/include/asm/arch-davinci/spl.h
@@ -0,0 +1,28 @@
+/*
+ * (C) Copyright 2012
+ * Texas Instruments, <www.ti.com>
+ *
+ * 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.
+ *
+ * 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
+ */
+#ifndef _ASM_ARCH_SPL_H_
+#define _ASM_SPL_H_
+
+#define BOOT_DEVICE_NAND 1
+#define BOOT_DEVICE_SPI 2
+#endif
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 771ac9c..fe28278 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -217,6 +217,8 @@
/* Defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_SPL_NAND_SIMPLE
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index e6adb1f..290ded1 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -313,6 +313,11 @@
/* defines for SPL */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_BOARD_INIT
+#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \
+ CONFIG_SYS_MALLOC_LEN)
+#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN
#define CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SPL_SPI_LOAD
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index c6e9ce5..838e572 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -59,6 +59,8 @@
/* Spl */
#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_NAND_LOAD
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 16/19] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK
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
0 siblings, 1 reply; 28+ messages in thread
From: Christian Riesch @ 2012-08-23 13:14 UTC (permalink / raw)
To: u-boot
Hi Tom,
On Thu, Aug 23, 2012 at 1:19 AM, Tom Rini <trini@ti.com> wrote:
> - Convert the non-relocation part of board_init_f to spl_board_init,
> turn on CONFIG_SPL_BOARD_INIT in the configs.
> - Remove duplicated code.
> - Add spl_boot_device() that returns the statically chosen boot device.
>
> Signed-off-by: Tom Rini <trini@ti.com>
[...]
> diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/spl.c
> index 74632e5..46c0bfd 100644
> --- a/arch/arm/cpu/arm926ejs/davinci/spl.c
> +++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
> @@ -21,6 +21,7 @@
> * MA 02111-1307 USA
> */
> #include <common.h>
> +#include <spl.h>
> #include <asm/u-boot.h>
> #include <asm/utils.h>
> #include <nand.h>
> @@ -29,14 +30,7 @@
> #include <malloc.h>
> #include <spi_flash.h>
>
> -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
> -
> -DECLARE_GLOBAL_DATA_PTR;
> -/* Define global data structure pointer to it*/
> -static gd_t gdata __attribute__ ((section(".data")));
> -static bd_t bdata __attribute__ ((section(".data")));
> -
> -#else
> +#ifndef CONFIG_SPL_LIBCOMMON_SUPPORT
>
> void puts(const char *str)
> {
> @@ -54,43 +48,37 @@ void putc(char c)
>
> #endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
>
> -inline void hang(void)
> -{
> - puts("### ERROR ### Please RESET the board ###\n");
> - for (;;)
> - ;
> -}
> -
> void board_init_f(ulong dummy)
> {
> + /* First, perform our low-level init. */
> #ifdef CONFIG_SOC_DM365
> dm36x_lowlevel_init(0);
> #endif
> #ifdef CONFIG_SOC_DA8XX
> arch_cpu_init();
> #endif
> - relocate_code(CONFIG_SPL_STACK, NULL, CONFIG_SPL_TEXT_BASE);
> +
> + /*
> + * Next we call relocate_code() with relocation target same as the
> + * CONFIG_SYS_SPL_TEXT_BASE. This will result in relocation getting
> + * skipped. Instead, only .bss initialization will happen.
> + */
> + relocate_code(CONFIG_SPL_STACK, &gdata, CONFIG_SPL_TEXT_BASE);
> }
>
> -void board_init_r(gd_t *id, ulong dummy)
> +void spl_board_init(void)
> {
> -#ifdef CONFIG_SPL_NAND_LOAD
> - nand_init();
> - puts("Nand boot...\n");
> - nand_boot();
> -#endif
> -#ifdef CONFIG_SPL_SPI_LOAD
> - mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
> - CONFIG_SYS_MALLOC_LEN);
> -
> - gd = &gdata;
> - gd->bd = &bdata;
> - gd->flags |= GD_FLG_RELOC;
> - gd->baudrate = CONFIG_BAUDRATE;
> - serial_init(); /* serial communications setup */
> - gd->have_console = 1;
> + preloader_console_init();
> +}
>
> - puts("SPI boot...\n");
> - spi_boot();
> +u32 spl_boot_device(void)
> +{
> +#ifdef CONFIG_SPL_NAND_LOAD
> + return BOOT_DEVICE_NAND;
> +#elif defined(CONFIG_SPL_SPI_LOAD)
> + return BOOT_DEVICE_SPI;
> +#else
This will not apply on u-boot-ti since it is missing the MMC-SPL
patches that have already been merged, right?
Regards, Christian
> + puts("Unknown boot device\n");
> + hang();
> #endif
> }
^ permalink raw reply [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 16/19] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK
2012-08-23 13:14 ` Christian Riesch
@ 2012-08-23 14:07 ` Tom Rini
0 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-23 14:07 UTC (permalink / raw)
To: u-boot
On 08/23/2012 06:14 AM, Christian Riesch wrote:
> Hi Tom,
>
> On Thu, Aug 23, 2012 at 1:19 AM, Tom Rini <trini@ti.com> wrote:
>> - Convert the non-relocation part of board_init_f to spl_board_init,
>> turn on CONFIG_SPL_BOARD_INIT in the configs.
>> - Remove duplicated code.
>> - Add spl_boot_device() that returns the statically chosen boot device.
>>
>> Signed-off-by: Tom Rini <trini@ti.com>
> [...]
>> diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/spl.c
>> index 74632e5..46c0bfd 100644
>> --- a/arch/arm/cpu/arm926ejs/davinci/spl.c
>> +++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
>> @@ -21,6 +21,7 @@
>> * MA 02111-1307 USA
>> */
>> #include <common.h>
>> +#include <spl.h>
>> #include <asm/u-boot.h>
>> #include <asm/utils.h>
>> #include <nand.h>
>> @@ -29,14 +30,7 @@
>> #include <malloc.h>
>> #include <spi_flash.h>
>>
>> -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
>> -
>> -DECLARE_GLOBAL_DATA_PTR;
>> -/* Define global data structure pointer to it*/
>> -static gd_t gdata __attribute__ ((section(".data")));
>> -static bd_t bdata __attribute__ ((section(".data")));
>> -
>> -#else
>> +#ifndef CONFIG_SPL_LIBCOMMON_SUPPORT
>>
>> void puts(const char *str)
>> {
>> @@ -54,43 +48,37 @@ void putc(char c)
>>
>> #endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
>>
>> -inline void hang(void)
>> -{
>> - puts("### ERROR ### Please RESET the board ###\n");
>> - for (;;)
>> - ;
>> -}
>> -
>> void board_init_f(ulong dummy)
>> {
>> + /* First, perform our low-level init. */
>> #ifdef CONFIG_SOC_DM365
>> dm36x_lowlevel_init(0);
>> #endif
>> #ifdef CONFIG_SOC_DA8XX
>> arch_cpu_init();
>> #endif
>> - relocate_code(CONFIG_SPL_STACK, NULL, CONFIG_SPL_TEXT_BASE);
>> +
>> + /*
>> + * Next we call relocate_code() with relocation target same as the
>> + * CONFIG_SYS_SPL_TEXT_BASE. This will result in relocation getting
>> + * skipped. Instead, only .bss initialization will happen.
>> + */
>> + relocate_code(CONFIG_SPL_STACK, &gdata, CONFIG_SPL_TEXT_BASE);
>> }
>>
>> -void board_init_r(gd_t *id, ulong dummy)
>> +void spl_board_init(void)
>> {
>> -#ifdef CONFIG_SPL_NAND_LOAD
>> - nand_init();
>> - puts("Nand boot...\n");
>> - nand_boot();
>> -#endif
>> -#ifdef CONFIG_SPL_SPI_LOAD
>> - mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
>> - CONFIG_SYS_MALLOC_LEN);
>> -
>> - gd = &gdata;
>> - gd->bd = &bdata;
>> - gd->flags |= GD_FLG_RELOC;
>> - gd->baudrate = CONFIG_BAUDRATE;
>> - serial_init(); /* serial communications setup */
>> - gd->have_console = 1;
>> + preloader_console_init();
>> +}
>>
>> - puts("SPI boot...\n");
>> - spi_boot();
>> +u32 spl_boot_device(void)
>> +{
>> +#ifdef CONFIG_SPL_NAND_LOAD
>> + return BOOT_DEVICE_NAND;
>> +#elif defined(CONFIG_SPL_SPI_LOAD)
>> + return BOOT_DEVICE_SPI;
>> +#else
>
> This will not apply on u-boot-ti since it is missing the MMC-SPL
> patches that have already been merged, right?
Indeed, there will be a certain amount of merge-pain I will have to deal
with to get this to apply. There's also conflicts with some of the
am33xx enhancements there or that I plan to push there shortly.
--
Tom
^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH v3 17/19] da850: Add README.da850
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (15 preceding siblings ...)
2012-08-22 23:19 ` [U-Boot] [PATCH v3 16/19] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK Tom Rini
@ 2012-08-22 23:19 ` Tom Rini
2012-08-23 12:52 ` Christian Riesch
2012-08-22 23:19 ` [U-Boot] [PATCH v3 18/19] SPL: Enhance drivers/mtd/nand/nand_spl_load.c Tom Rini
` (5 subsequent siblings)
22 siblings, 1 reply; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
This file documents when to build for da850evm and when to build for
da850_am18xxevm. It also documents how to write the u-boot.ais file to
persistent storage (such as SPI), in some cases as well as how to write
a recovery image.
Signed-off-by: Tom Rini <trini@ti.com>
---
Changes in v2:
- Add
Changes in v3:
- Fix thinko, Nand -> SPI (spotted by Prabhakar Lad)
- Rename to README.da850, add more direct recovery method (Christian Riesch)
board/davinci/da8xxevm/README.da850 | 62 +++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
create mode 100644 board/davinci/da8xxevm/README.da850
diff --git a/board/davinci/da8xxevm/README.da850 b/board/davinci/da8xxevm/README.da850
new file mode 100644
index 0000000..55291f3
--- /dev/null
+++ b/board/davinci/da8xxevm/README.da850
@@ -0,0 +1,62 @@
+Summary
+=======
+The README is for the boot procedure used for various DA850 (or compatible
+parts such as the AM1808) based boards.
+
+The board is booted in three stages. The initial bootloader which executes
+upon reset is the ROM Boot Loader (RBL) which sits in the internal ROM. The
+RBL initializes the memory and then depending on the exact board will
+initialize another controller (such as SPI or NAND) to continue the boot
+process.
+
+AIS is an image format defined by TI for the images that are to be
+loaded to memory by the RBL. The image is divided into a series of
+sections and the image's entry point is specified. Each section comes
+with meta data like the target address the section is to be copied to
+and the size of the section, which is used by the RBL to load the
+image. At the end of the image the RBL jumps to the image entry
+point.
+
+The secondary stage bootloader (SPL) which is loaded by the RBL then loads
+the u-boot from a predefined location in persistent storage to DDR and
+jumps to the u-boot entry point.
+
+
+Compilation
+===========
+The exact build target you need will depend on the board you have. For
+Logic PD boards, or other boards which store the ethernet MAC address at
+the end of SPI flash, run 'make da850evm'. For boards which store the
+ethernet MAC address in the i2c EEPROM located at 0x50, run
+'make da850_am18xxevm'. Once this build completes you will have a
+u-boot.ais file that needs to be written to the correct persistent
+storage.
+
+
+Flashing the images to SPI
+==========================
+The AIS image can be written to SPI flash using the following commands.
+Assuming that the network is configured and enabled and the u-boot.ais file
+is tftp'able.
+
+U-Boot > sf probe 0
+U-Boot > sf erase 0 +320000
+U-Boot > tftp u-boot.ais
+U-Boot > sf write c0700000 0 $filesize
+
+
+Recovery
+========
+
+In the case of a "bricked" board, you need to use the TI tools found
+here[1] to write the u-boot.ais file. An example of recovering to the SPI
+flash would be:
+
+$ mono sfh_OMAP-L138.exe -targetType AM1808 -p /dev/ttyUSB0 \
+ -flash_noubl /path/to/u-boot.ais
+
+
+Links
+=====
+[1]
+ http://processors.wiki.ti.com/index.php/Serial_Boot_and_Flash_Loading_Utility_for_OMAP-L137
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 17/19] da850: Add README.da850
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
0 siblings, 1 reply; 28+ messages in thread
From: Christian Riesch @ 2012-08-23 12:52 UTC (permalink / raw)
To: u-boot
Hi Tom,
On Thu, Aug 23, 2012 at 1:19 AM, Tom Rini <trini@ti.com> wrote:
> This file documents when to build for da850evm and when to build for
> da850_am18xxevm. It also documents how to write the u-boot.ais file to
> persistent storage (such as SPI), in some cases as well as how to write
> a recovery image.
>
> Signed-off-by: Tom Rini <trini@ti.com>
> ---
> Changes in v2:
> - Add
>
> Changes in v3:
> - Fix thinko, Nand -> SPI (spotted by Prabhakar Lad)
> - Rename to README.da850, add more direct recovery method (Christian Riesch)
>
> board/davinci/da8xxevm/README.da850 | 62 +++++++++++++++++++++++++++++++++++
> 1 file changed, 62 insertions(+)
> create mode 100644 board/davinci/da8xxevm/README.da850
>
> diff --git a/board/davinci/da8xxevm/README.da850 b/board/davinci/da8xxevm/README.da850
> new file mode 100644
> index 0000000..55291f3
> --- /dev/null
> +++ b/board/davinci/da8xxevm/README.da850
> @@ -0,0 +1,62 @@
> +Summary
> +=======
> +The README is for the boot procedure used for various DA850 (or compatible
> +parts such as the AM1808) based boards.
> +
> +The board is booted in three stages. The initial bootloader which executes
> +upon reset is the ROM Boot Loader (RBL) which sits in the internal ROM. The
> +RBL initializes the memory and then depending on the exact board will
The RBL can initialize the PLLs and the memory (I assume you are
talking about DDR/SDRAM here), but only if the AIS tells it to do so
and provides the configuration data like timing etc. However, for the
da850evm configuration the AIS only tells the RBL to copy the SPL to
the internal SRAM of the SoC. Then, the SPL initializes the DDR
memory.
Actually we wouldn't need SPL to boot from SPI on the da850. We could
as well do memory initialization with AIS/RBL and then let the RBL
copy u-boot to DDR memory. The reason why I introduced SPL for booting
from SPI here is that it gives us more flexibility, e.g. on my custom
board I must check the board revision before configuring the PLLs
because I have different oscillator frequencies on different
revisions.
> +initialize another controller (such as SPI or NAND) to continue the boot
> +process.
> +
> +AIS is an image format defined by TI for the images that are to be
> +loaded to memory by the RBL. The image is divided into a series of
> +sections and the image's entry point is specified. Each section comes
> +with meta data like the target address the section is to be copied to
> +and the size of the section, which is used by the RBL to load the
> +image. At the end of the image the RBL jumps to the image entry
> +point.
> +
> +The secondary stage bootloader (SPL) which is loaded by the RBL then
... initializes the PLLs and the memory controller and ...
> loads
> +the u-boot from a predefined location in persistent storage to DDR and
> +jumps to the u-boot entry point.
> +
> +
> +Compilation
> +===========
> +The exact build target you need will depend on the board you have. For
> +Logic PD boards, or other boards which store the ethernet MAC address at
> +the end of SPI flash, run 'make da850evm'. For boards which store the
> +ethernet MAC address in the i2c EEPROM located at 0x50, run
> +'make da850_am18xxevm'. Once this build completes you will have a
> +u-boot.ais file that needs to be written to the correct persistent
> +storage.
> +
> +
> +Flashing the images to SPI
> +==========================
> +The AIS image can be written to SPI flash using the following commands.
> +Assuming that the network is configured and enabled and the u-boot.ais file
> +is tftp'able.
> +
> +U-Boot > sf probe 0
> +U-Boot > sf erase 0 +320000
> +U-Boot > tftp u-boot.ais
> +U-Boot > sf write c0700000 0 $filesize
> +
> +
> +Recovery
> +========
> +
> +In the case of a "bricked" board, you need to use the TI tools found
> +here[1] to write the u-boot.ais file. An example of recovering to the SPI
> +flash would be:
> +
> +$ mono sfh_OMAP-L138.exe -targetType AM1808 -p /dev/ttyUSB0 \
> + -flash_noubl /path/to/u-boot.ais
> +
I believe for the OMAP-L138 boards you will need -targetType OMAPL138
(or just omit the option because OMAPL138 is the default).
Thanks!
Regards, Christian
> +
> +Links
> +=====
> +[1]
> + http://processors.wiki.ti.com/index.php/Serial_Boot_and_Flash_Loading_Utility_for_OMAP-L137
> --
> 1.7.9.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH v3 17/19] da850: Add README.da850
2012-08-23 12:52 ` Christian Riesch
@ 2012-08-23 16:17 ` Tom Rini
0 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-23 16:17 UTC (permalink / raw)
To: u-boot
On 08/23/2012 05:52 AM, Christian Riesch wrote:
> Hi Tom,
>
> On Thu, Aug 23, 2012 at 1:19 AM, Tom Rini <trini@ti.com> wrote:
>> This file documents when to build for da850evm and when to build for
>> da850_am18xxevm. It also documents how to write the u-boot.ais file to
>> persistent storage (such as SPI), in some cases as well as how to write
>> a recovery image.
>>
>> Signed-off-by: Tom Rini <trini@ti.com>
>> ---
>> Changes in v2:
>> - Add
>>
>> Changes in v3:
>> - Fix thinko, Nand -> SPI (spotted by Prabhakar Lad)
>> - Rename to README.da850, add more direct recovery method (Christian Riesch)
>>
>> board/davinci/da8xxevm/README.da850 | 62 +++++++++++++++++++++++++++++++++++
>> 1 file changed, 62 insertions(+)
>> create mode 100644 board/davinci/da8xxevm/README.da850
>>
>> diff --git a/board/davinci/da8xxevm/README.da850 b/board/davinci/da8xxevm/README.da850
>> new file mode 100644
>> index 0000000..55291f3
>> --- /dev/null
>> +++ b/board/davinci/da8xxevm/README.da850
>> @@ -0,0 +1,62 @@
>> +Summary
>> +=======
>> +The README is for the boot procedure used for various DA850 (or compatible
>> +parts such as the AM1808) based boards.
>> +
>> +The board is booted in three stages. The initial bootloader which executes
>> +upon reset is the ROM Boot Loader (RBL) which sits in the internal ROM. The
>> +RBL initializes the memory and then depending on the exact board will
>
> The RBL can initialize the PLLs and the memory (I assume you are
> talking about DDR/SDRAM here), but only if the AIS tells it to do so
> and provides the configuration data like timing etc. However, for the
> da850evm configuration the AIS only tells the RBL to copy the SPL to
> the internal SRAM of the SoC. Then, the SPL initializes the DDR
> memory.
>
> Actually we wouldn't need SPL to boot from SPI on the da850. We could
> as well do memory initialization with AIS/RBL and then let the RBL
> copy u-boot to DDR memory. The reason why I introduced SPL for booting
> from SPI here is that it gives us more flexibility, e.g. on my custom
> board I must check the board revision before configuring the PLLs
> because I have different oscillator frequencies on different
> revisions.
True. I suppose this is what I get for copy/pasting docs from a similar
board and focusing more on the "write these bits to hardware" rather
than "what do these bits do exactly" :) Thanks, I'll re-word things a
bit more.
>> +initialize another controller (such as SPI or NAND) to continue the boot
>> +process.
>> +
>> +AIS is an image format defined by TI for the images that are to be
>> +loaded to memory by the RBL. The image is divided into a series of
>> +sections and the image's entry point is specified. Each section comes
>> +with meta data like the target address the section is to be copied to
>> +and the size of the section, which is used by the RBL to load the
>> +image. At the end of the image the RBL jumps to the image entry
>> +point.
>> +
>> +The secondary stage bootloader (SPL) which is loaded by the RBL then
>
> ... initializes the PLLs and the memory controller and ...
>
>> loads
>> +the u-boot from a predefined location in persistent storage to DDR and
>> +jumps to the u-boot entry point.
>> +
>> +
>> +Compilation
>> +===========
>> +The exact build target you need will depend on the board you have. For
>> +Logic PD boards, or other boards which store the ethernet MAC address at
>> +the end of SPI flash, run 'make da850evm'. For boards which store the
>> +ethernet MAC address in the i2c EEPROM located at 0x50, run
>> +'make da850_am18xxevm'. Once this build completes you will have a
>> +u-boot.ais file that needs to be written to the correct persistent
>> +storage.
>> +
>> +
>> +Flashing the images to SPI
>> +==========================
>> +The AIS image can be written to SPI flash using the following commands.
>> +Assuming that the network is configured and enabled and the u-boot.ais file
>> +is tftp'able.
>> +
>> +U-Boot > sf probe 0
>> +U-Boot > sf erase 0 +320000
>> +U-Boot > tftp u-boot.ais
>> +U-Boot > sf write c0700000 0 $filesize
>> +
>> +
>> +Recovery
>> +========
>> +
>> +In the case of a "bricked" board, you need to use the TI tools found
>> +here[1] to write the u-boot.ais file. An example of recovering to the SPI
>> +flash would be:
>> +
>> +$ mono sfh_OMAP-L138.exe -targetType AM1808 -p /dev/ttyUSB0 \
>> + -flash_noubl /path/to/u-boot.ais
>> +
>
> I believe for the OMAP-L138 boards you will need -targetType OMAPL138
> (or just omit the option because OMAPL138 is the default).
Indeed, I should say it's an example for AM1808.
--
Tom
^ permalink raw reply [flat|nested] 28+ messages in thread
* [U-Boot] [PATCH v3 18/19] SPL: Enhance drivers/mtd/nand/nand_spl_load.c
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (16 preceding siblings ...)
2012-08-22 23:19 ` [U-Boot] [PATCH v3 17/19] da850: Add README.da850 Tom Rini
@ 2012-08-22 23:19 ` 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
` (4 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Takes the load function from arch/arm/lib/spl_nand.c instead. This will
allow for easier integration of SPL-boots-Linux code on other arches.
Kill off CONFIG_SPL_NAND_LOAD as a separate option.
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/arm926ejs/davinci/spl.c | 2 +-
arch/arm/cpu/armv7/omap-common/Makefile | 6 --
arch/arm/cpu/armv7/omap-common/spl_nand.c | 102 -----------------------------
doc/README.SPL | 1 -
drivers/mtd/nand/Makefile | 7 +-
drivers/mtd/nand/nand_spl_load.c | 89 ++++++++++++++++++-------
include/configs/cam_enc_4xx.h | 1 -
include/configs/hawkboard.h | 1 -
8 files changed, 67 insertions(+), 142 deletions(-)
delete mode 100644 arch/arm/cpu/armv7/omap-common/spl_nand.c
diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/spl.c
index 46c0bfd..0b000ca 100644
--- a/arch/arm/cpu/arm926ejs/davinci/spl.c
+++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
@@ -73,7 +73,7 @@ void spl_board_init(void)
u32 spl_boot_device(void)
{
-#ifdef CONFIG_SPL_NAND_LOAD
+#ifdef CONFIG_SPL_NAND_SIMPLE
return BOOT_DEVICE_NAND;
#elif defined(CONFIG_SPL_SPI_LOAD)
return BOOT_DEVICE_SPI;
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 837e22e..0e0b641 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -45,12 +45,6 @@ COBJS += boot-common.o
SOBJS += lowlevel_init.o
endif
-ifdef CONFIG_SPL_BUILD
-ifdef CONFIG_SPL_NAND_SUPPORT
-COBJS += spl_nand.o
-endif
-endif
-
ifndef CONFIG_SPL_BUILD
ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
COBJS += mem-common.o
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c
deleted file mode 100644
index 9e9206c..0000000
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2011
- * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.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.
- *
- * 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 <spl.h>
-#include <asm/u-boot.h>
-#include <asm/utils.h>
-#include <asm/io.h>
-#include <nand.h>
-#include <version.h>
-
-void spl_nand_load_image(void)
-{
- struct image_header *header;
- int *src __attribute__((unused));
- int *dst __attribute__((unused));
-
- debug("spl: nand - using hw ecc\n");
- nand_init();
-
- /*use CONFIG_SYS_TEXT_BASE as temporary storage area */
- header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
-#ifdef CONFIG_SPL_OS_BOOT
- if (!spl_start_uboot()) {
- /*
- * load parameter image
- * load to temp position since nand_spl_load_image reads
- * a whole block which is typically larger than
- * CONFIG_CMD_SPL_WRITE_SIZE therefore may overwrite
- * following sections like BSS
- */
- nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS,
- CONFIG_CMD_SPL_WRITE_SIZE,
- (void *)CONFIG_SYS_TEXT_BASE);
- /* copy to destintion */
- for (dst = (int *)CONFIG_SYS_SPL_ARGS_ADDR,
- src = (int *)CONFIG_SYS_TEXT_BASE;
- src < (int *)(CONFIG_SYS_TEXT_BASE +
- CONFIG_CMD_SPL_WRITE_SIZE);
- src++, dst++) {
- writel(readl(src), dst);
- }
-
- /* load linux */
- nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
- CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
- spl_parse_image_header(header);
- if (header->ih_os == IH_OS_LINUX) {
- /* happy - was a linux */
- nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
- spl_image.size, (void *)spl_image.load_addr);
- nand_deselect();
- return;
- } else {
- printf("The Expected Linux image was not"
- "found. Please check your NAND"
- "configuration.\n");
- printf("Trying to start u-boot now...\n");
- }
- }
-#endif
-#ifdef CONFIG_NAND_ENV_DST
- nand_spl_load_image(CONFIG_ENV_OFFSET,
- CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
- spl_parse_image_header(header);
- nand_spl_load_image(CONFIG_ENV_OFFSET, spl_image.size,
- (void *)spl_image.load_addr);
-#ifdef CONFIG_ENV_OFFSET_REDUND
- nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND,
- CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
- spl_parse_image_header(header);
- nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, spl_image.size,
- (void *)spl_image.load_addr);
-#endif
-#endif
- /* Load u-boot */
- nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
- CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
- spl_parse_image_header(header);
- nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
- spl_image.size, (void *)spl_image.load_addr);
- nand_deselect();
-}
diff --git a/doc/README.SPL b/doc/README.SPL
index e4a5ac3..3faf91c 100644
--- a/doc/README.SPL
+++ b/doc/README.SPL
@@ -64,7 +64,6 @@ CONFIG_SPL_POWER_SUPPORT (drivers/power/libpower.o)
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/nand/Makefile b/drivers/mtd/nand/Makefile
index 29dc20e..5475c8c 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -27,12 +27,7 @@ LIB := $(obj)libnand.o
ifdef CONFIG_CMD_NAND
ifdef CONFIG_SPL_BUILD
-ifdef CONFIG_SPL_NAND_SIMPLE
-COBJS-y += nand_spl_simple.o
-endif
-ifdef CONFIG_SPL_NAND_LOAD
-COBJS-y += nand_spl_load.o
-endif
+COBJS-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o nand_spl_load.o
else
COBJS-y += nand.o
COBJS-y += nand_bbt.o
diff --git a/drivers/mtd/nand/nand_spl_load.c b/drivers/mtd/nand/nand_spl_load.c
index 215459a..c1c45b6 100644
--- a/drivers/mtd/nand/nand_spl_load.c
+++ b/drivers/mtd/nand/nand_spl_load.c
@@ -20,36 +20,77 @@
#include <common.h>
#include <nand.h>
+#include <spl.h>
+#include <asm/io.h>
-/*
- * The main entry for NAND booting. It's necessary that SDRAM is already
- * configured and available since this code loads the main U-Boot image
- * from NAND into SDRAM and starts it from there.
- */
-void nand_boot(void)
+void spl_nand_load_image(void)
{
- __attribute__((noreturn)) void (*uboot)(void);
+ struct image_header *header;
+ int *src __attribute__((unused));
+ int *dst __attribute__((unused));
- /*
- * Load U-Boot image from NAND into RAM
- */
- nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
- CONFIG_SYS_NAND_U_BOOT_SIZE,
- (void *)CONFIG_SYS_NAND_U_BOOT_DST);
+ nand_init();
-#ifdef CONFIG_NAND_ENV_DST
- nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
- (void *)CONFIG_NAND_ENV_DST);
+ /* use CONFIG_SYS_TEXT_BASE as temporary storage area */
+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
+#ifdef CONFIG_SPL_OS_BOOT
+ if (!spl_start_uboot()) {
+ /*
+ * load parameter image
+ * load to temp position since nand_spl_load_image reads
+ * a whole block which is typically larger than
+ * CONFIG_CMD_SPL_WRITE_SIZE therefore may overwrite
+ * following sections like BSS
+ */
+ nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS,
+ CONFIG_CMD_SPL_WRITE_SIZE,
+ (void *)CONFIG_SYS_TEXT_BASE);
+ /* copy to destintion */
+ for (dst = (int *)CONFIG_SYS_SPL_ARGS_ADDR,
+ src = (int *)CONFIG_SYS_TEXT_BASE;
+ src < (int *)(CONFIG_SYS_TEXT_BASE +
+ CONFIG_CMD_SPL_WRITE_SIZE);
+ src++, dst++) {
+ writel(readl(src), dst);
+ }
+ /* load linux */
+ nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
+ CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+ spl_parse_image_header(header);
+ if (header->ih_os == IH_OS_LINUX) {
+ /* happy - was a linux */
+ nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
+ spl_image.size, (void *)spl_image.load_addr);
+ nand_deselect();
+ return;
+ } else {
+ puts("The Expected Linux image was not "
+ "found. Please check your NAND "
+ "configuration.\n");
+ puts("Trying to start u-boot now...\n");
+ }
+ }
+#endif
+#ifdef CONFIG_NAND_ENV_DST
+ nand_spl_load_image(CONFIG_ENV_OFFSET,
+ CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+ spl_parse_image_header(header);
+ nand_spl_load_image(CONFIG_ENV_OFFSET, spl_image.size,
+ (void *)spl_image.load_addr);
#ifdef CONFIG_ENV_OFFSET_REDUND
- nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE,
- (void *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE);
+ nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND,
+ CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+ spl_parse_image_header(header);
+ nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, spl_image.size,
+ (void *)spl_image.load_addr);
#endif
#endif
-
- /*
- * Jump to U-Boot image
- */
- uboot = (void *)CONFIG_SYS_NAND_U_BOOT_START;
- (*uboot)();
+ /* Load u-boot */
+ nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
+ CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+ spl_parse_image_header(header);
+ nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
+ spl_image.size, (void *)spl_image.load_addr);
+ nand_deselect();
}
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index fe28278..34aac8c 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -222,7 +222,6 @@
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_SPL_NAND_SIMPLE
-#define CONFIG_SPL_NAND_LOAD
#define CONFIG_SYS_NAND_HW_ECC_OOBFIRST
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_POST_MEM_SUPPORT
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 838e572..5f2aa62 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -63,7 +63,6 @@
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_SPL_NAND_SIMPLE
-#define CONFIG_SPL_NAND_LOAD
#define CONFIG_SPL_LIBGENERIC_SUPPORT /* for udelay and __div64_32 for NAND */
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_LDSCRIPT "board/$(BOARDDIR)/u-boot-spl-hawk.lds"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 19/19] SPL: Enhance spi_spl_load to match the other load functions
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (17 preceding siblings ...)
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 ` Tom Rini
2012-08-23 5:18 ` [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Prabhakar Lad
` (3 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Tom Rini @ 2012-08-22 23:19 UTC (permalink / raw)
To: u-boot
Signed-off-by: Tom Rini <trini@ti.com>
---
common/spl/spl.c | 4 ++--
drivers/mtd/spi/spi_spl_load.c | 23 ++++++++++++-----------
include/spl.h | 2 +-
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index d8ade27..dcf8556 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -177,8 +177,8 @@ void board_init_r(gd_t *id, ulong dummy)
#endif
#ifdef CONFIG_SPL_SPI_SUPPORT
case BOOT_DEVICE_SPI:
- spi_boot();
- break;
+ spl_spi_load_image();
+ break;
#endif
default:
puts("SPL: Un-supported Boot Device\n");
diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c
index 1aa30ac..d4f81f2 100644
--- a/drivers/mtd/spi/spi_spl_load.c
+++ b/drivers/mtd/spi/spi_spl_load.c
@@ -24,16 +24,17 @@
#include <common.h>
#include <spi_flash.h>
+#include <spl.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)
+void spl_spi_load_image(void)
{
struct spi_flash *flash;
- void (*uboot)(void) __noreturn;
+ struct image_header *header;
/*
* Load U-Boot image from SPI flash into RAM
@@ -42,17 +43,17 @@ void spi_boot(void)
flash = spi_flash_probe(CONFIG_SPL_SPI_BUS, CONFIG_SPL_SPI_CS,
CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3);
if (!flash) {
- puts("failed.\n");
+ puts("SPI probe failed.\n");
hang();
}
- spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,
- CONFIG_SYS_SPI_U_BOOT_SIZE,
- (void *) CONFIG_SYS_TEXT_BASE);
+ /* use CONFIG_SYS_TEXT_BASE as temporary storage area */
+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
- /*
- * Jump to U-Boot image
- */
- uboot = (void *) CONFIG_SYS_TEXT_BASE;
- (*uboot)();
+ /* Load u-boot, mkimage header is 64 bytes. */
+ spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40,
+ (void *) header);
+ spl_parse_image_header(header);
+ spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,
+ spl_image.size, (void *)spl_image.load_addr);
}
diff --git a/include/spl.h b/include/spl.h
index 83e9f21..3b3051f 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -62,7 +62,7 @@ void spl_mmc_load_image(void);
void spl_ymodem_load_image(void);
/* SPI SPL functions */
-void spi_boot(void);
+void spl_spi_load_image(void);
#ifdef CONFIG_SPL_BOARD_INIT
void spl_board_init(void);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (18 preceding siblings ...)
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 ` Prabhakar Lad
2012-08-23 11:22 ` Stefan Roese
` (2 subsequent siblings)
22 siblings, 0 replies; 28+ messages in thread
From: Prabhakar Lad @ 2012-08-23 5:18 UTC (permalink / raw)
To: u-boot
Hi Tom,
Thanks for the patches.
On Thursday 23 August 2012 04:49 AM, Tom Rini wrote:
> Hey all,
>
> The following patch series merges the davinci and omap-common SPL
> frameworks into a single framework, CONFIG_SPL_FRAMEWORK along with a
> few small cleanups to the code to make it a little smaller and more
> flexible. The end result is that davinci can now opt in on
> SPL-boots-Linux by just setting the right defines and other platforms
> would just need to adapt to this framework. In my testing, davinci
> gains between 300 and 700 bytes for this (not enabling the SPL OS
> feature) and omap4/5/etc lose just a little bit (from the printf->puts
> changes). I've tested this on omap3_beagle (xM and classic) and
> omap4_panda. I don't have any davinci platforms that were previously
> using SPL so I can't boot-test those changes but since everyone sets
> CONFIG_SPL_MAX_SIZE, we're OK in that department.
>
> To make this series easier to test I've placed it on
> http://github.com/trini/u-boot WIP/spl-improvements
>
I tested the patchset on omap-l138 for SPI boot mode now the board comes
up and reset too works, no issues found as in v2.
The only problem is that I am not able to test other boot modes on it
recently there were patches added for da850 to support NAND spl, direct
NOR boot mode and MMC spl, this patches are pulled by Albert but not in
mainline yet.
Thx,
--Prabhakar
> I've looked a little into re-reducing the size and the biggest problem I
> see is that SPI a lot of informational prints that we don't need,
> strictly speaking, but are nice in a normal U-Boot context. I'm unsure
> of the best way to quiet these as I don't like the idea of sprinkling
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54303 and I'm sending
> another email to discuss that.
>
> --
> Tom
>
> Changes in v2:
> - Add
> - Add CONFIG_SYS_SPL_MALLOC_START / SIZE defines from Christian Riesch
> - Add arch/arm/cpu/arm926ejs/davinci/config.mk to build u-boot.ais
> - Fix checkpatch warning (u32* boot_params_ptr -> u32 *boot_params_ptr)
> - Place files into common/spl (due to gcc bug #54303) and include/spl.h
> - Reorder all of the patches that used to follow this to precede.
>
> Changes in v3:
> CONFIG_SPL_FRAMEWORK
> perform early init. Fixes the cannot reset problem.
> - Fix checkpatch.pl warning
> - Fix thinko, Nand -> SPI (spotted by Prabhakar Lad)
> - Make u-boot.ais use u-boot.img not u-boot.bin, now that it uses
> - Make use of board_init_f being a weak function now so that we can
> - Rename to README.da850, add more direct recovery method (Christian Riesch)
>
> Tom Rini (19):
> Makefile: Move SPL files to clobber, remove from clean
> spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORT
> omap-common: SPL: Add CONFIG_SPL_DISPLAY_PRINT / spl_display_print()
> omap-common: Fix typo in save_boot_params() in lowlevel_init.S
> ARM: SPL: Rename omap_boot_device to spl_boot_device
> ARM: SPL: Rename omap_boot_mode to spl_boot_mode()
> ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.c
> ARM: SPL: Only call mem_malloc_init if configured
> ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h>
> ARM: SPL: Make spl_mmc.c more generic
> ARM: SPL: Clean up spl.c / spl_nand.c slightly
> ARM: SPL: Start hooking in the current SPI SPL support
> ARM: SPL: Move gpmc_init() to spl_board_init()
> SPL: Move the omap SPL framework to common/spl
> spl: Make CONFIG_SPL_FRAMEWORK board_init_f __weak
> ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK
> da850: Add README.da850
> SPL: Enhance drivers/mtd/nand/nand_spl_load.c
> SPL: Enhance spi_spl_load to match the other load functions
>
> Makefile | 16 +--
> README | 9 ++
> arch/arm/cpu/arm926ejs/davinci/config.mk | 16 +++
> arch/arm/cpu/arm926ejs/davinci/spl.c | 56 ++++------
> arch/arm/cpu/armv7/am33xx/board.c | 2 +-
> arch/arm/cpu/armv7/omap-common/Makefile | 13 ---
> arch/arm/cpu/armv7/omap-common/boot-common.c | 27 ++++-
> arch/arm/cpu/armv7/omap-common/hwinit-common.c | 7 +-
> arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 6 +-
> arch/arm/cpu/armv7/omap-common/spl_nand.c | 111 --------------------
> arch/arm/cpu/armv7/omap3/board.c | 28 +++--
> arch/arm/include/asm/arch-am33xx/spl.h | 31 ++++++
> arch/arm/include/asm/arch-davinci/spl.h | 28 +++++
> arch/arm/include/asm/arch-omap3/spl.h | 34 ++++++
> arch/arm/include/asm/arch-omap4/spl.h | 35 ++++++
> arch/arm/include/asm/arch-omap4/sys_proto.h | 1 -
> arch/arm/include/asm/arch-omap5/spl.h | 35 ++++++
> arch/arm/include/asm/arch-omap5/sys_proto.h | 1 -
> arch/arm/include/asm/omap_common.h | 77 --------------
> arch/arm/include/asm/spl.h | 29 +++++
> board/davinci/da8xxevm/README.da850 | 62 +++++++++++
> board/overo/overo.c | 10 --
> common/spl/Makefile | 37 +++++++
> .../arm/cpu/armv7/omap-common => common/spl}/spl.c | 49 ++++-----
> .../armv7/omap-common => common/spl}/spl_ymodem.c | 3 +-
> doc/README.SPL | 1 -
> drivers/mmc/Makefile | 5 +
> .../armv7/omap-common => drivers/mmc}/spl_mmc.c | 24 ++---
> drivers/mtd/nand/Makefile | 7 +-
> drivers/mtd/nand/nand_spl_load.c | 89 +++++++++++-----
> drivers/mtd/spi/spi_spl_load.c | 23 ++--
> include/configs/am335x_evm.h | 1 +
> include/configs/am3517_crane.h | 2 +
> include/configs/am3517_evm.h | 2 +
> include/configs/cam_enc_4xx.h | 3 +-
> include/configs/da850evm.h | 5 +
> include/configs/devkit8000.h | 1 +
> include/configs/hawkboard.h | 3 +-
> include/configs/mcx.h | 2 +
> include/configs/omap3_beagle.h | 1 +
> include/configs/omap3_evm_common.h | 1 +
> include/configs/omap3_overo.h | 1 +
> include/configs/omap4_common.h | 2 +
> include/configs/omap5_evm.h | 2 +
> include/configs/tam3517-common.h | 2 +
> include/configs/tricorder.h | 1 +
> include/spl.h | 70 ++++++++++++
> spl/Makefile | 1 +
> 48 files changed, 614 insertions(+), 358 deletions(-)
> create mode 100644 arch/arm/cpu/arm926ejs/davinci/config.mk
> delete mode 100644 arch/arm/cpu/armv7/omap-common/spl_nand.c
> create mode 100644 arch/arm/include/asm/arch-am33xx/spl.h
> create mode 100644 arch/arm/include/asm/arch-davinci/spl.h
> create mode 100644 arch/arm/include/asm/arch-omap3/spl.h
> create mode 100644 arch/arm/include/asm/arch-omap4/spl.h
> create mode 100644 arch/arm/include/asm/arch-omap5/spl.h
> create mode 100644 arch/arm/include/asm/spl.h
> create mode 100644 board/davinci/da8xxevm/README.da850
> create mode 100644 common/spl/Makefile
> rename {arch/arm/cpu/armv7/omap-common => common/spl}/spl.c (85%)
> rename {arch/arm/cpu/armv7/omap-common => common/spl}/spl_ymodem.c (96%)
> rename {arch/arm/cpu/armv7/omap-common => drivers/mmc}/spl_mmc.c (91%)
> create mode 100644 include/spl.h
>
^ permalink raw reply [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (19 preceding siblings ...)
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
22 siblings, 0 replies; 28+ messages in thread
From: Stefan Roese @ 2012-08-23 11:22 UTC (permalink / raw)
To: u-boot
Hi Tom,
On 08/23/2012 01:19 AM, Tom Rini wrote:
> The following patch series merges the davinci and omap-common SPL
> frameworks into a single framework, CONFIG_SPL_FRAMEWORK along with a
> few small cleanups to the code to make it a little smaller and more
> flexible. The end result is that davinci can now opt in on
> SPL-boots-Linux by just setting the right defines and other platforms
> would just need to adapt to this framework. In my testing, davinci
> gains between 300 and 700 bytes for this (not enabling the SPL OS
> feature) and omap4/5/etc lose just a little bit (from the printf->puts
> changes). I've tested this on omap3_beagle (xM and classic) and
> omap4_panda. I don't have any davinci platforms that were previously
> using SPL so I can't boot-test those changes but since everyone sets
> CONFIG_SPL_MAX_SIZE, we're OK in that department.
>
> To make this series easier to test I've placed it on
> http://github.com/trini/u-boot WIP/spl-improvements
As you might have seen, I based my powerpc SPL NOR flash booting series
on this series (git repository):
http://www.mail-archive.com/u-boot at lists.denx.de/msg91443.html
Nice work, thanks.
So, for the generic SPL patches of your series:
Acked-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (20 preceding siblings ...)
2012-08-23 11:22 ` Stefan Roese
@ 2012-08-23 12:22 ` Stefano Babic
2012-08-23 12:33 ` Christian Riesch
22 siblings, 0 replies; 28+ messages in thread
From: Stefano Babic @ 2012-08-23 12:22 UTC (permalink / raw)
To: u-boot
On 23/08/2012 01:19, Tom Rini wrote:
> Hey all,
>
> The following patch series merges the davinci and omap-common SPL
> frameworks into a single framework, CONFIG_SPL_FRAMEWORK along with a
> few small cleanups to the code to make it a little smaller and more
> flexible. The end result is that davinci can now opt in on
> SPL-boots-Linux by just setting the right defines and other platforms
> would just need to adapt to this framework. In my testing, davinci
> gains between 300 and 700 bytes for this (not enabling the SPL OS
> feature) and omap4/5/etc lose just a little bit (from the printf->puts
> changes). I've tested this on omap3_beagle (xM and classic) and
> omap4_panda. I don't have any davinci platforms that were previously
> using SPL so I can't boot-test those changes but since everyone sets
> CONFIG_SPL_MAX_SIZE, we're OK in that department.
>
> To make this series easier to test I've placed it on
> http://github.com/trini/u-boot WIP/spl-improvements
>
> I've looked a little into re-reducing the size and the biggest problem I
> see is that SPI a lot of informational prints that we don't need,
> strictly speaking, but are nice in a normal U-Boot context. I'm unsure
> of the best way to quiet these as I don't like the idea of sprinkling
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54303 and I'm sending
> another email to discuss that.
>
Nice Work !
Tested on a MX35 board.
Acked-by: Stefano Babic <sbabic@denx.de>
Regards,
Stefano
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 28+ messages in thread* [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP
2012-08-22 23:19 [U-Boot] [PATCH v3 0/19] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
` (21 preceding siblings ...)
2012-08-23 12:22 ` Stefano Babic
@ 2012-08-23 12:33 ` Christian Riesch
22 siblings, 0 replies; 28+ messages in thread
From: Christian Riesch @ 2012-08-23 12:33 UTC (permalink / raw)
To: u-boot
Hi Tom,
On Thu, Aug 23, 2012 at 1:19 AM, Tom Rini <trini@ti.com> wrote:
> Hey all,
>
> The following patch series merges the davinci and omap-common SPL
> frameworks into a single framework, CONFIG_SPL_FRAMEWORK along with a
> few small cleanups to the code to make it a little smaller and more
> flexible. The end result is that davinci can now opt in on
> SPL-boots-Linux by just setting the right defines and other platforms
> would just need to adapt to this framework. In my testing, davinci
> gains between 300 and 700 bytes for this (not enabling the SPL OS
> feature) and omap4/5/etc lose just a little bit (from the printf->puts
> changes). I've tested this on omap3_beagle (xM and classic) and
> omap4_panda. I don't have any davinci platforms that were previously
> using SPL so I can't boot-test those changes but since everyone sets
> CONFIG_SPL_MAX_SIZE, we're OK in that department.
>
> To make this series easier to test I've placed it on
> http://github.com/trini/u-boot WIP/spl-improvements
>
> I've looked a little into re-reducing the size and the biggest problem I
> see is that SPI a lot of informational prints that we don't need,
> strictly speaking, but are nice in a normal U-Boot context. I'm unsure
> of the best way to quiet these as I don't like the idea of sprinkling
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54303 and I'm sending
> another email to discuss that.
>
> --
> Tom
>
> Changes in v2:
> - Add
> - Add CONFIG_SYS_SPL_MALLOC_START / SIZE defines from Christian Riesch
> - Add arch/arm/cpu/arm926ejs/davinci/config.mk to build u-boot.ais
> - Fix checkpatch warning (u32* boot_params_ptr -> u32 *boot_params_ptr)
> - Place files into common/spl (due to gcc bug #54303) and include/spl.h
> - Reorder all of the patches that used to follow this to precede.
>
> Changes in v3:
> CONFIG_SPL_FRAMEWORK
> perform early init. Fixes the cannot reset problem.
Tested it on the LogicPD AM1808 experimenter's kit, works fine now :-)
Thanks!
Christian
> - Fix checkpatch.pl warning
> - Fix thinko, Nand -> SPI (spotted by Prabhakar Lad)
> - Make u-boot.ais use u-boot.img not u-boot.bin, now that it uses
> - Make use of board_init_f being a weak function now so that we can
> - Rename to README.da850, add more direct recovery method (Christian Riesch)
>
^ permalink raw reply [flat|nested] 28+ messages in thread