summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2011-09-14 19:59:37 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-09-30 22:00:59 +0200
commit337c4333834f9aa7f7a31391ca1bef01ade2ed9c (patch)
treeeb30516fbdde4e1c90c5df34d8e42a99a931cb71 /arch/arm
parenta29318181918c1c78ae298b8a6475ff60fa36721 (diff)
downloadu-boot-imx-337c4333834f9aa7f7a31391ca1bef01ade2ed9c.zip
u-boot-imx-337c4333834f9aa7f7a31391ca1bef01ade2ed9c.tar.gz
u-boot-imx-337c4333834f9aa7f7a31391ca1bef01ade2ed9c.tar.bz2
arm, davinci: add NOR Boot Configuration Word
to add the "NOR Boot Configuration Word" on AM18xx based boards, define CONFIG_SYS_DV_NOR_BOOT_CFG. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Paulraj Sandeep <s-paulraj@ti.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/arm926ejs/start.S9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index d164d6d..5e30745 100644
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -51,9 +51,18 @@
*/
+#ifdef CONFIG_SYS_DV_NOR_BOOT_CFG
.globl _start
_start:
+.globl _NOR_BOOT_CFG
+_NOR_BOOT_CFG:
+ .word CONFIG_SYS_DV_NOR_BOOT_CFG
b reset
+#else
+.globl _start
+_start:
+ b reset
+#endif
#ifdef CONFIG_SPL_BUILD
/* No exception handlers in preloader */
ldr pc, _hang