diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-03-03 23:52:36 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-03-03 23:52:36 +0000 |
| commit | 9b810734f8251fabbecdcf68abdd598c3d4d7ffc (patch) | |
| tree | cf4f17edc7af1c728acaa95cd92bb1b84eead688 | |
| parent | 617ff557e8f15c6ee644cee2654eac7d783e4faf (diff) | |
| download | rockbox-9b810734f8251fabbecdcf68abdd598c3d4d7ffc.zip rockbox-9b810734f8251fabbecdcf68abdd598c3d4d7ffc.tar.gz rockbox-9b810734f8251fabbecdcf68abdd598c3d4d7ffc.tar.bz2 rockbox-9b810734f8251fabbecdcf68abdd598c3d4d7ffc.tar.xz | |
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.h | 1 | ||||
| -rw-r--r-- | firmware/target/arm/crt0-pp.S | 2 | ||||
| -rw-r--r-- | firmware/target/arm/crt0.S | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 51cf8c4..ef72784 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -749,6 +749,7 @@ Lyre prototype 1 */ #endif #if (defined(CPU_PP) || (CONFIG_CPU == AS3525)) && !defined(SIMULATOR) && !defined(BOOTLOADER) #define INIT_ATTR __attribute__ ((section(".init"))) +#define HAVE_INIT_ATTR #else #define INIT_ATTR #endif diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/crt0-pp.S index 4e16df0..2b54ed4 100644 --- a/firmware/target/arm/crt0-pp.S +++ b/firmware/target/arm/crt0-pp.S @@ -213,7 +213,7 @@ cpu_init: strhi r5, [r3], #4 bhi 1b -#ifdef INIT_ATTR +#ifdef HAVE_INIT_ATTR /* copy init code to codec buffer */ ldr r2, =_initstart ldr r3, =_initend diff --git a/firmware/target/arm/crt0.S b/firmware/target/arm/crt0.S index 6284bcb..cb8242c 100644 --- a/firmware/target/arm/crt0.S +++ b/firmware/target/arm/crt0.S @@ -83,7 +83,7 @@ newstart: #endif -#ifdef INIT_ATTR +#ifdef HAVE_INIT_ATTR /* copy init data to codec buffer */ /* must be done before bss is zeroed */ ldr r2, =_initcopy |