Changeset 47863


Ignore:
Timestamp:
2015-12-11T16:08:34+01:00 (2 years ago)
Author:
blogic
Message:

uboot-lantiq: fix build with gcc5

Signed-off-by: Mathias Kresin <openwrt@…>

Location:
trunk/package/boot/uboot-lantiq/patches
Files:
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/package/boot/uboot-lantiq/patches/0045-no_extern_inline.patch

    r47862 r47863  
    1 --- a/include/asm-mips/io.h 
    2 +++ b/include/asm-mips/io.h 
    3 @@ -118,12 +118,12 @@ static inline void set_io_port_base(unsi 
     1From b11c5d1dc29e81326d1215011d19377737082aeb Mon Sep 17 00:00:00 2001 
     2From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> 
     3Date: Wed, 1 Jul 2015 16:36:43 +0200 
     4Subject: [PATCH] MIPS: change 'extern inline' to 'static inline' 
     5 
     6The kernel changed it a long time ago. Also this is now broken 
     7on gcc-5.x. 
     8 
     9Reported-by: Andy Kennedy <andy.kennedy@adtran.com> 
     10Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> 
     11--- 
     12 arch/mips/include/asm/io.h     | 12 ++++++------ 
     13 arch/mips/include/asm/system.h |  6 +++--- 
     14 2 files changed, 9 insertions(+), 9 deletions(-) 
     15 
     16diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h 
     17index 3fa37f5..a7ab087 100644 
     18--- a/arch/mips/include/asm/io.h 
     19+++ b/arch/mips/include/asm/io.h 
     20@@ -117,7 +117,7 @@ static inline void set_io_port_base(unsigned long base) 
    421  * Change virtual addresses to physical addresses and vv. 
    522  * These are trivial on the 1:1 Linux/MIPS mapping 
     
    825+static inline phys_addr_t virt_to_phys(volatile void * address) 
    926 { 
     27 #ifndef CONFIG_64BIT 
    1028        return CPHYSADDR(address); 
     29@@ -126,7 +126,7 @@ extern inline phys_addr_t virt_to_phys(volatile void * address) 
     30 #endif 
    1131 } 
    1232  
     
    1434+static inline void * phys_to_virt(unsigned long address) 
    1535 { 
     36 #ifndef CONFIG_64BIT 
    1637        return (void *)KSEG0ADDR(address); 
    17  } 
    18 @@ -131,12 +131,12 @@ extern inline void * phys_to_virt(unsign 
     38@@ -138,7 +138,7 @@ extern inline void * phys_to_virt(unsigned long address) 
    1939 /* 
    2040  * IO bus memory addresses are also 1:1 with the physical address 
     
    2343+static inline unsigned long virt_to_bus(volatile void * address) 
    2444 { 
     45 #ifndef CONFIG_64BIT 
    2546        return CPHYSADDR(address); 
     47@@ -147,7 +147,7 @@ extern inline unsigned long virt_to_bus(volatile void * address) 
     48 #endif 
    2649 } 
    2750  
     
    2952+static inline void * bus_to_virt(unsigned long address) 
    3053 { 
     54 #ifndef CONFIG_64BIT 
    3155        return (void *)KSEG0ADDR(address); 
    32  } 
    33 @@ -150,12 +150,12 @@ extern unsigned long isa_slot_offset; 
     56@@ -165,12 +165,12 @@ extern unsigned long isa_slot_offset; 
    3457 extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags); 
    3558  
     
    4669        return __ioremap(offset, size, _CACHE_UNCACHED); 
    4770 } 
    48 @@ -238,7 +238,7 @@ out: 
    49   */ 
    50   
    51  #define __OUT1(s) \ 
    52 -extern inline void __out##s(unsigned int value, unsigned int port) { 
    53 +static inline void __out##s(unsigned int value, unsigned int port) { 
    54   
    55  #define __OUT2(m) \ 
    56  __asm__ __volatile__ ("s" #m "\t%0,%1(%2)" 
    57 @@ -252,7 +252,7 @@ __OUT1(s##c_p) __OUT2(m) : : "r" (__iosw 
    58         SLOW_DOWN_IO; } 
    59   
    60  #define __IN1(t,s) \ 
    61 -extern __inline__ t __in##s(unsigned int port) { t _v; 
    62 +static inline t __in##s(unsigned int port) { t _v; 
    63   
    64  /* 
    65   * Required nops will be inserted by the assembler 
    66 @@ -267,7 +267,7 @@ __IN1(t,s##_p) __IN2(m) : "=r" (_v) : "i 
    67  __IN1(t,s##c_p) __IN2(m) : "=r" (_v) : "ir" (port), "r" (mips_io_port_base)); SLOW_DOWN_IO; return __ioswab##w(_v); } 
    68   
    69  #define __INS1(s) \ 
    70 -extern inline void __ins##s(unsigned int port, void * addr, unsigned long count) { 
    71 +static inline void __ins##s(unsigned int port, void * addr, unsigned long count) { 
    72   
    73  #define __INS2(m) \ 
    74  if (count) \ 
    75 @@ -295,7 +295,7 @@ __INS1(s##c) __INS2(m) \ 
    76         : "$1");} 
    77   
    78  #define __OUTS1(s) \ 
    79 -extern inline void __outs##s(unsigned int port, const void * addr, unsigned long count) { 
    80 +static inline void __outs##s(unsigned int port, const void * addr, unsigned long count) { 
    81   
    82  #define __OUTS2(m) \ 
    83  if (count) \ 
    84 --- a/include/asm-mips/system.h 
    85 +++ b/include/asm-mips/system.h 
    86 @@ -23,7 +23,7 @@ 
     71diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h 
     72index 7a28952..d56f73b 100644 
     73--- a/arch/mips/include/asm/system.h 
     74+++ b/arch/mips/include/asm/system.h 
     75@@ -22,7 +22,7 @@ 
    8776 #include <linux/kernel.h> 
    8877 #endif 
    8978  
    9079-extern __inline__ void 
    91 +static inline void 
     80+static __inline__ void 
    9281 __sti(void) 
    9382 { 
    9483        __asm__ __volatile__( 
    95 @@ -47,7 +47,7 @@ __sti(void) 
     84@@ -46,7 +46,7 @@ __sti(void) 
    9685  * R4000/R4400 need three nops, the R4600 two nops and the R10000 needs 
    9786  * no nops at all. 
    9887  */ 
    9988-extern __inline__ void 
    100 +static inline void 
     89+static __inline__ void 
    10190 __cli(void) 
    10291 { 
    10392        __asm__ __volatile__( 
    104 @@ -208,7 +208,7 @@ do { \ 
     93@@ -207,7 +207,7 @@ do { \ 
    10594  * For 32 and 64 bit operands we can take advantage of ll and sc. 
    10695  * FIXME: This doesn't work for R3000 machines. 
    10796  */ 
    10897-extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val) 
    109 +static inline unsigned long xchg_u32(volatile int * m, unsigned long val) 
     98+static __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val) 
    11099 { 
    111100 #ifdef CONFIG_CPU_HAS_LLSC 
  • trunk/package/boot/uboot-lantiq/patches/0046-no_weak_alias.patch

    r47862 r47863  
     1From 3422299dc28fa8257677d03cc1253e3c9bf17e9f Mon Sep 17 00:00:00 2001 
    12From: Jeroen Hofstee <jeroen@myspectrum.nl> 
    2 Date: Thu, 26 Jun 2014 18:18:31 +0000 (+0200) 
    3 Subject: common: main.c: make show_boot_progress __weak 
    4 X-Git-Tag: v2014.10-rc1~130 
    5 X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=3422299dc28fa8257677d03cc1253e3c9bf17e9f 
    6  
    7 common: main.c: make show_boot_progress __weak 
     3Date: Thu, 26 Jun 2014 20:18:31 +0200 
     4Subject: [PATCH] common: main.c: make show_boot_progress __weak 
    85 
    96This not only looks a bit better it also prevents a 
     
    1310Acked-by: Simon Glass <sjg@chromium.org> 
    1411--- 
     12 common/main.c | 3 +-- 
     13 1 file changed, 1 insertion(+), 2 deletions(-) 
    1514 
     15diff --git a/common/main.c b/common/main.c 
     16index 32618f1..2979fbe 100644 
    1617--- a/common/main.c 
    1718+++ b/common/main.c 
    18 @@ -27,8 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; 
     19@@ -17,8 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; 
    1920 /* 
    2021  * Board-specific Platform code can reimplement show_boot_progress () if needed 
     
    2425+__weak void show_boot_progress(int val) {} 
    2526  
    26  #define MAX_DELAY_STOP_STR 32 
    27   
     27 static void modem_init(void) 
     28 { 
Note: See TracChangeset for help on using the changeset viewer.