summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-03-03 23:52:36 +0000
committerThomas Martitz <kugel@rockbox.org>2010-03-03 23:52:36 +0000
commit9b810734f8251fabbecdcf68abdd598c3d4d7ffc (patch)
treecf4f17edc7af1c728acaa95cd92bb1b84eead688
parent617ff557e8f15c6ee644cee2654eac7d783e4faf (diff)
downloadrockbox-9b810734f8251fabbecdcf68abdd598c3d4d7ffc.tar.gz
rockbox-9b810734f8251fabbecdcf68abdd598c3d4d7ffc.zip
Really fix bootloaders now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25017 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config.h1
-rw-r--r--firmware/target/arm/crt0-pp.S2
-rw-r--r--firmware/target/arm/crt0.S2
3 files changed, 3 insertions, 2 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 51cf8c4f8f..ef72784ff7 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -749,6 +749,7 @@ Lyre prototype 1 */
749#endif 749#endif
750#if (defined(CPU_PP) || (CONFIG_CPU == AS3525)) && !defined(SIMULATOR) && !defined(BOOTLOADER) 750#if (defined(CPU_PP) || (CONFIG_CPU == AS3525)) && !defined(SIMULATOR) && !defined(BOOTLOADER)
751#define INIT_ATTR __attribute__ ((section(".init"))) 751#define INIT_ATTR __attribute__ ((section(".init")))
752#define HAVE_INIT_ATTR
752#else 753#else
753#define INIT_ATTR 754#define INIT_ATTR
754#endif 755#endif
diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/crt0-pp.S
index 4e16df0f7a..2b54ed4148 100644
--- a/firmware/target/arm/crt0-pp.S
+++ b/firmware/target/arm/crt0-pp.S
@@ -213,7 +213,7 @@ cpu_init:
213 strhi r5, [r3], #4 213 strhi r5, [r3], #4
214 bhi 1b 214 bhi 1b
215 215
216#ifdef INIT_ATTR 216#ifdef HAVE_INIT_ATTR
217 /* copy init code to codec buffer */ 217 /* copy init code to codec buffer */
218 ldr r2, =_initstart 218 ldr r2, =_initstart
219 ldr r3, =_initend 219 ldr r3, =_initend
diff --git a/firmware/target/arm/crt0.S b/firmware/target/arm/crt0.S
index 6284bcb16c..cb8242c72e 100644
--- a/firmware/target/arm/crt0.S
+++ b/firmware/target/arm/crt0.S
@@ -83,7 +83,7 @@ newstart:
83 83
84#endif 84#endif
85 85
86#ifdef INIT_ATTR 86#ifdef HAVE_INIT_ATTR
87 /* copy init data to codec buffer */ 87 /* copy init data to codec buffer */
88 /* must be done before bss is zeroed */ 88 /* must be done before bss is zeroed */
89 ldr r2, =_initcopy 89 ldr r2, =_initcopy