bananapi-uboot: update to 15.04; fix build w/ gcc10

srcpkgs/bananapi-uboot/patches/no-inline-show_boot_progress.patch

@@ -0,0 +1,11 @@
+--- common/main.c	2014-08-19 08:42:46.000000000 +0200
++++ common/main.c	2020-09-15 09:39:04.675302769 +0200
+@@ -27,7 +27,7 @@
+ /*
+  * Board-specific Platform code can reimplement show_boot_progress () if needed
+  */
+-void inline __show_boot_progress (int val) {}
++void __show_boot_progress (int val) {}
+ void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+ 
+ #define MAX_DELAY_STOP_STR 32

srcpkgs/bananapi-uboot/patches/no-inline-weak.patch

@@ -0,0 +1,36 @@
+--- common/board_f.c	2014-08-19 08:42:46.000000000 +0200
++++ common/board_f.c	2020-09-15 09:40:56.739298301 +0200
+@@ -78,24 +78,24 @@
+  ************************************************************************
+  * May be supplied by boards if desired
+  */
+-inline void __coloured_LED_init(void) {}
++void __coloured_LED_init(void) {}
+ void coloured_LED_init(void)
+ 	__attribute__((weak, alias("__coloured_LED_init")));
+-inline void __red_led_on(void) {}
++void __red_led_on(void) {}
+ void red_led_on(void) __attribute__((weak, alias("__red_led_on")));
+-inline void __red_led_off(void) {}
++void __red_led_off(void) {}
+ void red_led_off(void) __attribute__((weak, alias("__red_led_off")));
+-inline void __green_led_on(void) {}
++void __green_led_on(void) {}
+ void green_led_on(void) __attribute__((weak, alias("__green_led_on")));
+-inline void __green_led_off(void) {}
++void __green_led_off(void) {}
+ void green_led_off(void) __attribute__((weak, alias("__green_led_off")));
+-inline void __yellow_led_on(void) {}
++void __yellow_led_on(void) {}
+ void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on")));
+-inline void __yellow_led_off(void) {}
++void __yellow_led_off(void) {}
+ void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off")));
+-inline void __blue_led_on(void) {}
++void __blue_led_on(void) {}
+ void blue_led_on(void) __attribute__((weak, alias("__blue_led_on")));
+-inline void __blue_led_off(void) {}
++void __blue_led_off(void) {}
+ void blue_led_off(void) __attribute__((weak, alias("__blue_led_off")));
+ 
+ /*

srcpkgs/bananapi-uboot/patches/static-inline.patch

@@ -0,0 +1,54 @@
+--- arch/arm/include/asm/io.h	2014-08-19 08:42:46.000000000 +0200
++++ arch/arm/include/asm/io.h	2020-09-15 09:36:28.791308985 +0200
+@@ -75,7 +75,7 @@
+ #define __arch_putw(v,a)		(*(volatile unsigned short *)(a) = (v))
+ #define __arch_putl(v,a)		(*(volatile unsigned int *)(a) = (v))
+ 
+-extern inline void __raw_writesb(unsigned long addr, const void *data,
++static inline void __raw_writesb(unsigned long addr, const void *data,
+ 				 int bytelen)
+ {
+ 	uint8_t *buf = (uint8_t *)data;
+@@ -83,7 +83,7 @@
+ 		__arch_putb(*buf++, addr);
+ }
+ 
+-extern inline void __raw_writesw(unsigned long addr, const void *data,
++static inline void __raw_writesw(unsigned long addr, const void *data,
+ 				 int wordlen)
+ {
+ 	uint16_t *buf = (uint16_t *)data;
+@@ -91,7 +91,7 @@
+ 		__arch_putw(*buf++, addr);
+ }
+ 
+-extern inline void __raw_writesl(unsigned long addr, const void *data,
++static inline void __raw_writesl(unsigned long addr, const void *data,
+ 				 int longlen)
+ {
+ 	uint32_t *buf = (uint32_t *)data;
+@@ -99,21 +99,21 @@
+ 		__arch_putl(*buf++, addr);
+ }
+ 
+-extern inline void __raw_readsb(unsigned long addr, void *data, int bytelen)
++static inline void __raw_readsb(unsigned long addr, void *data, int bytelen)
+ {
+ 	uint8_t *buf = (uint8_t *)data;
+ 	while(bytelen--)
+ 		*buf++ = __arch_getb(addr);
+ }
+ 
+-extern inline void __raw_readsw(unsigned long addr, void *data, int wordlen)
++static inline void __raw_readsw(unsigned long addr, void *data, int wordlen)
+ {
+ 	uint16_t *buf = (uint16_t *)data;
+ 	while(wordlen--)
+ 		*buf++ = __arch_getw(addr);
+ }
+ 
+-extern inline void __raw_readsl(unsigned long addr, void *data, int longlen)
++static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
+ {
+ 	uint32_t *buf = (uint32_t *)data;
+ 	while(longlen--)

srcpkgs/bananapi-uboot/template

@@ -1,20 +1,25 @@
 # Template file for 'odroid-u2-uboot'
 pkgname=bananapi-uboot
-version=15.01
-revision=2
+version=15.04
+revision=1
 hostmakedepends="sunxi-tools uboot-mkimage"
 short_desc="Banana Pi uboot module"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2"
 homepage="https://github.com/hardkernel/u-boot"
 distfiles="https://github.com/Bananian/u-boot-bananapi/archive/bananian-v${version}.tar.gz"
-checksum="935ac90624cc00106a1547b8da2b3e59ab09db9cf658df7126a93738fac74fe5"
+checksum=8be162b0b8e85d3fbc2e14af3b71c4a204f4a9c63f6f13275f86629624c1d6a6
 wrksrc="u-boot-bananapi-bananian-v${version}"
 
 conf_files="/boot/uEnv.txt"
 archs="armv7l"
 
 do_configure() {
+	# Create a dummy header file for gcc10 since include/linux/compiler-gcc.h
+	# generates an include for it but there is no such file.
+	mkdir -p include/linux
+	touch include/linux/compiler-gcc10.h
+
 	make mrproper
 	make Bananapi_config
 }
@@ -23,9 +28,9 @@ do_build() {
 	unset CFLAGS CXXFLAGS LDFLAGS
 
 	if [ "$CROSS_BUILD" ]; then
-		make ARCH=arm CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
+		make CFLAGS="-fcommon" ARCH=arm CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
 	else
-		make ARCH=arm
+		make CFLAGS="-fcommon" ARCH=arm
 	fi
 
 }