diff mbox

[U-Boot,7/7] da850/omap-l138: add support for direct NOR boot mode

Message ID 1338561049-23627-8-git-send-email-prabhakar.lad@ti.com
State Changes Requested
Delegated to: Tom Rini
Headers show

Commit Message

Prabhakar Lad June 1, 2012, 2:30 p.m. UTC 
From: Lad, Prabhakar <prabhakar.lad@ti.com>

This patch adds support for direct NOR boot mode on
da850/omap-l138.

Define the CONFIG_DIRECT_NOR_BOOT macro along with
CONFIG_USE_NOR in the DA850/OMAP-L138 configuration
file to enable this feature.

Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Signed-off-by: Hadli, Manjunath <manjunath.hadli@ti.com>
---
 include/configs/da850evm.h |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

Comments

Tom Rini June 4, 2012, 10:32 p.m. UTC | #1 
On Fri, Jun 01, 2012 at 08:00:49PM +0530, Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.lad@ti.com>
> 
> This patch adds support for direct NOR boot mode on
> da850/omap-l138.
> 
> Define the CONFIG_DIRECT_NOR_BOOT macro along with
> CONFIG_USE_NOR in the DA850/OMAP-L138 configuration
> file to enable this feature.

We should be using boards.cfg to add additional build targets that will
toggle CONFIG_DIRECT_NOR_BOOT and other cases where we can't have SW
that works in conflicting cases.
Prabhakar Lad June 6, 2012, 8:04 a.m. UTC | #2 
Hi Tom,
On Tue, Jun 05, 2012 at 04:02:01, Rini, Tom wrote:
> On Fri, Jun 01, 2012 at 08:00:49PM +0530, Prabhakar Lad wrote:
> > From: Lad, Prabhakar <prabhakar.lad@ti.com>
> > 
> > This patch adds support for direct NOR boot mode on da850/omap-l138.
> > 
> > Define the CONFIG_DIRECT_NOR_BOOT macro along with CONFIG_USE_NOR in 
> > the DA850/OMAP-L138 configuration file to enable this feature.
> 
> We should be using boards.cfg to add additional build targets that will toggle CONFIG_DIRECT_NOR_BOOT and other cases where we can't have SW that works in conflicting cases.
Ok I'll add a new entry in boards.cfg.

Thx,
--Prabhakar Lad

> 
> --
> Tom
>
diff mbox

Patch

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index f33eba8..5c373bc 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -24,6 +24,13 @@ 
 #define __CONFIG_H
 
 /*
+ * Define this when NOR U-Boot is loaded directly from flash as it
+ * must perform all the low level initialization itself.
+ *
+#define CONFIG_DIRECT_NOR_BOOT
+*/
+
+/*
  * Board
  */
 #define CONFIG_DRIVER_TI_EMAC
@@ -43,10 +50,19 @@ 
 #define CONFIG_SYS_TIMERBASE		DAVINCI_TIMER0_BASE
 #define CONFIG_SYS_HZ_CLOCK		clk_get(DAVINCI_AUXCLK_CLKID)
 #define CONFIG_SYS_HZ			1000
-#define CONFIG_SYS_TEXT_BASE		0xc1080000
 #define CONFIG_SYS_DA850_PLL_INIT
 #define CONFIG_SYS_DA850_DDR_INIT
 
+#ifdef CONFIG_DIRECT_NOR_BOOT
+#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_DA8XX_GPIO
+#define CONFIG_SYS_TEXT_BASE		0x60000000
+#define CONFIG_SYS_DV_NOR_BOOT_CFG	(0x11)
+#define CONFIG_DA850_LOWLEVEL
+#else
+#define CONFIG_SYS_TEXT_BASE		0xc1080000
+#endif
+
 /*
  * Memory Info
  */
@@ -373,6 +389,7 @@ 
 #define CONFIG_SYS_SPI_U_BOOT_SIZE	0x30000
 #endif
 
+#ifndef CONFIG_USE_NOR
 /* defines for SPL */
 #define CONFIG_SPL
 #define CONFIG_SPL_SERIAL_SUPPORT
@@ -382,9 +399,16 @@ 
 #define CONFIG_SPL_STACK	0x8001ff00
 #define CONFIG_SPL_TEXT_BASE	0x80000000
 #define CONFIG_SPL_MAX_SIZE	32768
+#endif
+
 /* additions for new relocation code, must added to all boards */
 #define CONFIG_SYS_SDRAM_BASE		0xc0000000
+
+#ifdef CONFIG_DIRECT_NOR_BOOT
+#define CONFIG_SYS_INIT_SP_ADDR		0x8001ff00
+#else
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
 					GENERATED_GBL_DATA_SIZE)
+#endif /* CONFIG_DIRECT_NOR_BOOT */
 
 #endif /* __CONFIG_H */