From 55036a4e8a9c9c826300bc3dae42049bb81b8660 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 18 Apr 2024 10:20:09 +0200
Subject: linux: set Linux 6.6.x as default

---
 target/linux/Config.in.kernelversion                 |  5 +----
 target/linux/patches/6.6.22/hppa-cross-compile.patch | 12 ++++++++++++
 target/linux/patches/6.6.22/macsonic.patch           | 11 +++++++++++
 target/linux/patches/6.6.22/riscv-flat.patch         | 19 +++++++++++++++++++
 4 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 target/linux/patches/6.6.22/hppa-cross-compile.patch
 create mode 100644 target/linux/patches/6.6.22/macsonic.patch
 create mode 100644 target/linux/patches/6.6.22/riscv-flat.patch

(limited to 'target')

diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 535f3a2fb..d53fea61b 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -24,10 +24,7 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_ST_STM32F769
 default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_C6X
 default ADK_TARGET_LINUX_KERNEL_VERSION_5_10 if ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 default ADK_TARGET_LINUX_KERNEL_VERSION_5_15 if ADK_TARGET_ARCH_NDS32
-default ADK_TARGET_LINUX_KERNEL_VERSION_6_6 if ADK_TARGET_ARCH_ARM && !ADK_TARGET_WITH_MMU && ADK_TARGET_BINFMT_ELF
-default ADK_TARGET_LINUX_KERNEL_VERSION_6_6 if ADK_TARGET_ARCH_M68K && !ADK_TARGET_WITH_MMU && ADK_TARGET_BINFMT_ELF
-default ADK_TARGET_LINUX_KERNEL_VERSION_6_6 if ADK_TARGET_ARCH_RISCV64 && !ADK_TARGET_WITH_MMU && ADK_TARGET_BINFMT_ELF
-default ADK_TARGET_LINUX_KERNEL_VERSION_6_1
+default ADK_TARGET_LINUX_KERNEL_VERSION_6_6
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	bool "git"
diff --git a/target/linux/patches/6.6.22/hppa-cross-compile.patch b/target/linux/patches/6.6.22/hppa-cross-compile.patch
new file mode 100644
index 000000000..51c24fff2
--- /dev/null
+++ b/target/linux/patches/6.6.22/hppa-cross-compile.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-6.6.22.orig/arch/parisc/Makefile linux-6.6.22/arch/parisc/Makefile
+--- linux-6.6.22.orig/arch/parisc/Makefile	2024-03-15 19:25:07.000000000 +0100
++++ linux-6.6.22/arch/parisc/Makefile	2024-04-16 03:57:37.515308996 +0200
+@@ -41,7 +41,7 @@
+ 
+ # Set default 32 bits cross compilers for vdso
+ CC_ARCHES_32 = hppa hppa2.0 hppa1.1
+-CC_SUFFIXES  = linux linux-gnu unknown-linux-gnu suse-linux
++CC_SUFFIXES  = linux linux-gnu unknown-linux-gnu suse-linux openadk-linux-uclibc
+ CROSS32_COMPILE := $(call cc-cross-prefix, \
+ 	$(foreach a,$(CC_ARCHES_32), \
+ 	$(foreach s,$(CC_SUFFIXES),$(a)-$(s)-)))
diff --git a/target/linux/patches/6.6.22/macsonic.patch b/target/linux/patches/6.6.22/macsonic.patch
new file mode 100644
index 000000000..51e76113b
--- /dev/null
+++ b/target/linux/patches/6.6.22/macsonic.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-6.6.22.orig/drivers/net/ethernet/natsemi/Kconfig linux-6.6.22/drivers/net/ethernet/natsemi/Kconfig
+--- linux-6.6.22.orig/drivers/net/ethernet/natsemi/Kconfig	2024-03-15 19:25:07.000000000 +0100
++++ linux-6.6.22/drivers/net/ethernet/natsemi/Kconfig	2024-04-16 10:16:50.352443898 +0200
+@@ -19,6 +19,7 @@
+ config MACSONIC
+ 	tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
+ 	depends on MAC
++	select BITREVERSE
+ 	help
+ 	  Support for NatSemi SONIC based Ethernet devices.  This includes
+ 	  the onboard Ethernet in many Quadras as well as some LC-PDS,
diff --git a/target/linux/patches/6.6.22/riscv-flat.patch b/target/linux/patches/6.6.22/riscv-flat.patch
new file mode 100644
index 000000000..6d26c638f
--- /dev/null
+++ b/target/linux/patches/6.6.22/riscv-flat.patch
@@ -0,0 +1,19 @@
+diff -Nur linux-6.6.22.orig/fs/binfmt_flat.c linux-6.6.22/fs/binfmt_flat.c
+--- linux-6.6.22.orig/fs/binfmt_flat.c	2024-03-15 19:25:07.000000000 +0100
++++ linux-6.6.22/fs/binfmt_flat.c	2024-04-17 15:41:29.292461687 +0200
+@@ -879,6 +879,7 @@
+ 	if (res < 0)
+ 		return res;
+ 
++#ifndef CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET
+ 	/* Update data segment pointers for all libraries */
+ 	for (i = 0; i < MAX_SHARED_LIBS; i++) {
+ 		if (!libinfo.lib_list[i].loaded)
+@@ -893,6 +894,7 @@
+ 				return -EFAULT;
+ 		}
+ 	}
++#endif
+ 
+ 	set_binfmt(&flat_format);
+ 
-- 
cgit v1.2.3