core/linux-armv7 to 4.2.0-1

This commit is contained in:
Kevin Mihelich 2015-09-01 00:12:01 +00:00
parent 7011c9d0d7
commit 5d2be373ee
10 changed files with 228 additions and 132 deletions

View file

@ -1,4 +1,4 @@
From c3378026429b3ff9f2236fe0700db7eb7e450a46 Mon Sep 17 00:00:00 2001
From 3f6a51e3dfaa871a8a114753c666adc1442f2496 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:59:28 +0100
Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot
@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644
};
--
2.4.4
2.4.5

View file

@ -1,4 +1,4 @@
From 8e6e2743ebdc2f46f59190391db3d2f37290047f Mon Sep 17 00:00:00 2001
From 693aa021add61922682c5cf6f5678f04fe7b94ef Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:56:58 +0100
Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
}
--
2.4.4
2.4.5

View file

@ -1,4 +1,4 @@
From 67570590136361a2bb0ed62beef15151dc1a4572 Mon Sep 17 00:00:00 2001
From c09c0e15623ad939dbc5483d48adce41085bf2aa Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:41:19 -0600
Subject: [PATCH 3/8] SMILE Plug device tree file
@ -14,12 +14,12 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 992736b..2373ab3 100644
index 246473a..5586e7a 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -625,6 +625,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
dtb-$(CONFIG_MACH_ARMADA_370) += \
@@ -672,6 +672,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
armada-370-db.dtb \
armada-370-dlink-dns327l.dtb \
armada-370-mirabox.dtb \
+ armada-370-smileplug.dtb \
armada-370-netgear-rn102.dtb \
@ -205,5 +205,5 @@ index 0000000..d01308a
+ };
+};
--
2.4.4
2.4.5

View file

@ -1,4 +1,4 @@
From 3fe82206833efc04b2625c60eb7f3ea6972d5a53 Mon Sep 17 00:00:00 2001
From d0899762087c6ff5c8a9b522d4f2fe1f9d527b5f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:43:56 -0600
Subject: [PATCH 4/8] fix mvsdio eMMC timing
@ -34,5 +34,5 @@ index a448498..14441a6 100644
host->clock = ios->clock;
host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
--
2.4.4
2.4.5

View file

@ -1,4 +1,4 @@
From 0cca0b90853cd9e03a5c6d2018d1fb5c790dce59 Mon Sep 17 00:00:00 2001
From f51bebf4094d0263c125b38b761a0eb2e3bbdbd8 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter
@ -91,5 +91,5 @@ index 26423ad..e29a323 100644
if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
dev->net->dev_addr) == 0) {
--
2.4.4
2.4.5

View file

@ -1,4 +1,4 @@
From 493b50d16cd287231bbe11da07f82184d80ceba2 Mon Sep 17 00:00:00 2001
From be369dba2e0a95d54cc858b5d8ecada13baf328a Mon Sep 17 00:00:00 2001
From: dobatog <dobatog@gmail.com>
Date: Thu, 26 Feb 2015 12:32:27 +0100
Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
@ -27,7 +27,7 @@ Tested-by: Max Filippov <jcmvbkbc@gmail.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index cc17e7e..891f3aa 100644
index cd8c02b..95e6b11 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -174,10 +174,10 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
@ -45,5 +45,5 @@ index cc17e7e..891f3aa 100644
/* input mux */
{"Capture Source", "Line", "Line Input"},
--
2.4.4
2.4.5

View file

@ -1,4 +1,4 @@
From b9c28f3bd758d09374fe35e86d5d5d4aeb7c6a0a Mon Sep 17 00:00:00 2001
From f141851ab061abfc770b9a0540ee6f6c87e863c0 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 14 Jun 2015 13:20:25 -0600
Subject: [PATCH 7/8] set default cubietruck led triggers
@ -9,10 +9,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 8f74a64..1161296 100644
index 4611e2f..5739f2b 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -205,6 +205,7 @@
@@ -70,6 +70,7 @@
blue {
label = "cubietruck:blue:usr";
gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
@ -20,7 +20,7 @@ index 8f74a64..1161296 100644
};
orange {
@@ -220,6 +221,7 @@
@@ -85,6 +86,7 @@
green {
label = "cubietruck:green:usr";
gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;
@ -29,5 +29,5 @@ index 8f74a64..1161296 100644
};
--
2.4.4
2.4.5

View file

@ -1,4 +1,4 @@
From 163421a4fef11bea6cf4bdb4ad9de67fb340bb90 Mon Sep 17 00:00:00 2001
From ac49b5026524acf13cbdeef8d5f72257aef3e31d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 7 Mar 2015 16:51:15 -0700
Subject: [PATCH 8/8] USB armory support
@ -16,10 +16,10 @@ Subject: [PATCH 8/8] USB armory support
create mode 100644 arch/arm/boot/dts/imx53-usbarmory.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 2373ab3..27728dd 100644
index 5586e7a..d54f5f7 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -252,6 +252,9 @@ dtb-$(CONFIG_SOC_IMX53) += \
@@ -264,6 +264,9 @@ dtb-$(CONFIG_SOC_IMX53) += \
imx53-smd.dtb \
imx53-tx53-x03x.dtb \
imx53-tx53-x13x.dtb \
@ -28,7 +28,7 @@ index 2373ab3..27728dd 100644
+ imx53-usbarmory-host.dtb \
imx53-voipac-bsb.dtb
dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-aristainetos_4.dtb \
imx6dl-apf6dev.dtb \
diff --git a/arch/arm/boot/dts/imx53-usbarmory-common.dtsi b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
new file mode 100644
index 0000000..c7cbd84
@ -325,5 +325,5 @@ index 0000000..902a73b
+ status = "okay";
+};
--
2.4.4
2.4.5

View file

@ -4,21 +4,21 @@
buildarch=4
pkgbase=linux-armv7
_srcname=linux-4.1
_srcname=linux-4.2
_kernelname=${pkgbase#linux}
_desc="ARMv7 multi-platform"
pkgver=4.1.6
pkgver=4.2.0
pkgrel=1
rcnrel=armv7-x2
rcnrel=armv7-x0
arch=('armv7h')
url="http://www.kernel.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools')
options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
#"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
"http://rcn-ee.com/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
"git+https://github.com/sfjro/aufs4-standalone.git#branch=aufs${pkgver%.*}"
#"git+https://github.com/sfjro/aufs4-standalone.git#branch=aufs${pkgver%.*}"
#"git+https://github.com/sfjro/aufs4-standalone.git#branch=aufs4.x-rcN"
'0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
'0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
@ -29,25 +29,23 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'0007-set-default-cubietruck-led-triggers.patch'
'0008-USB-armory-support.patch'
'config')
md5sums=('fe9dc0f6729f36400ea81aa41d614c37'
'7dea69f02c906206f88df48085069eb6'
'85f64432d43e1c329605bfa68fbcad79'
'SKIP'
'db7c0ff1f385725f3e0683b0f544db6b'
'ad71eb3cdf4fa9b1b292017af32cbf79'
'5f549866a22ba1ebe1476c4f2800a1fe'
'3c99f777fa383198887cba84b768efe7'
'95895bca7fad74be10216eb293026f5e'
'aa5fc5a2efb2d122c6dbd49fb9356e2e'
'996623b310630e6471329f304167834c'
'8a5f87a89b4d0f9a7c93d762670e7342'
'756ed626eee70c33aeddff416176872d')
md5sums=('3d5ea06d767e2f35c999eeadafc76523'
'80a79429a87d132b35f8bb82f218b614'
'61f728f854713d17a3d4ef00f8e38f1e'
'bc39bcc5d752155854f31eb7758db5e8'
'e871d819421abab551d8219b62cccdf9'
'05e37d0cd7670fe10502b56864b93c41'
'bef1f3ba7b87f467316de0ae99b40acf'
'3be6a6ddf93b89e90cc127268721845e'
'fe20decabf6b7d94cf2ecb4d15a07ba7'
'50dca48291316e4c0a7e918f08d5e3f5'
'36cc9dcd9d479c35d362b852a00d6d74')
prepare() {
cd "${srcdir}/${_srcname}"
# add upstream patch
git apply --whitespace=nowarn ../patch-${pkgver}
#git apply --whitespace=nowarn ../patch-${pkgver}
# RCN patch
git apply ../patch-${pkgver%.0}-${rcnrel}.diff
@ -63,15 +61,15 @@ prepare() {
git apply ../0008-USB-armory-support.patch
# AUFS patches
cp -ru "${srcdir}/aufs4-standalone/Documentation" .
cp -ru "${srcdir}/aufs4-standalone/fs" .
cp -ru "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" ./include/linux
cp -ru "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
#cp -ru "${srcdir}/aufs4-standalone/Documentation" .
#cp -ru "${srcdir}/aufs4-standalone/fs" .
#cp -ru "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" ./include/linux
#cp -ru "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
git apply ../aufs4-standalone/aufs4-kbuild.patch
git apply ../aufs4-standalone/aufs4-base.patch
git apply ../aufs4-standalone/aufs4-mmap.patch
git apply ../aufs4-standalone/aufs4-standalone.patch
#git apply ../aufs4-standalone/aufs4-kbuild.patch
#git apply ../aufs4-standalone/aufs4-base.patch
#git apply ../aufs4-standalone/aufs4-mmap.patch
#git apply ../aufs4-standalone/aufs4-standalone.patch
cat "${srcdir}/config" > ./.config

File diff suppressed because it is too large Load diff