core/linux-armv5 to 4.17.0-1

This commit is contained in:
Kevin Mihelich 2018-06-05 03:18:09 +00:00
parent ce807c2612
commit 66267ee872
13 changed files with 207 additions and 261 deletions

View file

@ -1,10 +1,10 @@
From 53e7e1b9714a896948d4443ccd8672973a197b18 Mon Sep 17 00:00:00 2001
From 7c643b5b403a0a9d1943aaa42a3e41337cfdc8c8 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH 1/9] net/smsc95xx: Allow mac address to be set as a parameter
---
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
@ -91,5 +91,5 @@ index 309b88acd3d0..7bc9feb891a1 100644
/* maybe the boot loader passed the MAC address in devicetree */
--
2.16.1
2.17.0

View file

@ -1,4 +1,4 @@
From f2c457ee01dff99f52b53c13f9287480a4495518 Mon Sep 17 00:00:00 2001
From 6b2b388337cb33e255f1adc0e1aba4a43a56d3ab Mon Sep 17 00:00:00 2001
From: Douglas Gilbert <[mailto:dgilbert@interlog.com]>
Date: Mon, 12 Aug 2013 10:36:25 -0500
Subject: [PATCH 2/9] at91: ariag25 updates
@ -8,7 +8,7 @@ v2: dropped at91sam9x5 usart fix, as merged mainline
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/at91-ariag25.dts | 39 +++++++++++++++++++++++++++++++++++---
arch/arm/boot/dts/at91-ariag25.dts | 39 +++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
@ -89,5 +89,5 @@ index e3e14b7e25aa..6fa702d84f14 100644
usb0: ohci@600000 {
--
2.16.1
2.17.0

View file

@ -1,4 +1,4 @@
From 13ac2aaac652fe638aee16ce69393e03177b27e3 Mon Sep 17 00:00:00 2001
From d8ebefdd445ef98c4b585cfc3956a40baa6175ea Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 13 Jun 2015 13:46:30 -0600
Subject: [PATCH 3/9] at91: arietta-g25 support
@ -6,14 +6,14 @@ Subject: [PATCH 3/9] at91: arietta-g25 support
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/at91-arietta128.dts | 165 ++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/at91-arietta256.dts | 165 ++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/at91-arietta128.dts | 165 ++++++++++++++++++++++++++
arch/arm/boot/dts/at91-arietta256.dts | 165 ++++++++++++++++++++++++++
3 files changed, 332 insertions(+)
create mode 100644 arch/arm/boot/dts/at91-arietta128.dts
create mode 100644 arch/arm/boot/dts/at91-arietta256.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ade7a38543dc..b5939b43ae3a 100644
index 7e2424957809..67f0410cb961 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -35,6 +35,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \
@ -368,5 +368,5 @@ index 000000000000..cf18f869611a
+
+};
--
2.16.1
2.17.0

View file

@ -1,14 +1,14 @@
From 4058a4acb326b16fdde72d35d16930efaf7eecdd Mon Sep 17 00:00:00 2001
From 2aa810c2797a4cdf3b58520c20c8bcb54d874d54 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 25 Feb 2018 16:32:06 -0700
Subject: [PATCH 4/9] leds: trigger: Introduce a SATA trigger
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
drivers/leds/trigger/Kconfig | 6 ++++++
drivers/leds/trigger/Kconfig | 6 ++++
drivers/leds/trigger/Makefile | 1 +
drivers/leds/trigger/ledtrig-sata.c | 43 +++++++++++++++++++++++++++++++++++++
include/linux/leds.h | 6 ++++++
drivers/leds/trigger/ledtrig-sata.c | 43 +++++++++++++++++++++++++++++
include/linux/leds.h | 6 ++++
4 files changed, 56 insertions(+)
create mode 100644 drivers/leds/trigger/ledtrig-sata.c
@ -91,11 +91,11 @@ index 000000000000..f1798f43666f
+}
+device_initcall(ledtrig_sata_init);
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 5579c64c8fd6..77fd36d6173e 100644
index b7e82550e655..065d1b955aca 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -351,6 +351,12 @@ extern void ledtrig_disk_activity(void);
static inline void ledtrig_disk_activity(void) {}
@@ -351,6 +351,12 @@ extern void ledtrig_disk_activity(bool write);
static inline void ledtrig_disk_activity(bool write) {}
#endif
+#ifdef CONFIG_LEDS_TRIGGER_SATA
@ -108,5 +108,5 @@ index 5579c64c8fd6..77fd36d6173e 100644
extern void ledtrig_mtd_activity(void);
#else
--
2.16.1
2.17.0

View file

@ -1,4 +1,4 @@
From 2b2fd91a42c24c563254942524caac40075af186 Mon Sep 17 00:00:00 2001
From 1977d24ec95c54cfe0051ba5d327b0416ea36afd Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 25 Feb 2018 16:34:33 -0700
Subject: [PATCH 5/9] ata: sata_mv: Add SATA activity LED trigger support
@ -30,5 +30,5 @@ index 42d4589b43d4..cd3cdd5efc8b 100644
int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
if (want_ncq != using_ncq)
--
2.16.1
2.17.0

View file

@ -1,4 +1,4 @@
From 8050b13e64804c199257e2b7cb21606958b34cca Mon Sep 17 00:00:00 2001
From e353095514e7c3c432e2be8f411db9cb54b1e783 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 25 Feb 2018 16:37:08 -0700
Subject: [PATCH 6/9] ARM: dts: kirkwood-pogo_e02: Set health LED to default-on
@ -9,10 +9,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
index a190080c9c4f..13eccf28003b 100644
index f9e95e55f36d..a3ee0ad3c1b4 100644
--- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts
+++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
@@ -38,7 +38,7 @@
@@ -36,7 +36,7 @@
health {
label = "pogo_e02:green:health";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
@ -22,5 +22,5 @@ index a190080c9c4f..13eccf28003b 100644
fault {
label = "pogo_e02:orange:fault";
--
2.16.1
2.17.0

View file

@ -1,4 +1,4 @@
From ca12692bcff940e7be7e7c3d102d6b17418f550f Mon Sep 17 00:00:00 2001
From d43620a7de14b6d16aeeb7c6494248b306928854 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 25 Feb 2018 16:38:04 -0700
Subject: [PATCH 7/9] Fix mvsdio SD card detection
@ -13,7 +13,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index c0ba6d8823b7..281a2feb2a6a 100644
index 121ce50b6d5e..4236a5e8043b 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -717,7 +717,7 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
@ -26,10 +26,10 @@ index c0ba6d8823b7..281a2feb2a6a 100644
/*
* SDHC cards always use these fixed values.
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 62b84dd8f9fe..7d38988c36df 100644
index baf3d5da4ccb..f7f1f4f0d2c9 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -358,6 +358,15 @@ int mmc_sd_switch_hs(struct mmc_card *card)
@@ -356,6 +356,15 @@ int mmc_sd_switch_hs(struct mmc_card *card)
if (!status)
return -ENOMEM;
@ -66,5 +66,5 @@ index 210247b3d11a..05029d5bd72a 100644
cmdreg = MVSD_CMD_INDEX(cmd->opcode);
--
2.16.1
2.17.0

View file

@ -1,4 +1,4 @@
From ee7da1cc44e9e8ab5e0d2069de036caf31f92c45 Mon Sep 17 00:00:00 2001
From 90e742bedbbe2be971be48f3f1ded8547264a086 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 25 Feb 2018 16:42:40 -0700
Subject: [PATCH 8/9] ARM: dts: kirkwood: Initial support for GoFlex Home
@ -6,15 +6,15 @@ Subject: [PATCH 8/9] ARM: dts: kirkwood: Initial support for GoFlex Home
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/kirkwood-goflexhome.dts | 127 ++++++++++++++++++++++++++++++
arch/arm/boot/dts/kirkwood-goflexhome.dts | 127 ++++++++++++++++++++++
2 files changed, 128 insertions(+)
create mode 100644 arch/arm/boot/dts/kirkwood-goflexhome.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b5939b43ae3a..0eb79c76dedf 100644
index 67f0410cb961..7b23ace892dc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -247,6 +247,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
@@ -250,6 +250,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
kirkwood-ds411.dtb \
kirkwood-ds411j.dtb \
kirkwood-ds411slim.dtb \
@ -156,5 +156,5 @@ index 000000000000..554716fbf367
+ };
+};
--
2.16.1
2.17.0

View file

@ -1,4 +1,4 @@
From 3f36550294e58750ae9a312753abef976cb28a1e Mon Sep 17 00:00:00 2001
From b246aca0be1fb73be526b50c1e38743762138721 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 25 Feb 2018 16:45:51 -0700
Subject: [PATCH 9/9] Revert "vfs,mm: fix a dead loop in
@ -13,10 +13,10 @@ device.
1 file changed, 4 deletions(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index 693f62212a59..39fa387ed6e2 100644
index 0604cb02e6f3..0659f3b9f04f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2064,10 +2064,6 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
@@ -2062,10 +2062,6 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
unsigned int prev_offset;
int error = 0;
@ -28,5 +28,5 @@ index 693f62212a59..39fa387ed6e2 100644
prev_index = ra->prev_pos >> PAGE_SHIFT;
prev_offset = ra->prev_pos & (PAGE_SIZE-1);
--
2.16.1
2.17.0

View file

@ -0,0 +1,11 @@
[Trigger]
Type = File
Operation = Install
Operation = Upgrade
Target = boot/zImage
Target = usr/lib/initcpio/*
[Action]
Description = Updating %PKGBASE% initcpios
When = PostTransaction
Exec = /usr/bin/mkinitcpio -p %PKGBASE%

View file

@ -4,10 +4,10 @@
buildarch=2
pkgbase=linux-armv5
_srcname=linux-4.16
_srcname=linux-4.17
_kernelname=${pkgbase#linux}
_desc="ARMv5 multi-platform"
pkgver=4.16.13
pkgver=4.17.0
pkgrel=1
arch=('arm')
url="http://www.kernel.org/"
@ -15,7 +15,7 @@ license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
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"
'0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
'0002-at91-ariag25-updates.patch'
'0003-at91-arietta-g25-support.patch'
@ -25,25 +25,28 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'0007-Fix-mvsdio-SD-card-detection.patch'
'0008-ARM-dts-kirkwood-Initial-support-for-GoFlex-Home.patch'
'0009-Revert-vfs-mm-fix-a-dead-loop-in-truncate_inode_page.patch'
'config')
md5sums=('1357fb4ee7c288fdeac5d4e0048f5c18'
'ace51349b2f09e3731709b95b8053289'
'79d6c8426b73e6fb85a26078232c757e'
'5c74b5ef2eae798e64a2b4bfeb4b00bd'
'daf9147c53a1389a85e673d02684922f'
'd16b66207022b40a6779c3c318a9a98b'
'19f6901829b222e2d9e8a041a83ddd9b'
'812a98acbdd6554285afc07a45859509'
'72ccc6d941bfab38b5c35717d20ce088'
'80de7816736a2d43b33c1f07babb1ec0'
'80b9c86e6aa74c09e1bdffe943ae07d6'
'dcb289936ada4794db3ffdc2b782a179')
'config'
'linux.preset'
'99-linux.hook')
md5sums=('5bb13a03274b66b56c85b26682e407d7'
'a6a9bd6503c3cab5163590541ed1a125'
'965da7ab05bc9f4d67eef06bb429a4d9'
'5f785fedf692c7a68bf592564944bff3'
'bf4bf743a18061b224f0b22caef96a6c'
'e98eb13fb334e8f45b7c3483556b6a29'
'292f76e074d58ae84e4f746823f98842'
'eb00def5fc3a2e1d690f3b7e67788345'
'638035602b3e456d4babfe5559bfba94'
'f85bf2ab9fa056f5dfa7650b59a37d6f'
'ee93f5635db809b0d0b7b6b14a1652e1'
'73d88ba395003e8cdb07daeb2c080ec5'
'79fa396e3f9a09a85156d6d7c2d34b58')
prepare() {
cd "${srcdir}/${_srcname}"
# add upstream patch
git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
#git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
# ALARM patches
git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@ -123,6 +126,17 @@ _package() {
-e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-i "${startdir}/${pkgname}.install"
# install mkinitcpio preset file for kernel
install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
sed \
-e "1s|'linux.*'|'${pkgbase}'|" \
-e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
-i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
# install pacman hook for initramfs regeneration
sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
# remove build and source links
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
# remove the firmware

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,10 @@
# mkinitcpio preset file for the linux-armv5 package
ALL_config="/etc/mkinitcpio.conf"
ALL_kver="4.70.0-1-ARCH"
PRESETS=('default')
#default_config="/etc/mkinitcpio.conf"
default_image="/boot/initramfs-linux.img"
#default_options=""