core/linux-armv7 to 6.2.0-1

2024-11-18 22:54:00 +00:00 · 2023-02-23 03:12:50 +00:00 · 2023-02-23 03:12:50 +00:00 · ba6f48f3b5
commit ba6f48f3b5
parent 8bb85af502
9 changed files with 428 additions and 286 deletions
--- a/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@ -1,4 +1,4 @@
-From 9a69defeeecd5c1e29397b912800f737e0c24d03 Mon Sep 17 00:00:00 2001
+From 4533007cef1bd1da546752b372234b9bb9548214 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot
--- a/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@ -1,4 +1,4 @@
-From ed384f9e67abaf4bb082cc74793de9d864f7ae78 Mon Sep 17 00:00:00 2001
+From b2f96ec9b408c8bbec437c3d3b54c0b748fca85a Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
--- a/core/linux-armv7/0003-fix-mvsdio-eMMC-timing.patch
+++ b/core/linux-armv7/0003-fix-mvsdio-eMMC-timing.patch
@ -1,4 +1,4 @@
-From 78b7168c596c3b72d705b918ad43a9a14cc8296b Mon Sep 17 00:00:00 2001
+From 5b76d7e549a6f65f881ef832cb39ae6a4ad34119 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
 Subject: [PATCH 3/7] fix mvsdio eMMC timing
--- a/core/linux-armv7/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/core/linux-armv7/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@ -1,4 +1,4 @@
-From aed7aec81eda932c5cdc5d84ad1cf57f209d5b67 Mon Sep 17 00:00:00 2001
+From 824cc151d839ce92269200119f9148013755adb8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter
@ -8,7 +8,7 @@ Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter
 1 file changed, 56 insertions(+)

 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 4dc43929e370..75e8736e3a73 100644
+index bfb58c91db04..29b7c4cb90f1 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
@@ -54,6 +54,7 @@
@ -27,10 +27,10 @@ index 4dc43929e370..75e8736e3a73 100644
 +module_param(macaddr, charp, 0);
 +MODULE_PARM_DESC(macaddr, "MAC address");
 +
- static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
- 					    u32 *data, int in_pm)
+ static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
+ 					  u32 *data)
 {
-@@ -805,8 +810,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -761,8 +766,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
 	return phy_mii_ioctl(netdev->phydev, rq, cmd);
 }
 
--- a/core/linux-armv7/0005-set-default-cubietruck-led-triggers.patch
+++ b/core/linux-armv7/0005-set-default-cubietruck-led-triggers.patch
@ -1,4 +1,4 @@
-From 31621481a13233e96a86b17b0a2b73067469492a Mon Sep 17 00:00:00 2001
+From 3a5136fec1bdb0f7a5ca614dab47c55c3177d26a Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
 Subject: [PATCH 5/7] set default cubietruck led triggers
--- a/core/linux-armv7/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/core/linux-armv7/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@ -1,4 +1,4 @@
-From 2de2405991ff423dd6e0c032577a42b6e25baca2 Mon Sep 17 00:00:00 2001
+From c87c82c5a03baf1202d22567e4f6d113cfe17bad Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
 Subject: [PATCH 6/7] exynos4412-odroid: set higher minimum buck2 regulator
--- a/core/linux-armv7/0007-USB-Armory-MkII-support.patch
+++ b/core/linux-armv7/0007-USB-Armory-MkII-support.patch
@ -1,4 +1,4 @@
-From 5a2034451b57aa8941a367fd03a70b8df67b0d5d Mon Sep 17 00:00:00 2001
+From 23e406e404f935be33c917ca7772466dd52582c3 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 11 Aug 2019 12:34:17 -0600
 Subject: [PATCH 7/7] USB Armory MkII support
@ -12,10 +12,10 @@ Subject: [PATCH 7/7] USB Armory MkII support
 create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts

 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 27eec8e670ec..17a64e2973a6 100644
+index 05d8aef6e5d2..c6c76fa5047f 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -713,6 +713,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+@@ -722,6 +722,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
 	imx6ul-tx6ul-0010.dtb \
 	imx6ul-tx6ul-0011.dtb \
 	imx6ul-tx6ul-mainboard.dtb \
@ -23,7 +23,7 @@ index 27eec8e670ec..17a64e2973a6 100644
 	imx6ull-14x14-evk.dtb \
 	imx6ull-colibri-aster.dtb \
 	imx6ull-colibri-emmc-aster.dtb \
-@@ -736,6 +737,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+@@ -745,6 +746,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
 	imx6ull-phytec-tauri-nand.dtb \
 	imx6ull-tqma6ull2-mba6ulx.dtb \
 	imx6ull-tqma6ull2l-mba6ulx.dtb \
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@ -4,20 +4,20 @@
 buildarch=4

 pkgbase=linux-armv7
-_srcname=linux-5.19
+_srcname=linux-6.2
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=5.19.8
+pkgver=6.2.0
 pkgrel=1
-rcnver=5.19.8
-rcnrel=armv7-x9
+rcnver=6.2.0
+rcnrel=multiv7-r0
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
 options=('!strip')
-source=("https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
-        "https://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
+source=("https://www.kernel.org/pub/linux/kernel/v6.x/${_srcname}.tar.xz"
+        #"https://www.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz"
        "https://rcn-ee.com/deb/sid-armhf/v${rcnver}-${rcnrel}/patch-${rcnver%.0}-${rcnrel}.diff.gz"
        '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
        '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
@ -33,17 +33,16 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
        'linux.preset'
        '60-linux.hook'
        '90-linux.hook')
-md5sums=('f91bfe133d2cb1692f705947282e123a'
-         '702a69746536f24fd5ebde90eed26048'
-         '21253b57f2be7bfd950c97eed6d37359'
-         'b187b3b41f48542fd3a76c0a39103c52'
-         '62db638350b2193fc3861880fee14680'
-         'ed8106f17374ad947b37b91f5fb4fc0c'
-         '5679453a8653bcce4512220ca777ba86'
-         'cf4f4ba295cf545a8c43641ca1418b0c'
-         '6f326c9493c89537c30dabcaec81a82e'
-         'af85c93edc35c6677c52fd6081c45de6'
-         '35c51bd0be14411340aebc9499e8ef56'
+md5sums=('787862593d7bf354cf1a5c37e21fc147'
+         'f9c3afa39e6dec8bcdd68dd5667c06a6'
+         '9e9d3b4cde2e27afd79f8818eb86a493'
+         '46fd4237094df0d32e19ef797511195f'
+         'bb32c18626916fba143461da3b6d3f7a'
+         '8f18d1db15ced906458992ea5aafa79e'
+         '84b9e5ca6d5284561bcb4401d8cd693e'
+         '6226d24c61278a4b7835b0774a5d0149'
+         '30c239cd58141b8ae197b4d8efc5bdc7'
+         '75e7e32868a1e856e43f6c60d88c21d7'
         '0963ff6490be16935370812fc75fa065'
         '61c5ff73c136ed07a7aadbf58db3d96a'
         '584777ae88bce2c5659960151b64c7d8'
@ -55,7 +54,7 @@ prepare() {
  cd "${srcdir}/${_srcname}"

  # add upstream patch
-  git apply --whitespace=nowarn ../patch-${pkgver}
+  #git apply --whitespace=nowarn ../patch-${pkgver}

  # RCN patch
  git apply ../patch-${rcnver%.0}-${rcnrel}.diff
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config