Remove STATICIRAM hack

It was only needed by the old arm toolchain that we no longer use or support.

Change-Id: Id0e6c67477f8834a637079b03cde5fbf9da68b1c
Reviewed-on: http://gerrit.rockbox.org/233
Reviewed-by: Nils Wallménius <nils@rockbox.org>

3 files changed, 7 insertions, 17 deletions

diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index f567a4bb8a..8dfc8d965d 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -205,7 +205,7 @@ static int set_multiple_mode(int sectors);
 static int set_features(void);
 
 #ifndef ATA_TARGET_POLLING
-STATICIRAM ICODE_ATTR int wait_for_bsy(void)
+static ICODE_ATTR int wait_for_bsy(void)
 {
     long timeout = current_tick + HZ*30;
     
@@ -220,7 +220,7 @@ STATICIRAM ICODE_ATTR int wait_for_bsy(void)
     return 0; /* timeout */
 }
 
-STATICIRAM ICODE_ATTR int wait_for_rdy(void)
+static ICODE_ATTR int wait_for_rdy(void)
 {
     long timeout;
 
@@ -244,7 +244,7 @@ STATICIRAM ICODE_ATTR int wait_for_rdy(void)
 #define wait_for_rdy    ata_wait_for_rdy
 #endif
 
-STATICIRAM ICODE_ATTR int wait_for_start_of_transfer(void)
+static ICODE_ATTR int wait_for_start_of_transfer(void)
 {
     if (!wait_for_bsy())
         return 0;
@@ -252,7 +252,7 @@ STATICIRAM ICODE_ATTR int wait_for_start_of_transfer(void)
     return (ATA_IN8(ATA_ALT_STATUS) & (STATUS_BSY|STATUS_DRQ)) == STATUS_DRQ;
 }
 
-STATICIRAM ICODE_ATTR int wait_for_end_of_transfer(void)
+static ICODE_ATTR int wait_for_end_of_transfer(void)
 {
     if (!wait_for_bsy())
         return 0;
@@ -275,7 +275,7 @@ static void ata_led(bool on)
 #endif
 
 #ifndef ATA_OPTIMIZED_READING
-STATICIRAM ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount)
+static ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount)
 {
     unsigned short tmp = 0;
 
@@ -307,7 +307,7 @@ STATICIRAM ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount)
 #endif /* !ATA_OPTIMIZED_READING */
 
 #ifndef ATA_OPTIMIZED_WRITING
-STATICIRAM ICODE_ATTR void copy_write_sectors(const unsigned char* buf,
+static ICODE_ATTR void copy_write_sectors(const unsigned char* buf,
                                               int wordcount)
 {
     if ( (unsigned long)buf & 1)
diff --git a/firmware/export/config.h b/firmware/export/config.h
index d85cf1e784..b642775b95 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -912,21 +912,11 @@ Lyre prototype 1 */
     && CONFIG_CPU != JZ4732 && CONFIG_CPU != AS3525v2 && CONFIG_CPU != IMX233
 #define PLUGIN_USE_IRAM
 #endif
-#if defined(CPU_ARM) && !defined(__ARM_EABI__)
-/* GCC quirk workaround: arm-elf-gcc treats static functions as short_call
- * when not compiling with -ffunction-sections, even when the function has
- * a section attribute.
- * This is fixed with eabi since all calls are short ones by default */
-#define STATICIRAM
-#else
-#define STATICIRAM static
-#endif
 #else
 #define ICODE_ATTR
 #define ICONST_ATTR
 #define IDATA_ATTR
 #define IBSS_ATTR
-#define STATICIRAM static
 #endif
 
 #if (defined(CPU_PP) || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) || \
diff --git a/firmware/target/arm/pp/ata-pp5020.c b/firmware/target/arm/pp/ata-pp5020.c
index 50a38cb23d..1fc302a60d 100644
--- a/firmware/target/arm/pp/ata-pp5020.c
+++ b/firmware/target/arm/pp/ata-pp5020.c
@@ -133,7 +133,7 @@ void ata_dma_set_mode(unsigned char mode) {
 /* This waits for an ATA interrupt using polling.
    In ATA_CONTROL, CONTROL_nIEN must be cleared.
  */
-STATICIRAM ICODE_ATTR int ata_wait_intrq(void)
+static ICODE_ATTR int ata_wait_intrq(void)
 {
     long timeout = current_tick + HZ*10;