From 00b319e9be3198eb306bf58577b4e2c6fc86af34 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 7 Mar 2020 19:33:11 +0100 Subject: [PATCH 1/3] oxnas: restore accidentally modified patch for kernel 4.14 patches-4.14/340-oxnas-pcie.patch was adapted for kernel 5.4 by accident. Revert that change to restore 4.14 builds. Signed-off-by: Daniel Golle --- target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch b/target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch index 2a4e4536dc..a6b7137584 100644 --- a/target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch +++ b/target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch @@ -1,5 +1,5 @@ ---- a/drivers/pci/controller/Kconfig -+++ b/drivers/pci/controller/Kconfig +--- a/drivers/pci/host/Kconfig ++++ b/drivers/pci/host/Kconfig @@ -220,4 +220,9 @@ config VMD To compile this driver as a module, choose M here: the module will be called vmd. @@ -10,8 +10,8 @@ + select PCIEPORTBUS + endmenu ---- a/drivers/pci/controller/Makefile -+++ b/drivers/pci/controller/Makefile +--- a/drivers/pci/host/Makefile ++++ b/drivers/pci/host/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_PCIE_ALTERA) += pcie-altera obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o From 5b13ea8d28fd087aac4c7730a4f9c1143dda15db Mon Sep 17 00:00:00 2001 From: Sven Over Date: Sun, 23 Feb 2020 14:26:46 -0500 Subject: [PATCH 2/3] mac80211: fix symbol dependency of rt2x00lib kernel module On platforms that do not have CONFIG_MTD enabled, loading the rt2x00lib kernel module fails because it depends on symbols from the mtd module ("Unknown symbol get_mtd_device_nm"). This commit disables the code that can read the eeprom from mtd if mtd is not enabled. Signed-off-by: Sven Over Signed-off-by: Daniel Golle --- ...load-eeprom-on-SoC-from-a-mtd-device-defines-.patch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/patches/rt2x00/604-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch b/package/kernel/mac80211/patches/rt2x00/604-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch index 08ca7c96fd..43754c43c2 100644 --- a/package/kernel/mac80211/patches/rt2x00/604-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch +++ b/package/kernel/mac80211/patches/rt2x00/604-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch @@ -22,17 +22,20 @@ Signed-off-by: John Crispin Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c -@@ -26,11 +26,72 @@ +@@ -26,11 +26,76 @@ #include #include ++#if IS_ENABLED(CONFIG_MTD) +#include +#include ++#endif #include #include "rt2x00.h" #include "rt2x00lib.h" ++#if IS_ENABLED(CONFIG_MTD) +static int rt2800lib_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev) +{ + int ret = -EINVAL; @@ -91,16 +94,19 @@ Signed-off-by: John Crispin + + return ret; +} ++#endif + static const char * rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev) { -@@ -58,6 +119,9 @@ static int rt2x00lib_request_eeprom_file +@@ -58,6 +123,11 @@ static int rt2x00lib_request_eeprom_file const char *ee_name; int retval; ++#if IS_ENABLED(CONFIG_MTD) + if (!rt2800lib_read_eeprom_mtd(rt2x00dev)) + return 0; ++#endif + ee_name = rt2x00lib_get_eeprom_file_name(rt2x00dev); if (!ee_name && test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags)) { From ab9fd528ae6380d78e5b6c4a6a18a2cc7c1cc785 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 7 Mar 2020 20:20:23 +0100 Subject: [PATCH 3/3] ath79: fix indent for wrapped lines in image/nand.mk This applies the common indent (one tab) for the wrapped lines of domywifi_dw33d and glinet_gl-ar750s-nor-nand. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/image/nand.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index ab4299ef37..4cb6ea2957 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -52,7 +52,7 @@ define Device/domywifi_dw33d DEVICE_VENDOR := DomyWifi DEVICE_MODEL := DW33D DEVICE_PACKAGES := kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport \ - kmod-ath10k-ct ath10k-firmware-qca988x-ct + kmod-ath10k-ct ath10k-firmware-qca988x-ct KERNEL_SIZE := 5120k IMAGE_SIZE := 98304k BLOCKSIZE := 128k @@ -61,7 +61,7 @@ define Device/domywifi_dw33d IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ - check-size $$$$(IMAGE_SIZE) + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += domywifi_dw33d @@ -115,7 +115,7 @@ define Device/glinet_gl-ar750s-nor-nand GL_UBOOT_UBI_OFFSET := 2048k IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$$$(GL_UBOOT_UBI_OFFSET) | \ - append-ubi | check-kernel-size $$$$(GL_UBOOT_UBI_OFFSET) + append-ubi | check-kernel-size $$$$(GL_UBOOT_UBI_OFFSET) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata SUPPORTED_DEVICES += glinet,gl-ar750s-nor endef