ARM: SPL: Make more generic, merge DaVinci and OMAP
Subsystems (6)
v3 cover ARM: SPL: Make more generic, merge DaVinci and OMAP
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.
- 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.hSignature · 1 line
1.7.9.5
PATCH v3 1/19 Makefile: Move SPL files to clobber, remove from clean
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
---
Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Makefile +6 -6
@@ -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
Signature · 1 line
1.7.9.5
PATCH v3 2/19 spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORT
In reply to Tom Rini---
arch/arm/cpu/armv7/omap-common/spl_mmc.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/cpu/armv7/omap-common/spl_mmc.c +4 -0
@@ -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 ();
Signature · 1 line
1.7.9.5
PATCH v3 3/19 omap-common: SPL: Add CONFIG_SPL_DISPLAY_PRINT / spl_display_print()
In reply to Tom RiniOnly 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.
---
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(-)
README +4 -0
@@ -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
arch/arm/cpu/armv7/omap-common/hwinit-common.c +5 -0
@@ -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 /*
arch/arm/cpu/armv7/omap-common/spl.c +3 -6
@@ -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 }
arch/arm/include/asm/arch-omap4/sys_proto.h +0 -1
@@ -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);
arch/arm/include/asm/arch-omap5/sys_proto.h +0 -1
@@ -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);
arch/arm/include/asm/omap_common.h +1 -1
@@ -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 );
board/overo/overo.c +0 -10
@@ -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 */
include/configs/omap4_common.h +1 -0
@@ -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
include/configs/omap5_evm.h +1 -0
@@ -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 */
Signature · 1 line
1.7.9.5
PATCH v3 4/19 omap-common: Fix typo in save_boot_params() in lowlevel_init.S
In reply to Tom Rini---
arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv7/omap-common/lowlevel_init.S +1 -1
@@ -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
Signature · 1 line
1.7.9.5
PATCH v3 5/19 ARM: SPL: Rename omap_boot_device to spl_boot_device
In reply to Tom Rini---
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(-)
arch/arm/cpu/armv7/omap-common/boot-common.c +1 -1
@@ -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); }
arch/arm/cpu/armv7/omap-common/lowlevel_init.S +2 -2
@@ -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
arch/arm/cpu/armv7/omap-common/spl.c +1 -1
@@ -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
arch/arm/cpu/armv7/omap-common/spl_mmc.c +1 -1
@@ -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 ;
arch/arm/cpu/armv7/omap3/board.c +2 -2
@@ -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; }
arch/arm/include/asm/omap_common.h +1 -1
@@ -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*/
Signature · 1 line
1.7.9.5
PATCH v3 6/19 ARM: SPL: Rename omap_boot_mode to spl_boot_mode()
In reply to Tom Rini---
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(-)
arch/arm/cpu/armv7/omap-common/boot-common.c +1 -1
@@ -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; }
arch/arm/cpu/armv7/omap-common/spl_mmc.c +1 -1
@@ -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);
arch/arm/cpu/armv7/omap-common/spl_nand.c +1 -1
@@ -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 ();
arch/arm/cpu/armv7/omap3/board.c +1 -1
@@ -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 :
arch/arm/include/asm/omap_common.h +1 -1
@@ -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);
Signature · 1 line
1.7.9.5
PATCH v3 7/19 ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.c
In reply to Tom RiniThis detection code doesn't (and can't) do anything currently, so remove.
---
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(-)
arch/arm/cpu/armv7/omap-common/spl_nand.c +3 -10
@@ -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 );
arch/arm/cpu/armv7/omap3/board.c +0 -3
@@ -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 ();
arch/arm/include/asm/omap_common.h +0 -1
@@ -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 3struct spl_image_info {const char *name;
Signature · 1 line
1.7.9.5
PATCH v3 8/19 ARM: SPL: Only call mem_malloc_init if configured
In reply to Tom RiniWe 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.
---
arch/arm/cpu/armv7/omap-common/spl.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/cpu/armv7/omap-common/spl.c +2 -0
@@ -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 ();
Signature · 1 line
1.7.9.5
PATCH v3 9/19 ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h>
In reply to Tom RiniMove 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.
---
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
arch/arm/cpu/armv7/am33xx/board.c +1 -1
@@ -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 ;
arch/arm/cpu/armv7/omap-common/hwinit-common.c +1 -1
@@ -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 ;
arch/arm/cpu/armv7/omap-common/spl.c +1 -1
@@ -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>
arch/arm/cpu/armv7/omap-common/spl_mmc.c +1 -0
@@ -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>
arch/arm/cpu/armv7/omap-common/spl_nand.c +1 -1
@@ -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 ) {
arch/arm/cpu/armv7/omap-common/spl_ymodem.c +1 -1
@@ -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
arch/arm/cpu/armv7/omap3/board.c +1 -0
@@ -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>
arch/arm/include/asm/arch-am33xx/spl.h new file +31 -0
@@ -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
arch/arm/include/asm/arch-omap3/spl.h new file +34 -0
@@ -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
arch/arm/include/asm/arch-omap4/spl.h new file +35 -0
@@ -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
arch/arm/include/asm/arch-omap5/spl.h new file +35 -0
@@ -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
arch/arm/include/asm/omap_common.h +0 -71
82 lines not on this page · raw message
arch/arm/include/asm/spl.h new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v3 10/19 ARM: SPL: Make spl_mmc.c more generic
In reply to Tom RiniMove 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>
---
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(-)
arch/arm/cpu/armv7/omap-common/boot-common.c +16 -0
@@ -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
arch/arm/cpu/armv7/omap-common/spl_mmc.c +0 -17
@@ -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;
arch/arm/cpu/armv7/omap3/board.c +15 -0
@@ -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
arch/arm/include/asm/omap_common.h +0 -5
@@ -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;
arch/arm/include/asm/spl.h +5 -0
@@ -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;
Signature · 1 line
1.7.9.5
PATCH v3 11/19 ARM: SPL: Clean up spl.c / spl_nand.c slightly
In reply to Tom Rini- 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.
---
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(-)
arch/arm/cpu/armv7/omap-common/spl.c +8 -15
@@ -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
arch/arm/cpu/armv7/omap-common/spl_nand.c +0 -1
@@ -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>
Signature · 1 line
1.7.9.5
PATCH v3 12/19 ARM: SPL: Start hooking in the current SPI SPL support
In reply to Tom Rini---
arch/arm/cpu/armv7/omap-common/spl.c | 5 +++++ arch/arm/include/asm/spl.h | 3 +++ 2 files changed, 8 insertions(+)
arch/arm/cpu/armv7/omap-common/spl.c +5 -0
@@ -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);
arch/arm/include/asm/spl.h +3 -0
@@ -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
Signature · 1 line
1.7.9.5
PATCH v3 13/19 ARM: SPL: Move gpmc_init() to spl_board_init()
In reply to Tom RiniThis 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.
---
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(-)
arch/arm/cpu/armv7/omap-common/boot-common.c +7 -0
@@ -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 ()) {
arch/arm/cpu/armv7/omap-common/spl_nand.c +0 -1
@@ -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 */
arch/arm/cpu/armv7/omap3/board.c +3 -0
@@ -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
include/configs/am3517_crane.h +1 -0
@@ -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 */
include/configs/am3517_evm.h +1 -0
@@ -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 */
include/configs/mcx.h +1 -0
@@ -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
include/configs/tam3517-common.h +1 -0
@@ -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
Signature · 1 line
1.7.9.5
PATCH v3 14/19 SPL: Move the omap SPL framework to common/spl
In reply to Tom RiniAdd 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.
---
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.hREADME +5 -0
@@ -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.
arch/arm/cpu/armv7/am33xx/board.c +1 -1
@@ -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 ;
arch/arm/cpu/armv7/omap-common/Makefile +0 -7
@@ -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
arch/arm/cpu/armv7/omap-common/boot-common.c +1 -1
@@ -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>
arch/arm/cpu/armv7/omap-common/hwinit-common.c +1 -1
@@ -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 ;
arch/arm/cpu/armv7/omap-common/spl_nand.c +1 -1
@@ -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>
arch/arm/cpu/armv7/omap3/board.c +1 -1
@@ -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>
arch/arm/include/asm/spl.h +0 -40
@@ -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
common/spl/Makefile new file +37 -0
@@ -0,0 +1,37 @@ +# +# (C) Copyright 2012 +# Texas Instruments Incorporated - http://www.ti.com/ +# Aneesh V <[email protected]> +# +# 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 + +#########################################################################
common/spl/spl.c renamed from arch/arm/cpu/armv7/omap-common/spl.c +2 -2
@@ -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*/
common/spl/spl_ymodem.c renamed from arch/arm/cpu/armv7/omap-common/spl_ymodem.c +1 -2
@@ -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
drivers/mmc/Makefile +5 -0
@@ -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
drivers/mmc/spl_mmc.c renamed from arch/arm/cpu/armv7/omap-common/spl_mmc.c +1 -1
@@ -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>
include/configs/am335x_evm.h +1 -0
@@ -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
include/configs/am3517_crane.h +1 -0
@@ -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
include/configs/am3517_evm.h +1 -0
@@ -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
include/configs/devkit8000.h +1 -0
@@ -305,6 +305,7 @@/* Defines for SPL */ #define CONFIG_SPL +#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_LIBCOMMON_SUPPORT
include/configs/mcx.h +1 -0
@@ -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
include/configs/omap3_beagle.h +1 -0
@@ -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 */
include/configs/omap3_evm_common.h +1 -0
@@ -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
include/configs/omap3_overo.h +1 -0
@@ -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 */
include/configs/omap4_common.h +1 -0
@@ -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
include/configs/omap5_evm.h +1 -0
@@ -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
include/configs/tam3517-common.h +1 -0
@@ -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
include/configs/tricorder.h +1 -0
@@ -275,6 +275,7 @@/* Defines for SPL */ #define CONFIG_SPL +#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_BOARD_INIT
include/spl.h new file +69 -0
69 lines not on this page · raw message
spl/Makefile +1 -0
@@ -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
Signature · 1 line
1.7.9.5
PATCH v3 15/19 spl: Make CONFIG_SPL_FRAMEWORK board_init_f __weak
In reply to Tom RiniSome 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.
---
common/spl/spl.c | 4 ++-- include/spl.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
common/spl/spl.c +2 -2
@@ -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
include/spl.h +1 -0
@@ -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 );
Signature · 1 line
1.7.9.5
PATCH v3 16/19 ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK
In reply to Tom Rini- 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.
---
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
Makefile +2 -2
@@ -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
arch/arm/cpu/arm926ejs/davinci/config.mk new file +16 -0
@@ -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
arch/arm/cpu/arm926ejs/davinci/spl.c +22 -34
85 lines not on this page · raw message
arch/arm/include/asm/arch-davinci/spl.h new file +28 -0
@@ -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
include/configs/cam_enc_4xx.h +2 -0
@@ -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
include/configs/da850evm.h +5 -0
@@ -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
include/configs/hawkboard.h +2 -0
@@ -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
Signature · 1 line
1.7.9.5
PATCH v3 16/19 ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK
Hi Tom,
Quoted 6 lines · Tom Rini
- Convert the non-relocation part of
board_init_ftospl_board_init, turn onCONFIG_SPL_BOARD_INITin the configs.
- Remove duplicated code.
- Addspl_boot_device()that returns the statically chosen boot device.Signed-off-by Tom Rini <[email protected]>
[...]
Quoted 78 lines
arch/arm/cpu/arm926ejs/davinci/spl.c +13
-32@@ -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 (); +}
arch/arm/cpu/arm926ejs/davinci/spl.c void putc(char c) · line 80
Quoted 10 lines
arch/arm/cpu/arm926ejs/davinci/spl.c +7
-2-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
Quoted 4 lines
arch/arm/cpu/arm926ejs/davinci/spl.c +2
-0+puts ("Unknown boot device\n" ); +hang ();#endif }
PATCH v3 16/19 ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK
Quoted 89 lines · Christian Riesch
Hi Tom,
Quoted 6 lines · Tom Rini
- Convert the non-relocation part of
board_init_ftospl_board_init, turn onCONFIG_SPL_BOARD_INITin the configs.
- Remove duplicated code.
- Addspl_boot_device()that returns the statically chosen boot device.Signed-off-by Tom Rini <[email protected]>[...]
Quoted 79 lines
arch/arm/cpu/arm926ejs/davinci/spl.c +13
-32@@ -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 (); +}
Quoted 12 lines
arch/arm/cpu/arm926ejs/davinci/spl.c void putc(char c) · line 80
Quoted 9 lines
arch/arm/cpu/arm926ejs/davinci/spl.c +7
-2-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.
Signature · 1 line
Tom
PATCH v3 17/19 da850: Add README.da850
In reply to Tom RiniThis 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.
---
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
board/davinci/da8xxevm/README.da850 new file +62 -0
@@ -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
Signature · 1 line
1.7.9.5
PATCH v3 17/19 da850: Add README.da850
Hi Tom,
Quoted 24 lines · Tom Rini
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 <[email protected]>---
Changes in v2:
- AddChanges 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.da850board/davinci/da8xxevm/README.da850 new file +0
-0
board/davinci/da8xxevm/README.da850 line 8
Quoted 8 lines
board/davinci/da8xxevm/README.da850 new file +8
-0@@ -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.
board/davinci/da8xxevm/README.da850
Quoted 12 lines
board/davinci/da8xxevm/README.da850 new file +12
-0+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 ...
Quoted 28 lines
loads
board/davinci/da8xxevm/README.da850 new file +27
-0+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 + +
board/davinci/da8xxevm/README.da850 line 57
Quoted 10 lines
board/davinci/da8xxevm/README.da850 new file +10
-0+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
Quoted 12 lines
board/davinci/da8xxevm/README.da850 new file +5
-1+ +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
PATCH v3 17/19 da850: Add README.da850
Quoted 43 lines · Christian Riesch
Hi Tom,
Quoted 24 lines · Tom Rini
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 <[email protected]>---
Changes in v2:
- AddChanges 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.da850board/davinci/da8xxevm/README.da850 new file +0
-0board/davinci/da8xxevm/README.da850 line 8
Quoted 8 lines
board/davinci/da8xxevm/README.da850 new file +8
-0@@ -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 willThe 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.
Quoted 7 lines
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.
Quoted 48 lines
board/davinci/da8xxevm/README.da850
Quoted 12 lines
board/davinci/da8xxevm/README.da850 new file +12
-0+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 ...
Quoted 33 lines
loads
board/davinci/da8xxevm/README.da850 new file +32
-0+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
Quoted 8 lines
board/davinci/da8xxevm/README.da850 line 57
Quoted 5 lines
board/davinci/da8xxevm/README.da850 new file +5
-0+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.
Signature · 1 line
Tom
PATCH v3 18/19 SPL: Enhance drivers/mtd/nand/nand_spl_load.c
In reply to Tom RiniTakes 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.
---
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
arch/arm/cpu/arm926ejs/davinci/spl.c +1 -1
@@ -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 ;
arch/arm/cpu/armv7/omap-common/Makefile +0 -6
@@ -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
arch/arm/cpu/armv7/omap-common/spl_nand.c deleted +0 -102
102 lines not on this page · raw message
doc/README.SPL +0 -1
@@ -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)
drivers/mtd/nand/Makefile +1 -6
@@ -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
drivers/mtd/nand/nand_spl_load.c +65 -24
101 lines not on this page · raw message
include/configs/cam_enc_4xx.h +0 -1
@@ -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
include/configs/hawkboard.h +0 -1
@@ -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"
Signature · 1 line
1.7.9.5
PATCH v3 19/19 SPL: Enhance spi_spl_load to match the other load functions
In reply to Tom Rini---
common/spl/spl.c | 4 ++-- drivers/mtd/spi/spi_spl_load.c | 23 ++++++++++++----------- include/spl.h | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-)
common/spl/spl.c +2 -2
@@ -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" );
drivers/mtd/spi/spi_spl_load.c +12 -11
@@ -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); }
include/spl.h +1 -1
@@ -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 );
Signature · 1 line
1.7.9.5
v3 cover ARM: SPL: Make more generic, merge DaVinci and OMAP
In reply to Tom RiniHi Tom,
Thanks for the patches.
Quoted 15 lines · Tom Rini
Hey all,
The following patch series merges the davinci and omap-common SPL frameworks into a single framework,
CONFIG_SPL_FRAMEWORKalong 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 theprintf->putschanges). I've tested this onomap3_beagle(xM and classic) andomap4_panda. I don't have any davinci platforms that were previously using SPL so I can't boot-test those changes but since everyone setsCONFIG_SPL_MAX_SIZE, we're OK in that department.
Quoted 3 lines
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
Quoted 112 lines
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.--
TomChanges in v2:
- Add
- AddCONFIG_SYS_SPL_MALLOC_START/ SIZE defines from Christian Riesch
- Addarch/arm/cpu/arm926ejs/davinci/config.mkto 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) andinclude/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 ofboard_init_fbeing 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 withCONFIG_SPL_FAT_SUPPORT
omap-common: SPL: AddCONFIG_SPL_DISPLAY_PRINT/spl_display_print()
omap-common: Fix typo insave_boot_params()inlowlevel_init.S
ARM: SPL: Renameomap_boot_devicetospl_boot_device
ARM: SPL: Renameomap_boot_modetospl_boot_mode()
ARM: SPL: RemoveNAND_MODE_HW_ECCfromspl_nand.c
ARM: SPL: Only callmem_malloc_initif configured
ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h>
ARM: SPL: Makespl_mmc.cmore generic
ARM: SPL: Clean upspl.c/spl_nand.cslightly
ARM: SPL: Start hooking in the current SPI SPL support
ARM: SPL: Movegpmc_init()tospl_board_init()
SPL: Move the omap SPL framework to common/spl
spl: MakeCONFIG_SPL_FRAMEWORKboard_init_f__weak
ARM: SPL: Convert davinci toCONFIG_SPL_FRAMEWORK
da850: Add README.da850
SPL: Enhancedrivers/mtd/nand/nand_spl_load.c
SPL: Enhancespi_spl_loadto match the other load functionsMakefile | 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
v3 cover ARM: SPL: Make more generic, merge DaVinci and OMAP
In reply to Tom RiniHi Tom,
Quoted 13 lines · Tom Rini
The following patch series merges the davinci and omap-common SPL frameworks into a single framework,
CONFIG_SPL_FRAMEWORKalong 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 theprintf->putschanges). I've tested this onomap3_beagle(xM and classic) andomap4_panda. I don't have any davinci platforms that were previously using SPL so I can't boot-test those changes but since everyone setsCONFIG_SPL_MAX_SIZE, we're OK in that department.
Quoted 2 lines
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:
Thanks,
Stefan
v3 cover ARM: SPL: Make more generic, merge DaVinci and OMAP
In reply to Tom RiniQuoted 18 lines · Tom Rini
Hey all,
The following patch series merges the davinci and omap-common SPL frameworks into a single framework,
CONFIG_SPL_FRAMEWORKalong 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 theprintf->putschanges). I've tested this onomap3_beagle(xM and classic) andomap4_panda. I don't have any davinci platforms that were previously using SPL so I can't boot-test those changes but since everyone setsCONFIG_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
Quoted 7 lines
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.
Regards,
Stefano
Signature · 5 lines
===================================================================== 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 =====================================================================
v3 cover ARM: SPL: Make more generic, merge DaVinci and OMAP
In reply to Tom RiniHi Tom,
Quoted 36 lines · Tom Rini
Hey all,
The following patch series merges the davinci and omap-common SPL frameworks into a single framework,
CONFIG_SPL_FRAMEWORKalong 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 theprintf->putschanges). I've tested this onomap3_beagle(xM and classic) andomap4_panda. I don't have any davinci platforms that were previously using SPL so I can't boot-test those changes but since everyone setsCONFIG_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-improvementsI'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.--
TomChanges in v2:
- Add
- AddCONFIG_SYS_SPL_MALLOC_START/ SIZE defines from Christian Riesch
- Addarch/arm/cpu/arm926ejs/davinci/config.mkto 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) andinclude/spl.h
- Reorder all of the patches that used to follow this to precede.
Quoted 3 lines
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
Quoted 6 lines
- 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 ofboard_init_fbeing a weak function now so that we can
- Rename to README.da850, add more direct recovery method (Christian Riesch)