Merge branch 'builtin-kmods'

patches/lede/0081-ar71xx-increase-kernel-partition-size-for-TP-Link-RE450-v1.patch

+From: Piotr Dymacz <pepe2k@gmail.com>
+Date: Mon, 6 Nov 2017 23:17:24 +0100
+Subject: ar71xx: increase kernel partition size for TP-Link RE450 v1
+
+This increases kernel partition size and fixes rootfs (file-system)
+partition size on TP-Link RE450 v1. Also, while we are at it, switch
+from statically defined kernel and rootfs partitions in kernel cmdline
+to "tplink-fw" mtd splitter.
+
+Fixes: FS#1072.
+
+Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
+
+diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
+index 1a6e58fca882fc9d122c184ee8167537751acf25..60dfe0e3edafcadad4ddc08be7645b49f269907c 100644
+--- a/target/linux/ar71xx/image/tp-link.mk
++++ b/target/linux/ar71xx/image/tp-link.mk
+@@ -207,7 +207,7 @@ TARGET_DEVICES += cpe210-220 cpe510-520 wbs210 wbs510
+ define Device/re450
+   DEVICE_TITLE := TP-LINK RE450
+   DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x
+-  MTDPARTS := spi0.0:128k(u-boot)ro,1344k(kernel),4672k(rootfs),64k(pation-table)ro,64k(product-info)ro,1856k(config)ro,64k(art)ro,6016k@0x20000(firmware)
++  MTDPARTS := spi0.0:128k(u-boot)ro,6016k(firmware),64k(partition-table)ro,64k(product-info)ro,1856k(config)ro,64k(art)ro
+   IMAGE_SIZE := 7936k
+   BOARDNAME := RE450
+   TPLINK_BOARD_NAME := RE450
+diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
+index ba86c71d870c8f38abb92c657c3656086a7782be..23b69f3bd0eb66aca650eb2ffd7d5cd2a7cb5194 100644
+--- a/tools/firmware-utils/src/tplink-safeloader.c
++++ b/tools/firmware-utils/src/tplink-safeloader.c
+@@ -689,8 +689,8 @@ static struct device_info boards[] = {
+ 		*/
+ 		.partitions = {
+ 			{"fs-uboot", 0x00000, 0x20000},
+-			{"os-image", 0x20000, 0x150000},
+-			{"file-system", 0x170000, 0x4a0000},
++			{"os-image", 0x20000, 0x180000},
++			{"file-system", 0x1a0000, 0x460000},
+ 			{"partition-table", 0x600000, 0x02000},
+ 			{"default-mac", 0x610000, 0x00020},
+ 			{"pin", 0x610100, 0x00020},

patches/lede/0082-include-kernel.mk-build-kmod-packages-with-empty-FILES.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 10 Apr 2018 09:03:52 +0200
+Subject: include/kernel.mk: build kmod packages with empty FILES
+
+kmod packages without FILES did not have an install step defined, leading
+to no package being built. This affected netfilter/iptables packages, which
+filter out builtin modules from FILES.
+
+Not building a package that it is selected in .config is problematic, as
+the generated empty package may be necessary to satisfy dependencies.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/include/kernel.mk b/include/kernel.mk
+index b1d0e8d927cb462b486cfd645d68963f1b6ab8ff..d8d457fe7a5d3584d8aa4e27430da84533c85ed0 100644
+--- a/include/kernel.mk
++++ b/include/kernel.mk
+@@ -194,8 +194,7 @@ $(call KernelPackage/$(1)/config)
+   $(call KernelPackage/depends)
+ 
+   ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
+-    ifneq ($(strip $(FILES)),)
+-      define Package/kmod-$(1)/install
++    define Package/kmod-$(1)/install
+ 		  @for mod in $$(call version_filter,$$(FILES)); do \
+ 			if grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \
+ 				echo "NOTICE: module '$$$$$$$$mod' is built-in."; \
+@@ -209,8 +208,7 @@ $(call KernelPackage/$(1)/config)
+ 		  done;
+ 		  $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
+ 		  $(call KernelPackage/$(1)/install,$$(1))
+-      endef
+-    endif
++    endef
+   $(if $(CONFIG_PACKAGE_kmod-$(1)),
+     else
+       compile: $(1)-disabled

targets/ar71xx-generic

+config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
+
 ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
 ATH10K_PACKAGES_QCA9887=
 if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then

targets/ar71xx-mikrotik

+config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
+
 # Enable ath5k in addition to ath9k
 # ath5k cards are commonly used with Mikrotik hardware
 packages 'kmod-ath5k'

targets/ar71xx-nand

+config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
+
 factory -ubi-factory .img
 sysupgrade -squashfs-sysupgrade .tar
 

targets/ar71xx-tiny

+config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
+
 no_opkg
 packages '-uboot-envtools' '-kmod-usb-core' '-kmod-usb-ohci' '-kmod-usb2' '-kmod-usb-ledtrig-usbport'