Merge pull request #5871 from heitbaum/515fixes

[le11] build fixes

packages/linux-drivers/RTL8812AU/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="RTL8812AU"
-PKG_VERSION="b8167e66b4ac046b3b76c2c40008d84528e91594"
+PKG_VERSION="307d694076b056588c652c2bdaa543a89eb255d9"
-PKG_SHA256="2c5d8286a00273343fc10d0e16afc52e788ac73b7df57c8159e58a40707f61da"
+PKG_SHA256="51b8f5835afc95a8645277031a20c840db12959b1761ff730a2c0b986653c812"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/aircrack-ng/rtl8812au"
 PKG_URL="https://github.com/aircrack-ng/rtl8812au/archive/${PKG_VERSION}.tar.gz"

packages/linux-drivers/RTL8812AU/patches/5-15-0.patch

@@ -1,61 +0,0 @@
---- a/core/rtw_br_ext.c	2021-01-11 21:31:47.000000000 +1100
-+++ b/core/rtw_br_ext.c	2021-10-10 14:16:13.942229163 +1100
-@@ -17,7 +17,10 @@
- #ifdef __KERNEL__
- 	#include <linux/if_arp.h>
- 	#include <net/ip.h>
-+	#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
- 	#include <net/ipx.h>
-+#endif
- 	#include <linux/atalk.h>
- 	#include <linux/udp.h>
- 	#include <linux/if_pppox.h>
-@@ -169,6 +172,7 @@
- }
- 
- 
-+#ifdef _NET_INET_IPX_H_
- static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
- 		unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
- {
-@@ -189,6 +193,7 @@
- 	memcpy(networkAddr + 1, (unsigned char *)ipxNetAddr, 4);
- 	memcpy(networkAddr + 5, (unsigned char *)ipxSocketAddr, 2);
- }
-+#endif
- 
- 
- static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
-@@ -330,6 +335,7 @@
- 		x = networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10];
- 
- 		return x & (NAT25_HASH_SIZE - 1);
-+#ifdef _NET_INET_IPX_H_
- 	} else if (networkAddr[0] == NAT25_IPX) {
- 		unsigned long x;
- 
-@@ -337,6 +343,7 @@
- 		    networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10];
- 
- 		return x & (NAT25_HASH_SIZE - 1);
-+#endif
- 	} else if (networkAddr[0] == NAT25_APPLE) {
- 		unsigned long x;
- 
-@@ -889,6 +896,7 @@
- 		}
- 	}
- 
-+#ifdef _NET_INET_IPX_H_
- 	/*---------------------------------------------------*/
- 	/*         Handle IPX and Apple Talk frame          */
- 	/*---------------------------------------------------*/
-@@ -1109,6 +1117,7 @@
- 
- 		return -1;
- 	}
-+#endif
- 
- 	/*---------------------------------------------------*/
- 	/*                Handle PPPoE frame                */

projects/NXP/devices/iMX8/patches/u-boot/0001-fix-imx64-mkimage-fit-atf-2021-10.patch

@@ -0,0 +1,78 @@
+diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh
+index 2a17968794c1..2d6c46633c72 100755
+--- a/arch/arm/mach-imx/mkimage_fit_atf.sh
++++ b/arch/arm/mach-imx/mkimage_fit_atf.sh
+@@ -53,7 +53,7 @@ cat << __HEADER_EOF
+ 	description = "Configuration to load ATF before U-Boot";
+ 
+ 	images {
+-		uboot@1 {
++		uboot_1 {
+ 			description = "U-Boot (64-bit)";
+ 			os = "u-boot";
+ 			data = /incbin/("$BL33");
+@@ -68,7 +68,7 @@ cnt=1
+ for dtname in $*
+ do
+ 	cat << __FDT_IMAGE_EOF
+-		fdt@$cnt {
++		fdt_$cnt {
+ 			description = "$(basename $dtname .dtb)";
+ 			data = /incbin/("$dtname");
+ 			type = "flat_dt";
+@@ -79,7 +79,7 @@ cnt=$((cnt+1))
+ done
+ 
+ cat << __HEADER_EOF
+-		atf@1 {
++		atf_1 {
+ 			description = "ARM Trusted Firmware";
+ 			os = "arm-trusted-firmware";
+ 			data = /incbin/("$BL31");
+@@ -93,7 +93,7 @@ __HEADER_EOF
+ 
+ if [ -f $BL32 ]; then
+ cat << __HEADER_EOF
+-		tee@1 {
++		tee_1 {
+ 			description = "TEE firmware";
+ 			data = /incbin/("$BL32");
+ 			type = "firmware";
+@@ -108,7 +108,7 @@ fi
+ cat << __CONF_HEADER_EOF
+ 	};
+ 	configurations {
+-		default = "config@1";
++		default = "config_1";
+ 
+ __CONF_HEADER_EOF
+ 
+@@ -117,20 +117,20 @@ for dtname in $*
+ do
+ if [ -f $BL32 ]; then
+ cat << __CONF_SECTION_EOF
+-		config@$cnt {
++		config_$cnt {
+ 			description = "$(basename $dtname .dtb)";
+-			firmware = "uboot@1";
+-			loadables = "atf@1", "tee@1";
+-			fdt = "fdt@$cnt";
++			firmware = "uboot_1";
++			loadables = "atf_1", "tee_1";
++			fdt = "fdt_$cnt";
+ 		};
+ __CONF_SECTION_EOF
+ else
+ cat << __CONF_SECTION1_EOF
+-		config@$cnt {
++		config_$cnt {
+ 			description = "$(basename $dtname .dtb)";
+-			firmware = "uboot@1";
+-			loadables = "atf@1";
+-			fdt = "fdt@$cnt";
++			firmware = "uboot_1";
++			loadables = "atf_1";
++			fdt = "fdt_$cnt";
+ 		};
+ __CONF_SECTION1_EOF
+ fi

projects/Samsung/patches/linux/samsung-0021-MEMEKA-fix-eMMC-clock-settings.patch

@@ -1,25 +0,0 @@
-From 8cf133244d795e59ac3e1bdeefe88f60953d7818 Mon Sep 17 00:00:00 2001
-From: Marian Mihailescu <mihailescu2m@gmail.com>
-Date: Thu, 14 Nov 2019 12:19:37 +1030
-Subject: [PATCH 21/25] MEMEKA: fix eMMC clock settings
-
----
- drivers/mmc/host/dw_mmc-exynos.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/host/dw_mmc-exynos.h b/drivers/mmc/host/dw_mmc-exynos.h
-index 0280d394a32a..7088e39de5d2 100644
---- a/drivers/mmc/host/dw_mmc-exynos.h
-+++ b/drivers/mmc/host/dw_mmc-exynos.h
-@@ -61,7 +61,7 @@
- /* Fixed clock divider */
- #define EXYNOS4210_FIXED_CIU_CLK_DIV	2
- #define EXYNOS4412_FIXED_CIU_CLK_DIV	4
--#define HS400_FIXED_CIU_CLK_DIV		1
-+#define HS400_FIXED_CIU_CLK_DIV		2
- 
- /* Minimal required clock frequency for cclkin, unit: HZ */
- #define EXYNOS_CCLKIN_MIN	50000000
--- 
-2.17.1
-