Skip to contentSkip to conversation

devkit8000: add spl mmc boot

PATCH New Simon Schwarz 2 participants 5 messages Sep 30, 2011 – Oct 14, 2011

lore
Share & tools
lore
#0 lore raw

cover devkit8000: add spl mmc boot

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(-)
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/2 devkit8000: protect board_mmc_init

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

---
 board/timll/devkit8000/devkit8000.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
board/timll/devkit8000/devkit8000.c +1 -1
index 9124569..dc99afb 100644
@@ -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);
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 1/2 devkit8000: protect board_mmc_init

Hi Simon,

Le 30/09/2011 12:41, Simon Schwarz a ?crit :

Quoted 13 lines

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

---
  board/timll/devkit8000/devkit8000.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
board/timll/devkit8000/devkit8000.c +0 -0
index 9124569..dc99afb 100644

board/timll/devkit8000/devkit8000.c void set_muxconf_regs(void) · line 131

Quoted 8 lines
board/timll/devkit8000/devkit8000.c +1 -1
@@ -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,

Signature · 1 line
Albert.
#3 lore raw

PATCH 2/2 devkit8000: Add config to enable SPL MMC boot

In reply to Simon Schwarz

Add MMC boot configs to devkit8000 config.

---
 include/configs/devkit8000.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
include/configs/devkit8000.h +5 -0
index 5d1014b..cb68169 100644
@@ -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 */
Signature · 1 line
1.7.4.1
#4 lore raw

PATCH 2/2 devkit8000: Add config to enable SPL MMC boot

Hi Simon,

Le 30/09/2011 12:41, Simon Schwarz a ?crit :

Quoted 14 lines

Add MMC boot configs to devkit8000 config.

---
  include/configs/devkit8000.h |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
include/configs/devkit8000.h +0 -0
index 5d1014b..cb68169 100644
@@ -325,7 +325,12 @@
  #define CONFIG_SPL_SERIAL_SUPPORT
  #define CONFIG_SPL_POWER_SUPPORT

include/configs/devkit8000.h line 336

Quoted 10 lines
include/configs/devkit8000.h +5 -0
  #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,

Signature · 1 line
Albert.