Signed-off-by: Christian Riesch <christian.rie...@omicron.at>
Cc: Heiko Schocher <h...@denx.de>
Cc: Sandeep Paulraj <s-paul...@ti.com>
---
 arch/arm/cpu/arm926ejs/davinci/Makefile |    3 ++-
 arch/arm/cpu/arm926ejs/davinci/spl.c    |   11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/davinci/Makefile 
b/arch/arm/cpu/arm926ejs/davinci/Makefile
index 2105ec5..99df0df 100644
--- a/arch/arm/cpu/arm926ejs/davinci/Makefile
+++ b/arch/arm/cpu/arm926ejs/davinci/Makefile
@@ -37,7 +37,8 @@ COBJS-$(CONFIG_DRIVER_TI_EMAC)        += lxt972.o dp83848.o 
et1011c.o ksz8873.o
 
 ifdef CONFIG_SPL_BUILD
 COBJS-y        += spl.o
-COBJS-y        += dm365_lowlevel.o
+COBJS-$(CONFIG_SOC_DM365)      += dm365_lowlevel.o
+COBJS-$(CONFIG_SOC_DA8XX)      += da850_lowlevel.o
 endif
 
 SOBJS  = reset.o
diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c 
b/arch/arm/cpu/arm926ejs/davinci/spl.c
index d9b9398..bb4ee13 100644
--- a/arch/arm/cpu/arm926ejs/davinci/spl.c
+++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
@@ -50,14 +50,23 @@ inline void hang(void)
 
 void board_init_f(ulong dummy)
 {
+#ifdef CONFIG_SOC_DM365
        dm36x_lowlevel_init(0);
+#endif
+#ifdef CONFIG_SOC_DA8XX
+       arch_cpu_init();
+#endif
        relocate_code(CONFIG_SPL_STACK, NULL, CONFIG_SPL_TEXT_BASE);
 }
 
 void board_init_r(gd_t *id, ulong dummy)
 {
-
+#ifdef CONFIG_SOC_DM365
        nand_init();
        puts("Nand boot...\n");
        nand_boot();
+#endif
+#ifdef CONFIG_SOC_DA8XX
+       hang();
+#endif
 }
-- 
1.7.0.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to