This adds support for initializing MMC power from TWL6030 in SPL, which is required when the bootrom didn't power the MMC device yet and U-Boot is to be loaded from MMC (e.g. after setting boot mode from the SYS_BOOT pins in peripheral boot).

Signed-off-by: Paul Kocialkowski contact@paulk.fr --- board/ti/panda/panda.c | 2 +- include/configs/omap4_panda.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 13b5daf..ebab4e7 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -292,12 +292,12 @@ int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } +#endif

void board_mmc_power_init(void) { twl6030_power_mmc_init(0); } -#endif

#ifdef CONFIG_USB_EHCI

diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index ffa22c3..41991e0 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -33,6 +33,8 @@

#include <configs/ti_omap4_common.h>

+#define CONFIG_SPL_ABORT_ON_RAW_IMAGE + /* GPIO */

/* ENV related config options */

This reworks spl_set_header_raw_uboot to allow having both os boot (which comes with a valid header) and aborting when no valid header is found (thus excluding raw u-boot.bin images).

Signed-off-by: Paul Kocialkowski contact@paulk.fr --- common/spl/spl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c index b7ec333..e14ec80 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -129,10 +129,8 @@ int spl_parse_image_header(const struct image_header *header) * is bad, and thus should be skipped silently. */ panic("** no mkimage signature but raw image not supported"); -#elif defined(CONFIG_SPL_ABORT_ON_RAW_IMAGE) - /* Signature not found, proceed to other boot methods. */ - return -EINVAL; -#else +#endif + #ifdef CONFIG_SPL_OS_BOOT ulong start, end;

@@ -147,6 +145,11 @@ int spl_parse_image_header(const struct image_header *header) return 0; } #endif + +#ifdef CONFIG_SPL_ABORT_ON_RAW_IMAGE + /* Signature not found, proceed to other boot methods. */ + return -EINVAL; +#else /* Signature not found - assume u-boot.bin */ debug("mkimage signature not found - ih_magic = %x\n", header->ih_magic);