carl9170 firmware: replace already defined __section with __in_section

newlib already provides __section... and unfortunately it differs
from our own. This commit introduces a new define __in_section for
now.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/include/rom.h b/carlfw/include/rom.h
index 922c5c837b11e25d4243ddca9bcaa13527b1b017..5abb5b60b6b1becfb51c52ed93a515ef11b3fb92 100644 (file)
--- a/carlfw/include/rom.h
+++ b/carlfw/include/rom.h
@@ -77,6 +77,6 @@ struct ar9170_rom {
        struct ar9170_eeprom sys;
 } __packed;
 
-static const struct ar9170_rom rom __section(eeprom);
+static const struct ar9170_rom rom __in_section(eeprom);
 
 #endif /* __CARL9170FW_ROM_H */

diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c
index 9945f3e44c51081fcfbb13faf6571ca4f41baed9..d19e316255a32f3e7db7e79168f30ebf09e1beaf 100644 (file)
--- a/carlfw/src/dma.c
+++ b/carlfw/src/dma.c
@@ -27,7 +27,7 @@
 #include "wl.h"
 #include "printf.h"
 
-struct ar9170_dma_memory dma_mem __section(sram);
+struct ar9170_dma_memory dma_mem __in_section(sram);
 
 static void copy_dma_desc(struct dma_desc *dst,
                          struct dma_desc *src)

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index f705a0d9dcb446c21b7d5de0da341ac613d36e71..a04e9639df8fc426821ccebecdbdc7ce5aaf2c7a 100644 (file)
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -31,7 +31,7 @@
                more                                                    \
        }
 
-const struct carl9170_firmware_descriptor __section(fwdsc) __visible carl9170fw_desc = {
+const struct carl9170_firmware_descriptor __in_section(fwdsc) __visible carl9170fw_desc = {
        FILL(otus, OTUS,
             .feature_set = cpu_to_le32(BIT(CARL9170FW_DUMMY_FEATURE) |
                                        BIT(CARL9170FW_USB_RESP_EP2) |

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index b2d16390cff576eea2f4fd2608ba849b650f1849..e6f0af0b9e5075d47ce3d33f7a4b7385cf61af82 100644 (file)
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -138,7 +138,7 @@ static void __noreturn main_loop(void)
  * we put _start() there with the linker script carl9170.lds.
  */
 
-void __section(boot) __noreturn __visible start(void)
+void __in_section(boot) __noreturn __visible start(void)
 {
        clock_set(AHB_40MHZ_OSC, true);
 

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index b81bf1472800404745d444e0412f2e8304884a5f..f4c6ab1337ca61d11e82d142ac761a40b1294b58 100644 (file)
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -24,7 +24,7 @@
 #define __cold         __attribute__((cold))
 #define __unused       __attribute__((unused))
 #define __force                __attribute__((force))
-#define __section(s)   __attribute__((section("." # s)))
+#define __in_section(s)        __attribute__((section("." # s)))
 #define __aligned(a)   __attribute__((aligned(a)))
 #define __packed       __attribute__((packed))
 #define __visible      __attribute__((externally_visible))