diff --git a/core/linux-kirkwood-dt/0001-leds-trigger-Introduce-a-SATA-trigger.patch b/core/linux-kirkwood-dt/0001-leds-trigger-Introduce-a-SATA-trigger.patch
new file mode 100644
index 000000000..5dbd4532d
--- /dev/null
+++ b/core/linux-kirkwood-dt/0001-leds-trigger-Introduce-a-SATA-trigger.patch
@@ -0,0 +1,112 @@
+From 4058a4acb326b16fdde72d35d16930efaf7eecdd Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 25 Feb 2018 16:32:06 -0700
+Subject: [PATCH 1/6] leds: trigger: Introduce a SATA trigger
+
+Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
+---
+ drivers/leds/trigger/Kconfig        |  6 ++++++
+ drivers/leds/trigger/Makefile       |  1 +
+ 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
+
+diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
+index a2559b4fdfff..592f942e0300 100644
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -41,6 +41,12 @@ config LEDS_TRIGGER_DISK
+ 	  This allows LEDs to be controlled by disk activity.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_SATA
++	bool "LED SATA Disk Trigger for Kirkwood SOC"
++	depends on LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by IDE disk activity.
++
+ config LEDS_TRIGGER_MTD
+ 	bool "LED MTD (NAND/NOR) Trigger"
+ 	depends on MTD
+diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
+index f3cfe1950538..f294704a3ebe 100644
+--- a/drivers/leds/trigger/Makefile
++++ b/drivers/leds/trigger/Makefile
+@@ -2,6 +2,7 @@
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
+ obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)	+= ledtrig-oneshot.o
+ obj-$(CONFIG_LEDS_TRIGGER_DISK)		+= ledtrig-disk.o
++obj-$(CONFIG_LEDS_TRIGGER_SATA)		+= ledtrig-sata.o
+ obj-$(CONFIG_LEDS_TRIGGER_MTD)		+= ledtrig-mtd.o
+ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
+ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
+diff --git a/drivers/leds/trigger/ledtrig-sata.c b/drivers/leds/trigger/ledtrig-sata.c
+new file mode 100644
+index 000000000000..f1798f43666f
+--- /dev/null
++++ b/drivers/leds/trigger/ledtrig-sata.c
+@@ -0,0 +1,43 @@
++/*
++ * LED SATA-Disk Activity Trigger
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/leds.h>
++
++#define BLINK_DELAY 30
++
++DEFINE_LED_TRIGGER(ledtrig_sata1);
++DEFINE_LED_TRIGGER(ledtrig_sata2);
++
++void ledtrig_sata_activity(int port_number)
++{
++	unsigned long sata_blink_delay = BLINK_DELAY;
++
++	switch (port_number) {
++		case 0:
++			led_trigger_blink_oneshot(ledtrig_sata1, &sata_blink_delay, &sata_blink_delay, 0);
++			break;
++		case 1:
++			led_trigger_blink_oneshot(ledtrig_sata2, &sata_blink_delay, &sata_blink_delay, 0);
++			break;
++		default:
++			break;
++       }
++}
++EXPORT_SYMBOL(ledtrig_sata_activity);
++
++static int __init ledtrig_sata_init(void)
++{
++       led_trigger_register_simple("sata-disk1", &ledtrig_sata1);
++       led_trigger_register_simple("sata-disk2", &ledtrig_sata2);
++
++	return 0;
++}
++device_initcall(ledtrig_sata_init);
+diff --git a/include/linux/leds.h b/include/linux/leds.h
+index 5579c64c8fd6..77fd36d6173e 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) {}
+ #endif
+ 
++#ifdef CONFIG_LEDS_TRIGGER_SATA
++extern void ledtrig_sata_activity(int port_number);
++#else
++static inline void ledtrig_sata_activity(int port_number) {}
++#endif
++
+ #ifdef CONFIG_LEDS_TRIGGER_MTD
+ extern void ledtrig_mtd_activity(void);
+ #else
+-- 
+2.16.1
+
diff --git a/core/linux-kirkwood-dt/0002-ata-sata_mv-Add-SATA-activity-LED-trigger-support.patch b/core/linux-kirkwood-dt/0002-ata-sata_mv-Add-SATA-activity-LED-trigger-support.patch
new file mode 100644
index 000000000..424c793a5
--- /dev/null
+++ b/core/linux-kirkwood-dt/0002-ata-sata_mv-Add-SATA-activity-LED-trigger-support.patch
@@ -0,0 +1,34 @@
+From 2b2fd91a42c24c563254942524caac40075af186 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 25 Feb 2018 16:34:33 -0700
+Subject: [PATCH 2/6] ata: sata_mv: Add SATA activity LED trigger support
+
+Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
+---
+ drivers/ata/sata_mv.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
+index 42d4589b43d4..cd3cdd5efc8b 100644
+--- a/drivers/ata/sata_mv.c
++++ b/drivers/ata/sata_mv.c
+@@ -72,6 +72,7 @@
+ #include <scsi/scsi_cmnd.h>
+ #include <scsi/scsi_device.h>
+ #include <linux/libata.h>
++#include <linux/leds.h>
+ 
+ #define DRV_NAME	"sata_mv"
+ #define DRV_VERSION	"1.28"
+@@ -1175,6 +1176,8 @@ static void mv_start_edma(struct ata_port *ap, void __iomem *port_mmio,
+ {
+ 	int want_ncq = (protocol == ATA_PROT_NCQ);
+ 
++	ledtrig_sata_activity(ap->port_no);
++
+ 	if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
+ 		int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
+ 		if (want_ncq != using_ncq)
+-- 
+2.16.1
+
diff --git a/core/linux-kirkwood-dt/0003-ARM-dts-kirkwood-pogo_e02-Set-health-LED-to-default-.patch b/core/linux-kirkwood-dt/0003-ARM-dts-kirkwood-pogo_e02-Set-health-LED-to-default-.patch
new file mode 100644
index 000000000..5553d66f9
--- /dev/null
+++ b/core/linux-kirkwood-dt/0003-ARM-dts-kirkwood-pogo_e02-Set-health-LED-to-default-.patch
@@ -0,0 +1,26 @@
+From 8050b13e64804c199257e2b7cb21606958b34cca Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 25 Feb 2018 16:37:08 -0700
+Subject: [PATCH 3/6] ARM: dts: kirkwood-pogo_e02: Set health LED to default-on
+
+Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
+---
+ arch/arm/boot/dts/kirkwood-pogo_e02.dts | 2 +-
+ 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
+--- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts
++++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
+@@ -38,7 +38,7 @@
+ 		health {
+ 			label = "pogo_e02:green:health";
+ 			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+-			default-state = "keep";
++			default-state = "default-on";
+ 		};
+ 		fault {
+ 			label = "pogo_e02:orange:fault";
+-- 
+2.16.1
+
diff --git a/core/linux-kirkwood-dt/0004-Fix-mvsdio-SD-card-detection.patch b/core/linux-kirkwood-dt/0004-Fix-mvsdio-SD-card-detection.patch
new file mode 100644
index 000000000..f0bf36778
--- /dev/null
+++ b/core/linux-kirkwood-dt/0004-Fix-mvsdio-SD-card-detection.patch
@@ -0,0 +1,70 @@
+From ca12692bcff940e7be7e7c3d102d6b17418f550f Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 25 Feb 2018 16:38:04 -0700
+Subject: [PATCH 4/6] Fix mvsdio SD card detection
+
+Helps SD card detection on PPv4.
+
+Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
+---
+ drivers/mmc/core/core.c   | 2 +-
+ drivers/mmc/core/sd.c     | 9 +++++++++
+ drivers/mmc/host/mvsdio.c | 2 ++
+ 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
+--- 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)
+ 			 */
+ 			limit_us = 3000000;
+ 		else
+-			limit_us = 100000;
++			limit_us = 200000;
+ 
+ 		/*
+ 		 * 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
+--- 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)
+ 	if (!status)
+ 		return -ENOMEM;
+ 
++	/*
++	 * Some SDHC cards, notably those with a Sandisk SD controller
++	 * (also found in Kingston products) need a bit of slack
++	 * before successfully handling the SWITCH command.  So far,
++	 * cards identifying themselves as "SD04G" and "SD08G" are
++	 * affected
++	 */
++	udelay(100);
++
+ 	err = mmc_sd_switch(card, 1, 0, 1, status);
+ 	if (err)
+ 		goto out;
+diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
+index 210247b3d11a..05029d5bd72a 100644
+--- a/drivers/mmc/host/mvsdio.c
++++ b/drivers/mmc/host/mvsdio.c
+@@ -23,6 +23,7 @@
+ #include <linux/of_irq.h>
+ #include <linux/mmc/host.h>
+ #include <linux/mmc/slot-gpio.h>
++#include <linux/mmc/sd.h>
+ 
+ #include <asm/sizes.h>
+ #include <asm/unaligned.h>
+@@ -149,6 +150,7 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
+ 
+ 	dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n",
+ 		cmd->opcode, mvsd_read(MVSD_HW_STATE));
++	if (cmd->opcode == SD_SWITCH) mdelay(1); /* Voodoo */
+ 
+ 	cmdreg = MVSD_CMD_INDEX(cmd->opcode);
+ 
+-- 
+2.16.1
+
diff --git a/core/linux-kirkwood-dt/goflexhome_fdt.patch b/core/linux-kirkwood-dt/0005-ARM-dts-kirkwood-Initial-support-for-GoFlex-Home.patch
similarity index 78%
rename from core/linux-kirkwood-dt/goflexhome_fdt.patch
rename to core/linux-kirkwood-dt/0005-ARM-dts-kirkwood-Initial-support-for-GoFlex-Home.patch
index c9abf15ed..5bd36af4d 100644
--- a/core/linux-kirkwood-dt/goflexhome_fdt.patch
+++ b/core/linux-kirkwood-dt/0005-ARM-dts-kirkwood-Initial-support-for-GoFlex-Home.patch
@@ -1,6 +1,32 @@
-diff -uprN a/arch/arm/boot/dts/kirkwood-goflexhome.dts b/arch/arm/boot/dts/kirkwood-goflexhome.dts
---- a/arch/arm/boot/dts/kirkwood-goflexhome.dts	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts	2014-08-10 02:34:52.310545726 -0600
+From ee7da1cc44e9e8ab5e0d2069de036caf31f92c45 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 25 Feb 2018 16:42:40 -0700
+Subject: [PATCH 5/6] 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 ++++++++++++++++++++++++++++++
+ 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
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -247,6 +247,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
+ 	kirkwood-ds411.dtb \
+ 	kirkwood-ds411j.dtb \
+ 	kirkwood-ds411slim.dtb \
++	kirkwood-goflexhome.dtb \
+ 	kirkwood-goflexnet.dtb \
+ 	kirkwood-guruplug-server-plus.dtb \
+ 	kirkwood-ib62x0.dtb \
+diff --git a/arch/arm/boot/dts/kirkwood-goflexhome.dts b/arch/arm/boot/dts/kirkwood-goflexhome.dts
+new file mode 100644
+index 000000000000..554716fbf367
+--- /dev/null
++++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
 @@ -0,0 +1,127 @@
 +/dts-v1/;
 +
@@ -129,14 +155,6 @@ diff -uprN a/arch/arm/boot/dts/kirkwood-goflexhome.dts b/arch/arm/boot/dts/kirkw
 +		phy-handle = <&ethphy0>;
 +	};
 +};
-diff -uprN a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
---- a/arch/arm/boot/dts/Makefile	2014-08-03 16:25:02.000000000 -0600
-+++ b/arch/arm/boot/dts/Makefile	2014-08-10 03:14:10.157372577 -0600
-@@ -111,6 +111,7 @@ kirkwood := \
- 	kirkwood-ds411.dtb \
- 	kirkwood-ds411j.dtb \
- 	kirkwood-ds411slim.dtb \
-+	kirkwood-goflexhome.dtb \
- 	kirkwood-goflexnet.dtb \
- 	kirkwood-guruplug-server-plus.dtb \
- 	kirkwood-ib62x0.dtb \
+-- 
+2.16.1
+
diff --git a/core/linux-kirkwood-dt/0006-Revert-vfs-mm-fix-a-dead-loop-in-truncate_inode_page.patch b/core/linux-kirkwood-dt/0006-Revert-vfs-mm-fix-a-dead-loop-in-truncate_inode_page.patch
new file mode 100644
index 000000000..043c19cf6
--- /dev/null
+++ b/core/linux-kirkwood-dt/0006-Revert-vfs-mm-fix-a-dead-loop-in-truncate_inode_page.patch
@@ -0,0 +1,32 @@
+From 3f36550294e58750ae9a312753abef976cb28a1e Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 25 Feb 2018 16:45:51 -0700
+Subject: [PATCH 6/6] Revert "vfs,mm: fix a dead loop in
+ truncate_inode_pages_range()"
+
+This reverts commit c2a9737f45e27d8263ff9643f994bda9bac0b944.
+
+This causes the kernel to not be able to read beyond 8TB on a single
+device.
+---
+ mm/filemap.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/mm/filemap.c b/mm/filemap.c
+index 693f62212a59..39fa387ed6e2 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -2064,10 +2064,6 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
+ 	unsigned int prev_offset;
+ 	int error = 0;
+ 
+-	if (unlikely(*ppos >= inode->i_sb->s_maxbytes))
+-		return 0;
+-	iov_iter_truncate(iter, inode->i_sb->s_maxbytes);
+-
+ 	index = *ppos >> PAGE_SHIFT;
+ 	prev_index = ra->prev_pos >> PAGE_SHIFT;
+ 	prev_offset = ra->prev_pos & (PAGE_SIZE-1);
+-- 
+2.16.1
+
diff --git a/core/linux-kirkwood-dt/99-linux.hook b/core/linux-kirkwood-dt/99-linux.hook
new file mode 100644
index 000000000..365b23303
--- /dev/null
+++ b/core/linux-kirkwood-dt/99-linux.hook
@@ -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%
diff --git a/core/linux-kirkwood-dt/PKGBUILD b/core/linux-kirkwood-dt/PKGBUILD
index ba89d5ce4..58a7d1d24 100644
--- a/core/linux-kirkwood-dt/PKGBUILD
+++ b/core/linux-kirkwood-dt/PKGBUILD
@@ -4,46 +4,52 @@
 buildarch=2
 
 pkgbase=linux-kirkwood-dt
+_srcname=linux-4.15
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood DT"
-pkgver=4.14.22
-srcver=${pkgver%.0}
+pkgver=4.15.7
 pkgrel=1
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
-
-source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
+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"
+        '0001-leds-trigger-Introduce-a-SATA-trigger.patch'
+        '0002-ata-sata_mv-Add-SATA-activity-LED-trigger-support.patch'
+        '0003-ARM-dts-kirkwood-pogo_e02-Set-health-LED-to-default-.patch'
+        '0004-Fix-mvsdio-SD-card-detection.patch'
+        '0005-ARM-dts-kirkwood-Initial-support-for-GoFlex-Home.patch'
+        '0006-Revert-vfs-mm-fix-a-dead-loop-in-truncate_inode_page.patch'
         'config'
-        'archlinuxarm.patch'
-        'fix_shortread_on_huge_media.patch'
-        '0001-disable-mv643xx_eth-TSO.patch'
-        'goflexhome_fdt.patch'
-        'linux.preset')
-md5sums=('0c033c0420ae28017c2f15e02d0cf90c'
-         'f369b1b4e1c7949a015879b1ac20d3f6'
-         'a6c6f6d930d43787117d00fc759c115b'
-         '79dd8cd94a574db6b2a024dec7c45a54'
-         '09d44b9f07abfaeaf4f688ee52034786'
-         'f5a554eefbd337e71cca072e2d2cab45'
-         '959e49540dac4c5e689ad9037150a360')
+        'linux.preset'
+        '99-linux.hook')
+md5sums=('0d701ac1e2a67d47ce7127432df2c32b'
+         'be343335405432d9cd83bf98b281436d'
+         '67641ed920ee806963e850c307b40b70'
+         '46f2f897e7f3dd1b3697c89b4a7249eb'
+         '4d51e29b9158a429f1fa735278224a31'
+         '6353ab58a64d14c6ee1516b6e5b6eefd'
+         '315701114e9f116138b3e94b0555d4f6'
+         'bd61cc7dfcb0dbd2c880e5aa58775242'
+         '4fcede430574cef4740fe0880b70c1cd'
+         '959e49540dac4c5e689ad9037150a360'
+         '79fa396e3f9a09a85156d6d7c2d34b58')
 
 prepare() {
-  cd "${srcdir}/linux-${srcver}"
+  cd "${srcdir}/${_srcname}"
  
-  # Effectively reverts commit A3d549dcfbbb0ecdaa571431a27ee5da9f2466716 as it causes
-  # kernel not to be able to read beyond 8TB on a single device.
-  # https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=3d549dcfbbb0ecdaa571431a27ee5da9f2466716
-  # https://archlinuxarm.org/forum/viewtopic.php?f=15&t=11535&p=55350#p55350
-  patch -Np1 -i "${srcdir}/fix_shortread_on_huge_media.patch"
+  # add upstream patch
+  git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/0001-disable-mv643xx_eth-TSO.patch"
-
-  msg2 "Add Arch Linux ARM patch for ARMv5te plug computers"
-  patch -Np1 -i "${srcdir}/archlinuxarm.patch"
-  patch -Np1 -i "${srcdir}/goflexhome_fdt.patch"
+  # ALARM patches
+  git apply ../0001-leds-trigger-Introduce-a-SATA-trigger.patch
+  git apply ../0002-ata-sata_mv-Add-SATA-activity-LED-trigger-support.patch
+  git apply ../0003-ARM-dts-kirkwood-pogo_e02-Set-health-LED-to-default-.patch
+  git apply ../0004-Fix-mvsdio-SD-card-detection.patch
+  git apply ../0005-ARM-dts-kirkwood-Initial-support-for-GoFlex-Home.patch
+  git apply ../0006-Revert-vfs-mm-fix-a-dead-loop-in-truncate_inode_page.patch
 
   cat "${srcdir}/config" > ./.config
 
@@ -55,7 +61,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/linux-${srcver}"
+  cd "${srcdir}/${_srcname}"
 
   # get kernel version
   make prepare
@@ -81,7 +87,7 @@ build() {
   #yes "" | make config
 
   msg "Building!"
-  make ${MAKEFLAGS} zImage modules dtbs kirkwood-nsa320.dtb kirkwood-nsa325.dtb
+  make ${MAKEFLAGS} zImage modules dtbs
 }
 
 _package() {
@@ -93,7 +99,7 @@ _package() {
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=${pkgname}.install
 
-  cd "${srcdir}/linux-${srcver}"
+  cd "${srcdir}/${_srcname}"
 
   KARCH=arm
 
@@ -103,10 +109,10 @@ _package() {
   #_basekernel=${_basekernel%.*}
   _basekernel=${pkgver}
 
-  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot/dtbs}
+  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware}
   make INSTALL_MOD_PATH="${pkgdir}" modules_install
+  make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install
   cp arch/$KARCH/boot/zImage "${pkgdir}/boot/zImage"
-  cp arch/$KARCH/boot/dts/*.dtb "${pkgdir}/boot/dtbs"
 
   # set correct depmod command for install
   sed \
@@ -121,19 +127,19 @@ _package() {
     -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
   rm -rf "${pkgdir}/lib/firmware"
-  # gzip -9 all modules to save 100MB of space
-  find "${pkgdir}" -name '*.ko' |xargs -P 2 -n 1 gzip -9
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}/version"
-
-  cd "${srcdir}/linux-${srcver}"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
 
   # Now we call depmod...
   depmod -b "$pkgdir" -F System.map "$_kernver"
@@ -154,7 +160,7 @@ _package-headers() {
   cd "${pkgdir}/usr/lib/modules/${_kernver}"
   ln -sf ../../../src/linux-${_kernver} build
 
-  cd "${srcdir}/linux-${srcver}"
+  cd "${srcdir}/${_srcname}"
   install -D -m644 Makefile \
     "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
   install -D -m644 kernel/Makefile \
diff --git a/core/linux-kirkwood-dt/archlinuxarm.patch b/core/linux-kirkwood-dt/archlinuxarm.patch
deleted file mode 100644
index 40f80e70b..000000000
--- a/core/linux-kirkwood-dt/archlinuxarm.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -ruN a/arch/arm/boot/dts/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
---- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts	2016-10-02 17:24:33.000000000 -0600
-+++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts	2016-10-02 23:41:08.542632805 -0600
-@@ -38,7 +38,7 @@
- 		health {
- 			label = "pogo_e02:green:health";
- 			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
--			default-state = "keep";
-+			default-state = "default-on";
- 		};
- 		fault {
- 			label = "pogo_e02:orange:fault";
-diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
---- a/drivers/ata/sata_mv.c	2016-10-02 17:24:33.000000000 -0600
-+++ b/drivers/ata/sata_mv.c	2016-10-03 00:07:50.934801409 -0600
-@@ -72,6 +72,7 @@
- #include <scsi/scsi_cmnd.h>
- #include <scsi/scsi_device.h>
- #include <linux/libata.h>
-+#include <linux/leds.h>
- 
- #define DRV_NAME	"sata_mv"
- #define DRV_VERSION	"1.28"
-@@ -1175,6 +1176,8 @@
- {
- 	int want_ncq = (protocol == ATA_PROT_NCQ);
- 
-+	ledtrig_sata_activity(ap->port_no);
-+
- 	if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
- 		int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
- 		if (want_ncq != using_ncq)
-diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
---- a/drivers/leds/trigger/Kconfig	2016-10-02 17:24:33.000000000 -0600
-+++ b/drivers/leds/trigger/Kconfig	2016-10-02 23:54:28.033717682 -0600
-@@ -41,6 +41,12 @@
- 	  This allows LEDs to be controlled by disk activity.
- 	  If unsure, say Y.
- 
-+config LEDS_TRIGGER_SATA
-+	bool "LED SATA Disk Trigger fir Kirkwood SOC"
-+	depends on LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by IDE disk activity.
-+
- config LEDS_TRIGGER_MTD
- 	bool "LED MTD (NAND/NOR) Trigger"
- 	depends on MTD
-diff -ruN a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
---- a/drivers/leds/trigger/Makefile	2016-10-02 17:24:33.000000000 -0600
-+++ b/drivers/leds/trigger/Makefile	2016-10-02 23:52:47.634208429 -0600
-@@ -1,6 +1,7 @@
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
- obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)	+= ledtrig-oneshot.o
- obj-$(CONFIG_LEDS_TRIGGER_DISK)		+= ledtrig-disk.o
-+obj-$(CONFIG_LEDS_TRIGGER_SATA)         += ledtrig-sata.o
- obj-$(CONFIG_LEDS_TRIGGER_MTD)		+= ledtrig-mtd.o
- obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
-diff -ruN a/drivers/leds/trigger/ledtrig-sata.c b/drivers/leds/trigger/ledtrig-sata.c
---- a/drivers/leds/trigger/ledtrig-sata.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/drivers/leds/trigger/ledtrig-sata.c	2016-10-03 00:09:26.434336496 -0600
-@@ -0,0 +1,43 @@
-+/*
-+ * LED SATA-Disk Activity Trigger
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/leds.h>
-+
-+#define BLINK_DELAY 30
-+
-+DEFINE_LED_TRIGGER(ledtrig_sata1);
-+DEFINE_LED_TRIGGER(ledtrig_sata2);
-+
-+void ledtrig_sata_activity(int port_number)
-+{
-+	unsigned long sata_blink_delay = BLINK_DELAY;
-+
-+	switch (port_number) {
-+		case 0:
-+			led_trigger_blink_oneshot(ledtrig_sata1, &sata_blink_delay, &sata_blink_delay, 0);
-+			break;
-+		case 1:
-+			led_trigger_blink_oneshot(ledtrig_sata2, &sata_blink_delay, &sata_blink_delay, 0);
-+			break;
-+		default:
-+			break;
-+       }
-+}
-+EXPORT_SYMBOL(ledtrig_sata_activity);
-+
-+static int __init ledtrig_sata_init(void)
-+{
-+       led_trigger_register_simple("sata-disk1", &ledtrig_sata1);
-+       led_trigger_register_simple("sata-disk2", &ledtrig_sata2);
-+
-+	return 0;
-+}
-+device_initcall(ledtrig_sata_init);
-diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
---- a/drivers/mmc/core/core.c	2016-10-02 17:24:33.000000000 -0600
-+++ b/drivers/mmc/core/core.c	2016-10-02 23:41:08.547632780 -0600
-@@ -857,7 +857,7 @@
- 			 */
- 			limit_us = 3000000;
- 		else
--			limit_us = 100000;
-+			limit_us = 200000;
- 
- 		/*
- 		 * SDHC cards always use these fixed values.
-diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
---- a/drivers/mmc/core/sd.c	2016-10-02 17:24:33.000000000 -0600
-+++ b/drivers/mmc/core/sd.c	2016-10-02 23:41:08.552632755 -0600
-@@ -363,6 +363,15 @@
- 		return -ENOMEM;
- 	}
- 
-+	/*
-+	 * Some SDHC cards, notably those with a Sandisk SD controller
-+	 * (also found in Kingston products) need a bit of slack
-+	 * before successfully handling the SWITCH command.  So far,
-+	 * cards identifying themselves as "SD04G" and "SD08G" are
-+	 * affected
-+	 */
-+	udelay(100);
-+
- 	err = mmc_sd_switch(card, 1, 0, 1, status);
- 	if (err)
- 		goto out;
-diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
---- a/drivers/mmc/host/mvsdio.c	2016-10-02 17:24:33.000000000 -0600
-+++ b/drivers/mmc/host/mvsdio.c	2016-10-02 23:41:08.552632755 -0600
-@@ -23,6 +23,7 @@
- #include <linux/of_irq.h>
- #include <linux/mmc/host.h>
- #include <linux/mmc/slot-gpio.h>
-+#include <linux/mmc/sd.h>
- 
- #include <asm/sizes.h>
- #include <asm/unaligned.h>
-@@ -149,6 +150,7 @@
- 
- 	dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n",
- 		cmd->opcode, mvsd_read(MVSD_HW_STATE));
-+	if (cmd->opcode == SD_SWITCH) mdelay(1); /* Voodoo */
- 
- 	cmdreg = MVSD_CMD_INDEX(cmd->opcode);
- 
-diff -ruN a/include/linux/leds.h b/include/linux/leds.h
---- a/include/linux/leds.h	2016-10-02 17:24:33.000000000 -0600
-+++ b/include/linux/leds.h	2016-10-03 00:15:52.467581672 -0600
-@@ -331,6 +331,12 @@
- static inline void ledtrig_disk_activity(void) {}
- #endif
- 
-+#ifdef CONFIG_LEDS_TRIGGER_SATA
-+extern void ledtrig_sata_activity(int port_number);
-+#else
-+static inline void ledtrig_sata_activity(int port_number) {}
-+#endif
-+
- #ifdef CONFIG_LEDS_TRIGGER_MTD
- extern void ledtrig_mtd_activity(void);
- #else
diff --git a/core/linux-kirkwood-dt/config b/core/linux-kirkwood-dt/config
index cad7feb32..0f7c971d3 100644
--- a/core/linux-kirkwood-dt/config
+++ b/core/linux-kirkwood-dt/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.13-1 Kernel Configuration
+# Linux/arm 4.15.6-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -16,7 +16,6 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_GENERIC_BUG=y
 CONFIG_PGTABLE_LEVELS=2
@@ -50,7 +49,6 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_FHANDLE=y
 CONFIG_USELIB=y
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
@@ -132,7 +130,6 @@ CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
-# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -162,11 +159,8 @@ CONFIG_MULTIUSER=y
 # CONFIG_SGETMASK_SYSCALL is not set
 CONFIG_SYSFS_SYSCALL=y
 # CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_FHANDLE=y
 CONFIG_POSIX_TIMERS=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
@@ -178,13 +172,17 @@ CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
-CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+# CONFIG_USERFAULTFD is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -204,7 +202,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
 CONFIG_CRASH_CORE=y
@@ -277,7 +275,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -287,7 +284,9 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
+CONFIG_MODULE_COMPRESS=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+# CONFIG_MODULE_COMPRESS_XZ is not set
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
@@ -346,7 +345,7 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
-CONFIG_ASN1=m
+CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_FREEZER=y
@@ -454,8 +453,8 @@ CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCI_MSI is not set
+CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
@@ -472,6 +471,7 @@ CONFIG_PCI_SYSCALL=y
 CONFIG_PCI_MVEBU=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCI_V3_SEMI is not set
 # CONFIG_PCIE_ALTERA is not set
 
 #
@@ -543,6 +543,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_UACCESS_WITH_MEMCPY=y
@@ -629,6 +630,7 @@ CONFIG_ARM_KIRKWOOD_CPUIDLE=y
 # Userspace binary formats
 #
 CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_ELF_FDPIC is not set
 CONFIG_ELFCORE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_SCRIPT=y
@@ -654,7 +656,6 @@ CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
 # CONFIG_APM_EMULATION is not set
-CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_CPU_PM=y
@@ -1111,6 +1112,7 @@ CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
+# CONFIG_NET_SCH_CBS is not set
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
@@ -1178,6 +1180,7 @@ CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
 CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
 # CONFIG_NETLINK_DIAG is not set
 # CONFIG_MPLS is not set
 # CONFIG_NET_NSH is not set
@@ -1272,9 +1275,10 @@ CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFG80211_WEXT_EXPORT=y
@@ -1489,6 +1493,7 @@ CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_ADDRESS_PCI=y
 CONFIG_OF_IRQ=y
@@ -1502,6 +1507,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
+CONFIG_CDROM=m
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_WRITEBACK is not set
@@ -1522,6 +1528,10 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_ATA_OVER_ETH=m
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
+
+#
+# NVME Support
+#
 # CONFIG_BLK_DEV_NVME is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
@@ -1549,7 +1559,6 @@ CONFIG_SENSORS_TSL2550=m
 # CONFIG_SENSORS_APDS990X is not set
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-CONFIG_TI_DAC7512=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
@@ -1575,11 +1584,11 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_TI_ST=m
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_ALTERA_STAPL is not set
 
 #
-# Altera FPGA firmware download module
+# Intel MIC & related support
 #
-# CONFIG_ALTERA_STAPL is not set
 
 #
 # Intel MIC Bus Driver
@@ -2097,6 +2106,7 @@ CONFIG_AT803X_PHY=m
 # CONFIG_CICADA_PHY is not set
 CONFIG_CORTINA_PHY=m
 # CONFIG_DAVICOM_PHY is not set
+# CONFIG_DP83822_PHY is not set
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
 CONFIG_FIXED_PHY=y
@@ -2112,6 +2122,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_REALTEK_PHY is not set
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_STE10XP is not set
@@ -2515,9 +2526,12 @@ CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_EGALAX is not set
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+# CONFIG_TOUCHSCREEN_EXC3000 is not set
 CONFIG_TOUCHSCREEN_FUJITSU=m
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+# CONFIG_TOUCHSCREEN_HIDEEP is not set
 # CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_S6SY761 is not set
 CONFIG_TOUCHSCREEN_GUNZE=m
 # CONFIG_TOUCHSCREEN_EKTF2127 is not set
 # CONFIG_TOUCHSCREEN_ELAN is not set
@@ -2820,10 +2834,6 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PINCTRL=y
-
-#
-# Pin controllers
-#
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
@@ -2849,6 +2859,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_FTGPIO010 is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_MVEBU=y
@@ -2864,7 +2875,6 @@ CONFIG_GPIO_MVEBU=y
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_TPIC2810 is not set
 
 #
@@ -2883,6 +2893,7 @@ CONFIG_GPIO_MVEBU=y
 # SPI GPIO expanders
 #
 # CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_MAX3191X is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_PISOSR is not set
@@ -2921,6 +2932,7 @@ CONFIG_W1_SLAVE_DS2760=m
 # CONFIG_W1_SLAVE_DS2780 is not set
 # CONFIG_W1_SLAVE_DS2781 is not set
 # CONFIG_W1_SLAVE_DS28E04 is not set
+# CONFIG_W1_SLAVE_DS28E17 is not set
 # CONFIG_POWER_AVS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_BRCMKONA is not set
@@ -2943,6 +2955,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
+# CONFIG_MANAGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
@@ -3017,6 +3030,7 @@ CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_MAX1668 is not set
 # CONFIG_SENSORS_MAX197 is not set
 # CONFIG_SENSORS_MAX31722 is not set
+# CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
@@ -3844,6 +3858,11 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 #
 # ACP (Audio CoProcessor) Configuration
 #
+
+#
+# AMD Library routines
+#
+# CONFIG_CHASH is not set
 # CONFIG_DRM_LIB_RANDOM is not set
 
 #
@@ -4135,6 +4154,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_RT5514_SPI_BUILTIN is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5677_SPI is not set
@@ -4515,11 +4535,7 @@ CONFIG_USB_HSIC_USB4604=m
 # CONFIG_USB_ISP1301 is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_GADGET is not set
-
-#
-# USB Power Delivery and Type-C drivers
-#
-# CONFIG_TYPEC_UCSI is not set
+# CONFIG_TYPEC is not set
 CONFIG_USB_LED_TRIG=y
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_UWB is not set
@@ -4556,6 +4572,7 @@ CONFIG_MMC_MVSDIO=y
 # CONFIG_MMC_TOSHIBA_PCI is not set
 # CONFIG_MMC_MTK is not set
 # CONFIG_MMC_SDHCI_XENON is not set
+# CONFIG_MMC_SDHCI_OMAP is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -4610,6 +4627,7 @@ CONFIG_LEDS_TRIGGER_MTD=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_CPU=y
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
@@ -4657,6 +4675,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8523 is not set
 # CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
@@ -4941,7 +4960,6 @@ CONFIG_FB_XGI=m
 #
 # USB Power Delivery and Type-C drivers
 #
-# CONFIG_TYPEC_TCPM is not set
 # CONFIG_PI433 is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
@@ -4999,6 +5017,7 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Rpmsg drivers
 #
+# CONFIG_RPMSG_VIRTIO is not set
 
 #
 # SOC (System On Chip) specific Drivers
@@ -5046,6 +5065,7 @@ CONFIG_IIO=m
 # CONFIG_DMARD09 is not set
 # CONFIG_DMARD10 is not set
 # CONFIG_HID_SENSOR_ACCEL_3D is not set
+# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_KXCJK1013 is not set
@@ -5153,11 +5173,13 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_AD7303 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
 # CONFIG_VF610_DAC is not set
 
 #
@@ -5333,6 +5355,7 @@ CONFIG_CM32181=m
 # Proximity and distance sensors
 #
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
@@ -5350,8 +5373,13 @@ CONFIG_CM32181=m
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
+
+#
+# IRQ chip support
+#
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_ARM_GIC_V3_ITS is not set
 CONFIG_ORION_IRQCHIP=y
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
@@ -5390,6 +5418,7 @@ CONFIG_NVMEM=y
 # FSI support
 #
 # CONFIG_FSI is not set
+CONFIG_PM_OPP=y
 
 #
 # Firmware Drivers
@@ -5433,6 +5462,7 @@ CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT is not set
+# CONFIG_XFS_ONLINE_SCRUB is not set
 # CONFIG_XFS_WARN is not set
 # CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
@@ -5443,6 +5473,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
 CONFIG_NILFS2_FS=m
 CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
@@ -5476,6 +5507,7 @@ CONFIG_FUSE_FS=y
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 
 #
@@ -5556,6 +5588,8 @@ CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_FS_ENCRYPTION is not set
 CONFIG_UBIFS_FS_SECURITY=y
 CONFIG_CRAMFS=y
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
 # CONFIG_SQUASHFS_FILE_DIRECT is not set
@@ -5815,6 +5849,7 @@ CONFIG_TRACING=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 # CONFIG_FUNCTION_TRACER is not set
+# CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
@@ -5862,6 +5897,7 @@ CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
@@ -5952,11 +5988,11 @@ CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
+CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=m
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=m
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
@@ -6020,6 +6056,7 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
+# CONFIG_CRYPTO_SM3 is not set
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -6071,16 +6108,25 @@ CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_MV_CESA is not set
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
 # Certificates for signature checking
 #
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=y
@@ -6100,7 +6146,6 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IO=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
@@ -6166,7 +6211,7 @@ CONFIG_CLZ_TAB=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
 # CONFIG_IRQ_POLL is not set
-CONFIG_MPILIB=m
+CONFIG_MPILIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=m
diff --git a/core/linux-kirkwood-dt/fix_shortread_on_huge_media.patch b/core/linux-kirkwood-dt/fix_shortread_on_huge_media.patch
deleted file mode 100644
index 1ec887e6c..000000000
--- a/core/linux-kirkwood-dt/fix_shortread_on_huge_media.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN a/mm/filemap.c b/mm/filemap.c
---- a/mm/filemap.c	2017-04-21 01:32:55.000000000 -0600
-+++ b/mm/filemap.c	2017-04-23 14:10:10.140023733 -0600
-@@ -1776,10 +1776,6 @@
- 	unsigned int prev_offset;
- 	int error = 0;
- 
--	if (unlikely(*ppos >= inode->i_sb->s_maxbytes))
--		return 0;
--	iov_iter_truncate(iter, inode->i_sb->s_maxbytes);
--
- 	index = *ppos >> PAGE_SHIFT;
- 	prev_index = ra->prev_pos >> PAGE_SHIFT;
- 	prev_offset = ra->prev_pos & (PAGE_SIZE-1);
diff --git a/core/linux-kirkwood-dt/linux-kirkwood-dt.install b/core/linux-kirkwood-dt/linux-kirkwood-dt.install
index 18fb8e719..e85d69e84 100644
--- a/core/linux-kirkwood-dt/linux-kirkwood-dt.install
+++ b/core/linux-kirkwood-dt/linux-kirkwood-dt.install
@@ -2,16 +2,13 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood-dt
-KERNEL_VERSION=4.13.5-1-ARCH
+KERNEL_VERSION=4.15.6-1-ARCH
 
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
 
-  echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
-
   echo "**********************************************************************"
   echo "WARNING! This kernel package will NOT boot without user intervention."
   echo ""
@@ -41,12 +38,9 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-
-  echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
 }
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/initramfs-linux.img
+  rm -f /boot/initramfs-linux.img
 }