ARM sysless: Attempt to adjust bbconfig addresses to be compatible with LPC21xx.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/arch/arm/generic/defines/bbconf_info.h b/arch/arm/generic/defines/bbconf_info.h
index 385628ab564f4dce35b4aec1b4a3ed91fb41464f..7962816bcfadd912ff75324e2c9daa06b11be684 100644 (file)
--- a/arch/arm/generic/defines/bbconf_info.h
+++ b/arch/arm/generic/defines/bbconf_info.h
@@ -3,7 +3,10 @@
 
 #if 1 /* Provide FLASH start directly */
 
-#define BBCONF_FLASH_START 0x10000000
+/*FIXME: should not be provided directly*/
+#ifndef BBCONF_FLASH_START
+#define BBCONF_FLASH_START 0x00000000
+#endif
 
 #else /* FLASH start taken from ldscript */
 

diff --git a/arch/arm/generic/libs/misc/Makefile.omk b/arch/arm/generic/libs/misc/Makefile.omk
index 078e1634fc09a7756a30aedc56a296d9eaee4175..1201b225a1afd8e39c78bf6d01e5176dfa64d884 100644 (file)
--- a/arch/arm/generic/libs/misc/Makefile.omk
+++ b/arch/arm/generic/libs/misc/Makefile.omk
@@ -4,6 +4,6 @@ include_HEADERS = system_stub.h
 
 lib_LIBRARIES = arch
 
-arch_SOURCES = system_stub.c bbconf_info.c
+arch_SOURCES = bbconf_info.c
 
 lib_obj_SOURCES = system_stub.c

diff --git a/arch/arm/mach-lpc21xx/libs/hal/ivt.S b/arch/arm/mach-lpc21xx/libs/hal/ivt.S
index c51e7c708fe9177ddf93ed5f01a2f1e8cebf72eb..84ded7115c05c2f4176b0901c54cfca8e281aefa 100644 (file)
--- a/arch/arm/mach-lpc21xx/libs/hal/ivt.S
+++ b/arch/arm/mach-lpc21xx/libs/hal/ivt.S
@@ -35,17 +35,17 @@ DAbt_Addr:      .word   DAbt_Handler
 IRQ_Addr:       .word   irq_handler_resolver
 FIQ_Addr:       .word   FIQ_Handler
 
+__bbconf_magic_addr:
+       .word   BBCONF_MAGIC_VAL
+__bbconf_ptptr_addr:
+       .word   __bbconf_pt_addr
+
 Undef_Handler:  B       Undef_Handler
 SWI_Handler:    B       SWI_Handler
 PAbt_Handler:   B       PAbt_Handler
 DAbt_Handler:   B       DAbt_Handler
 FIQ_Handler:    B       FIQ_Handler
 
-__bbconf_magic_addr:
-       .word   BBCONF_MAGIC_VAL
-__bbconf_ptptr_addr:
-       .word   __bbconf_pt_addr
-
 #if defined(__thumb__)
 IRQ_Trampoline:
                sub     lr, lr, #4