core/linux-armv7 to 5.5.1-1

This commit is contained in:
Kevin Mihelich 2020-02-03 02:10:05 +00:00
parent 869db6c124
commit 3b35f3a3e8
11 changed files with 77 additions and 44 deletions

View file

@ -1,7 +1,7 @@
From a0d6a41c903bcb0b393800584e749be72600c691 Mon Sep 17 00:00:00 2001 From 970026f1d5752c5d9f3d7f524b18ad5d81f7f436 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx> From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:59:28 +0100 Date: Sun, 2 Dec 2012 19:59:28 +0100
Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot Subject: [PATCH 01/10] ARM: atags: add support for Marvell's u-boot
Marvell uses a specific atag in its u-boot which includes among other Marvell uses a specific atag in its u-boot which includes among other
information the MAC addresses for up to 4 network interfaces. information the MAC addresses for up to 4 network interfaces.
@ -47,5 +47,5 @@ index 25ceda63b284..83578c54975b 100644
}; };
-- --
2.23.0 2.25.0

View file

@ -1,8 +1,8 @@
From aa25cf15afca5ebefc78e16a68409643a16a6af3 Mon Sep 17 00:00:00 2001 From ba8c3d62a09ad9582879577a1a71f36213cdc179 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx> From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:56:58 +0100 Date: Sun, 2 Dec 2012 19:56:58 +0100
Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot Subject: [PATCH 02/10] ARM: atags/fdt: retrieve MAC addresses from Marvell
loader boot loader
The atags are parsed and if a Marvell atag is found, up to 4 MAC The atags are parsed and if a Marvell atag is found, up to 4 MAC
addresses are extracted there and assigned to node aliases eth0..3 addresses are extracted there and assigned to node aliases eth0..3
@ -34,5 +34,5 @@ index 64c49747f8a3..60cd5e5bac93 100644
} }
-- --
2.23.0 2.25.0

View file

@ -1,7 +1,7 @@
From ad5cb059a2d3bedda113717012c52afd2d3b10a9 Mon Sep 17 00:00:00 2001 From 2fd36c0086abd28bbbc98d4d147939c0a588c9e2 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:41:19 -0600 Date: Fri, 5 Sep 2014 15:41:19 -0600
Subject: [PATCH 3/9] SMILE Plug device tree file Subject: [PATCH 03/10] SMILE Plug device tree file
This adds a dts file for the SMILE Plug, which only differs from the Mirabox This adds a dts file for the SMILE Plug, which only differs from the Mirabox
dts with the LED definitions. dts with the LED definitions.
@ -205,5 +205,5 @@ index 000000000000..d01308ab848b
+ }; + };
+}; +};
-- --
2.23.0 2.25.0

View file

@ -1,7 +1,7 @@
From 14c5a5d97fab02342816c128ebcd2e581a892a80 Mon Sep 17 00:00:00 2001 From c49db8d7558931cf54a5e3ed4565ecbfda2a989a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:43:56 -0600 Date: Fri, 5 Sep 2014 15:43:56 -0600
Subject: [PATCH 4/9] fix mvsdio eMMC timing Subject: [PATCH 04/10] fix mvsdio eMMC timing
These changes from Globalscale change the MMC timing to allow the eMMC versions These changes from Globalscale change the MMC timing to allow the eMMC versions
of the Mirabox and SMILE Plug to work. of the Mirabox and SMILE Plug to work.
@ -34,5 +34,5 @@ index 74a0a7fbbf7f..92eadb116762 100644
host->clock = ios->clock; host->clock = ios->clock;
host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
-- --
2.23.0 2.25.0

View file

@ -1,7 +1,8 @@
From d8d3b7ef35dc992adb33ea8a077e0fff21a4a3e5 Mon Sep 17 00:00:00 2001 From afac272fddea145b4ba7532370818ada190b4058 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com> From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300 Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter Subject: [PATCH 05/10] net/smsc95xx: Allow mac address to be set as a
parameter
--- ---
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++
@ -91,5 +92,5 @@ index 355be77f4241..c94a7193e0b9 100644
/* maybe the boot loader passed the MAC address in devicetree */ /* maybe the boot loader passed the MAC address in devicetree */
-- --
2.23.0 2.25.0

View file

@ -1,7 +1,7 @@
From ac5c484e8981944a17176237105e61c48e61145c Mon Sep 17 00:00:00 2001 From f99f3a8c0e2db1d9dd487cd70569098f36bb325e Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 14 Feb 2015 12:32:27 +0100 Date: Sat, 14 Feb 2015 12:32:27 +0100
Subject: [PATCH 6/9] set default cubietruck led triggers Subject: [PATCH 06/10] set default cubietruck led triggers
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
--- ---
@ -12,7 +12,7 @@ diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7
index 8c8dee6ea461..4f52a11b913e 100644 index 8c8dee6ea461..4f52a11b913e 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@ leds {
blue { blue {
label = "cubietruck:blue:usr"; label = "cubietruck:blue:usr";
gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
@ -20,7 +20,7 @@ index 8c8dee6ea461..4f52a11b913e 100644
}; };
orange { orange {
@@ -93,6 +94,7 @@ @@ -93,6 +94,7 @@ white {
green { green {
label = "cubietruck:green:usr"; label = "cubietruck:green:usr";
gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;
@ -29,5 +29,5 @@ index 8c8dee6ea461..4f52a11b913e 100644
}; };
-- --
2.23.0 2.25.0

View file

@ -1,7 +1,7 @@
From 417bf98b9d312c47c64d3aac3a2514db635a2012 Mon Sep 17 00:00:00 2001 From 318282bc517494fa1b17c1b6433b3005337d07b4 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 11 Aug 2016 00:42:37 -0600 Date: Thu, 11 Aug 2016 00:42:37 -0600
Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator Subject: [PATCH 07/10] exynos4412-odroid: set higher minimum buck2 regulator
voltage voltage
Set a higher minimum voltage to help reboot issue. Set a higher minimum voltage to help reboot issue.
@ -16,7 +16,7 @@ diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts
index ea55f377d17c..a7bfc58bbc79 100644 index ea55f377d17c..a7bfc58bbc79 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -430,7 +430,7 @@ @@ -430,7 +430,7 @@ buck1_reg: BUCK1 {
buck2_reg: BUCK2 { buck2_reg: BUCK2 {
regulator-name = "vdd_arm"; regulator-name = "vdd_arm";
@ -26,5 +26,5 @@ index ea55f377d17c..a7bfc58bbc79 100644
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
-- --
2.23.0 2.25.0

View file

@ -1,7 +1,7 @@
From 3f045915d6bd9038f4b1751fb06497d0a6fd4a88 Mon Sep 17 00:00:00 2001 From 9409129a50f721937f0b16f00f6ba45e3b9d066a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 7 May 2017 13:32:25 -0600 Date: Sun, 7 May 2017 13:32:25 -0600
Subject: [PATCH 8/9] ARM: dove: enable ethernet on D3Plug Subject: [PATCH 08/10] ARM: dove: enable ethernet on D3Plug
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
--- ---
@ -12,7 +12,7 @@ diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.d
index 826026c28f90..a4c9963e1261 100644 index 826026c28f90..a4c9963e1261 100644
--- a/arch/arm/boot/dts/dove-d3plug.dts --- a/arch/arm/boot/dts/dove-d3plug.dts
+++ b/arch/arm/boot/dts/dove-d3plug.dts +++ b/arch/arm/boot/dts/dove-d3plug.dts
@@ -61,6 +61,13 @@ @@ -61,6 +61,13 @@ usb_power: regulator@1 {
&uart0 { status = "okay"; }; &uart0 { status = "okay"; };
&sata0 { status = "okay"; }; &sata0 { status = "okay"; };
&i2c0 { status = "okay"; }; &i2c0 { status = "okay"; };
@ -27,5 +27,5 @@ index 826026c28f90..a4c9963e1261 100644
/* Samsung M8G2F eMMC */ /* Samsung M8G2F eMMC */
&sdio0 { &sdio0 {
-- --
2.23.0 2.25.0

View file

@ -1,7 +1,7 @@
From 849c3ad55d9fcf00cb909e8f19139b939a22132c Mon Sep 17 00:00:00 2001 From 9c5a1645cef4d1ba381db9c4b375b9dc900a4475 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 11 Aug 2019 12:34:17 -0600 Date: Sun, 11 Aug 2019 12:34:17 -0600
Subject: [PATCH 9/9] USB Armory MkII support Subject: [PATCH 09/10] USB Armory MkII support
--- ---
arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/Makefile | 2 +
@ -552,5 +552,5 @@ index 000000000000..85cf30bff527
+ status = "okay"; + status = "okay";
+}; +};
-- --
2.23.0 2.25.0

View file

@ -0,0 +1,28 @@
From d8639dab6b5256a2f409da50a6ce73b9502a6823 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 2 Feb 2020 18:38:22 -0700
Subject: [PATCH 10/10] Revert "ARM: 8947/1: Fix __arch_get_hw_counter() access
to CNTVCT"
This reverts commit 04bb96427d4ee33fbdf15648ddf578c6ba1aef54.
---
arch/arm/include/asm/vdso/gettimeofday.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/include/asm/vdso/gettimeofday.h b/arch/arm/include/asm/vdso/gettimeofday.h
index 0ad2429c324f..5b879ae7afc1 100644
--- a/arch/arm/include/asm/vdso/gettimeofday.h
+++ b/arch/arm/include/asm/vdso/gettimeofday.h
@@ -75,9 +75,6 @@ static __always_inline u64 __arch_get_hw_counter(int clock_mode)
#ifdef CONFIG_ARM_ARCH_TIMER
u64 cycle_now;
- if (!clock_mode)
- return -EINVAL;
-
isb();
cycle_now = read_sysreg(CNTVCT);
--
2.25.0

View file

@ -7,7 +7,7 @@ pkgbase=linux-armv7
_srcname=linux-5.5 _srcname=linux-5.5
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
_desc="ARMv7 multi-platform" _desc="ARMv7 multi-platform"
pkgver=5.5.0 pkgver=5.5.1
pkgrel=1 pkgrel=1
rcnver=5.5.0 rcnver=5.5.0
rcnrel=armv7-x5 rcnrel=armv7-x5
@ -17,7 +17,7 @@ license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
options=('!strip') options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
#"http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz" "http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
"http://rcn-ee.com/deb/sid-armhf/v${rcnver}-${rcnrel}/patch-${rcnver%.0}-${rcnrel}.diff.gz" "http://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' '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
'0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
@ -28,6 +28,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
'0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch'
'0008-ARM-dove-enable-ethernet-on-D3Plug.patch' '0008-ARM-dove-enable-ethernet-on-D3Plug.patch'
'0009-USB-Armory-MkII-support.patch' '0009-USB-Armory-MkII-support.patch'
'0010-Revert-ARM-8947-1-Fix-__arch_get_hw_counter-access-t.patch'
'config' 'config'
'kernel.its' 'kernel.its'
'kernel.keyblock' 'kernel.keyblock'
@ -36,16 +37,18 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
'60-linux.hook' '60-linux.hook'
'90-linux.hook') '90-linux.hook')
md5sums=('0a78b1dc48dc032fe505b170c1b92339' md5sums=('0a78b1dc48dc032fe505b170c1b92339'
'172bd3ec67e7c59604a7bf684ec29232'
'6e99f68dc97436ca536e1bf1c2bb30bb' '6e99f68dc97436ca536e1bf1c2bb30bb'
'3acbc3919c615b8aa26ad186c68993c3' 'f518cedd27651f4151b27041c19d710d'
'f2c68a5ec7a9f35da95cfd1917b45a23' 'b18c4ad08b4c9ec5b4c7d56ae39b12d5'
'5c978e49ac35a0929c7d9c334236a4b3' 'b01ad73c00474f0f1751d0e742fc2743'
'e1f590844ba844e3dca9a59bc2b25839' '667a92f15c4dfe23d67f636926d8d266'
'09e36e3e8e28963f15f8d662f45fd53c' 'd465d74c272bab5d9f2493b5c18dbcc5'
'69747217644213bbbd8ba69bd1f287ea' '31ac0951caf3ac7b5be22317d7832b78'
'68fb23b133bd40b23b9be88b812006be' '5de2bbe43207cd90ef5feced6cf96a42'
'69815186d139d7df11b7b849298a8fdb' 'e65d90a4503d35e5cae54394f277adf9'
'e3ff621c2bfa5147cb0211187c2e2f22' 'be92a2c94b24a1d7b1b9c151d591eb03'
'7ee69272c145a1f1a2affebcc438e0c2'
'44ec2b1260af155dd5346db0abda41fe' '44ec2b1260af155dd5346db0abda41fe'
'4f2379ed84258050edb858ee8d281678' '4f2379ed84258050edb858ee8d281678'
'61c5ff73c136ed07a7aadbf58db3d96a' '61c5ff73c136ed07a7aadbf58db3d96a'
@ -58,7 +61,7 @@ prepare() {
cd "${srcdir}/${_srcname}" cd "${srcdir}/${_srcname}"
# add upstream patch # add upstream patch
#git apply --whitespace=nowarn ../patch-${pkgver} git apply --whitespace=nowarn ../patch-${pkgver}
# RCN patch # RCN patch
git apply ../patch-${rcnver%.0}-${rcnrel}.diff git apply ../patch-${rcnver%.0}-${rcnrel}.diff
@ -73,6 +76,7 @@ prepare() {
git apply ../0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch git apply ../0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
git apply ../0008-ARM-dove-enable-ethernet-on-D3Plug.patch git apply ../0008-ARM-dove-enable-ethernet-on-D3Plug.patch
git apply ../0009-USB-Armory-MkII-support.patch git apply ../0009-USB-Armory-MkII-support.patch
git apply ../0010-Revert-ARM-8947-1-Fix-__arch_get_hw_counter-access-t.patch
cat "${srcdir}/config" > ./.config cat "${srcdir}/config" > ./.config