From b4eec0dd420aa6982dcdcce794bcaa4a6dac8ef5 Mon Sep 17 00:00:00 2001
From: Michael Sevakis <jethead71@rockbox.org>
Date: Tue, 1 May 2012 01:26:22 -0400
Subject: Make INITDATA_ATTR work on everything that has INIT_ATTR enabled for
 code.

Change-Id: If9936bfbbd3bc3eb2a3e3e290701b8517eabfb13
---
 firmware/target/arm/as3525/app.lds  | 2 +-
 firmware/target/arm/imx233/app.lds  | 2 +-
 firmware/target/arm/imx31/app.lds   | 1 -
 firmware/target/arm/ipod/app.lds    | 2 +-
 firmware/target/arm/iriver/app.lds  | 2 +-
 firmware/target/arm/olympus/app.lds | 2 +-
 firmware/target/arm/pbell/app.lds   | 2 +-
 firmware/target/arm/philips/app.lds | 2 +-
 firmware/target/arm/samsung/app.lds | 2 +-
 firmware/target/arm/sandisk/app.lds | 2 +-
 lib/rbcodec/dsp/dsp_core.c          | 2 +-
 11 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/firmware/target/arm/as3525/app.lds b/firmware/target/arm/as3525/app.lds
index c2fce0dcec..546aabbf4e 100644
--- a/firmware/target/arm/as3525/app.lds
+++ b/firmware/target/arm/as3525/app.lds
@@ -105,7 +105,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         _initend = .;
     } AT> DRAM
 
diff --git a/firmware/target/arm/imx233/app.lds b/firmware/target/arm/imx233/app.lds
index 1dc929c778..89cf33b385 100644
--- a/firmware/target/arm/imx233/app.lds
+++ b/firmware/target/arm/imx233/app.lds
@@ -74,7 +74,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         . = ALIGN(0x4);
         _initend = .;
     } AT> DRAM
diff --git a/firmware/target/arm/imx31/app.lds b/firmware/target/arm/imx31/app.lds
index efa1d35a30..fe6cafb59f 100644
--- a/firmware/target/arm/imx31/app.lds
+++ b/firmware/target/arm/imx31/app.lds
@@ -100,7 +100,6 @@ SECTIONS
         . = ALIGN(4);
         _initstart = .;
         *(.init*)
-        *(.initdata*)
         _initend = .;
     } > INIT AT> DRAM
 
diff --git a/firmware/target/arm/ipod/app.lds b/firmware/target/arm/ipod/app.lds
index a5d59f82f5..258f296a85 100644
--- a/firmware/target/arm/ipod/app.lds
+++ b/firmware/target/arm/ipod/app.lds
@@ -117,7 +117,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         _initend = .;
     } AT> DRAM
 
diff --git a/firmware/target/arm/iriver/app.lds b/firmware/target/arm/iriver/app.lds
index 9e362bbd74..30e5962b82 100644
--- a/firmware/target/arm/iriver/app.lds
+++ b/firmware/target/arm/iriver/app.lds
@@ -117,7 +117,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         _initend = .;
     } AT> DRAM
 
diff --git a/firmware/target/arm/olympus/app.lds b/firmware/target/arm/olympus/app.lds
index 9e362bbd74..30e5962b82 100644
--- a/firmware/target/arm/olympus/app.lds
+++ b/firmware/target/arm/olympus/app.lds
@@ -117,7 +117,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         _initend = .;
     } AT> DRAM
 
diff --git a/firmware/target/arm/pbell/app.lds b/firmware/target/arm/pbell/app.lds
index 9e362bbd74..30e5962b82 100644
--- a/firmware/target/arm/pbell/app.lds
+++ b/firmware/target/arm/pbell/app.lds
@@ -117,7 +117,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         _initend = .;
     } AT> DRAM
 
diff --git a/firmware/target/arm/philips/app.lds b/firmware/target/arm/philips/app.lds
index 9e362bbd74..30e5962b82 100644
--- a/firmware/target/arm/philips/app.lds
+++ b/firmware/target/arm/philips/app.lds
@@ -117,7 +117,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         _initend = .;
     } AT> DRAM
 
diff --git a/firmware/target/arm/samsung/app.lds b/firmware/target/arm/samsung/app.lds
index 9e362bbd74..30e5962b82 100644
--- a/firmware/target/arm/samsung/app.lds
+++ b/firmware/target/arm/samsung/app.lds
@@ -117,7 +117,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         _initend = .;
     } AT> DRAM
 
diff --git a/firmware/target/arm/sandisk/app.lds b/firmware/target/arm/sandisk/app.lds
index ffc4cf887c..a4b68ba994 100644
--- a/firmware/target/arm/sandisk/app.lds
+++ b/firmware/target/arm/sandisk/app.lds
@@ -114,7 +114,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _initstart = .;
-        *(.init)
+        *(.init*)
         _initend = .;
     } AT> DRAM
 
diff --git a/lib/rbcodec/dsp/dsp_core.c b/lib/rbcodec/dsp/dsp_core.c
index 4a7c478e46..44e53eb891 100644
--- a/lib/rbcodec/dsp/dsp_core.c
+++ b/lib/rbcodec/dsp/dsp_core.c
@@ -528,7 +528,7 @@ bool dsp_is_busy(const struct dsp_config *dsp)
  * Must be done before changing settings for the first time. */
 void INIT_ATTR dsp_init(void)
 {
-    static const uint8_t slot_count[DSP_COUNT] /* INITDATA_ATTR */ =
+    static const uint8_t slot_count[DSP_COUNT] INITDATA_ATTR =
     {
         [CODEC_IDX_AUDIO] = DSP_NUM_PROC_STAGES,
         [CODEC_IDX_VOICE] = DSP_VOICE_NUM_PROC_STAGES
-- 
cgit v1.2.3