From 4cb1029164efb6c19a10e98cba584f2db618a274 Mon Sep 17 00:00:00 2001 From: kugel Date: Wed, 3 Mar 2010 23:52:36 +0000 Subject: [PATCH] Really fix bootloaders now. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25017 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config.h | 1 + firmware/target/arm/crt0-pp.S | 2 +- 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 51cf8c4f8..ef72784ff 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 4e16df0f7..2b54ed414 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 6284bcb16..cb8242c72 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 -- 2.11.4.GIT