[U-Boot] [PATCH 0/2] devkit8000: add spl mmc boot

[U-Boot] [PATCH 0/2] devkit8000: add spl mmc boot

[Simon Schwarz]

Add MMC booting to devkit8000 SPL.

Based on: u-boot-ti/next

Simon Schwarz (2):
  devkit8000: protect board_mmc_init
  devkit8000: Add config to enable SPL MMC boot

 board/timll/devkit8000/devkit8000.c |    2 +-
 include/configs/devkit8000.h        |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

-- 
1.7.4.1

[U-Boot] [PATCH 1/2] devkit8000: protect board_mmc_init

[Simon Schwarz]

This function is also defined in omap-common/spl_mmc.de so the implementation
in devkit8000.c was protected by a ifdef.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
---
 board/timll/devkit8000/devkit8000.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 9124569..dc99afb 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -125,7 +125,7 @@ void set_muxconf_regs(void)
 	MUX_DEVKIT8000();
 }
 
-#ifdef CONFIG_GENERIC_MMC
+#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
 int board_mmc_init(bd_t *bis)
 {
 	omap_mmc_init(0);
-- 
1.7.4.1

[U-Boot] [PATCH 1/2] devkit8000: protect board_mmc_init

[Albert ARIBAUD]

Hi Simon,

Le 30/09/2011 12:41, Simon Schwarz a ?crit :
> This function is also defined in omap-common/spl_mmc.de so the implementation
> in devkit8000.c was protected by a ifdef.
>
> Signed-off-by: Simon Schwarz<simonschwarzcor@gmail.com>
> ---
>   board/timll/devkit8000/devkit8000.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
> index 9124569..dc99afb 100644
> --- a/board/timll/devkit8000/devkit8000.c
> +++ b/board/timll/devkit8000/devkit8000.c
> @@ -125,7 +125,7 @@ void set_muxconf_regs(void)
>   	MUX_DEVKIT8000();
>   }
>
> -#ifdef CONFIG_GENERIC_MMC
> +#if defined(CONFIG_GENERIC_MMC)&&  !defined(CONFIG_SPL_BUILD)
>   int board_mmc_init(bd_t *bis)
>   {
>   	omap_mmc_init(0);

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.

[U-Boot] [PATCH 2/2] devkit8000: Add config to enable SPL MMC boot

[Simon Schwarz]

Add MMC boot configs to devkit8000 config.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
---
 include/configs/devkit8000.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 5d1014b..cb68169 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -325,7 +325,12 @@
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_MMC_SUPPORT
+#define CONFIG_SPL_FAT_SUPPORT
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME        "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION    1
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
 
 #define CONFIG_SPL_TEXT_BASE		0x40200000 /*CONFIG_SYS_SRAM_START*/
 #define CONFIG_SPL_MAX_SIZE		0xB400  /* 45 K */
-- 
1.7.4.1

[U-Boot] [PATCH 2/2] devkit8000: Add config to enable SPL MMC boot

[Albert ARIBAUD]

Hi Simon,

Le 30/09/2011 12:41, Simon Schwarz a ?crit :
> Add MMC boot configs to devkit8000 config.
>
> Signed-off-by: Simon Schwarz<simonschwarzcor@gmail.com>
> ---
>   include/configs/devkit8000.h |    5 +++++
>   1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
> index 5d1014b..cb68169 100644
> --- a/include/configs/devkit8000.h
> +++ b/include/configs/devkit8000.h
> @@ -325,7 +325,12 @@
>   #define CONFIG_SPL_SERIAL_SUPPORT
>   #define CONFIG_SPL_POWER_SUPPORT
>   #define CONFIG_SPL_NAND_SUPPORT
> +#define CONFIG_SPL_MMC_SUPPORT
> +#define CONFIG_SPL_FAT_SUPPORT
>   #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
> +#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME        "u-boot.img"
> +#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION    1
> +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
>
>   #define CONFIG_SPL_TEXT_BASE		0x40200000 /*CONFIG_SYS_SRAM_START*/
>   #define CONFIG_SPL_MAX_SIZE		0xB400  /* 45 K */

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.