diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 9219195358..f4b37989c8 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-04-06 -PKG_SOURCE_VERSION:=9406eb1d110f96e78cf376c4ed9d5164af4075e1 -PKG_MIRROR_HASH:=f618c1cf35e259a2ec5c84682f3f223bddf062193d24aeb9642352786d2987bb +PKG_SOURCE_DATE:=2020-04-27 +PKG_SOURCE_VERSION:=5f3ccc7226272198c21ec934d9072a56b0953f47 +PKG_MIRROR_HASH:=6f1a7b7d7b9f4db79d72405baeafa318769eeab270fea4479756f91ac5a2494d PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 @@ -143,6 +143,7 @@ define KernelPackage/mt7615e TITLE:=MediaTek MT7615 wireless driver DEPENDS+=@PCI_SUPPORT +kmod-mt76-core FILES:=\ + $(PKG_BUILD_DIR)/mt7615/mt7615-common.ko \ $(PKG_BUILD_DIR)/mt7615/mt7615e.ko AUTOLOAD:=$(call AutoProbe,mt7615e) endef @@ -191,6 +192,7 @@ ifdef CONFIG_PACKAGE_kmod-mt7603 PKG_MAKE_FLAGS += CONFIG_MT7603E=m endif ifdef CONFIG_PACKAGE_kmod-mt7615e + PKG_MAKE_FLAGS += CONFIG_MT7615_COMMON=m PKG_MAKE_FLAGS += CONFIG_MT7615E=m ifdef CONFIG_TARGET_mediatek_mt7622 PKG_MAKE_FLAGS += CONFIG_MT7622_WMAC=y diff --git a/target/linux/ath79/config-4.19 b/target/linux/ath79/config-4.19 index d92da1fbe2..cfa0ebd759 100644 --- a/target/linux/ath79/config-4.19 +++ b/target/linux/ath79/config-4.19 @@ -171,7 +171,6 @@ CONFIG_MTD_SPLIT_LZMA_FW=y CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_TPLINK_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y -CONFIG_MTD_TPLINK_PARTS=y CONFIG_MTD_VIRT_CONCAT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y diff --git a/target/linux/ath79/config-5.4 b/target/linux/ath79/config-5.4 index d591f884e7..80f7209b5b 100644 --- a/target/linux/ath79/config-5.4 +++ b/target/linux/ath79/config-5.4 @@ -178,7 +178,6 @@ CONFIG_MTD_SPLIT_LZMA_FW=y CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_TPLINK_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y -CONFIG_MTD_TPLINK_PARTS=y CONFIG_MTD_VIRT_CONCAT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts index 08c73ff367..3d0b4d8c51 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts @@ -7,6 +7,12 @@ compatible = "ubnt,nanobeam-ac", "ubnt,wa", "qca,ar9342"; model = "Ubiquiti NanoBeam AC (WA)"; + aliases { + led-boot = &led_rssi3; + led-failsafe = &led_rssi3; + led-upgrade = &led_rssi3; + }; + leds { compatible = "gpio-leds"; @@ -25,7 +31,7 @@ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - rssi3 { + led_rssi3: rssi3 { label = "ubnt:blue:rssi3"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts index 0e3c6b5c9f..d8aebaeb07 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts @@ -7,6 +7,12 @@ compatible = "ubnt,nanostation-ac","ubnt,wa", "qca,ar9342"; model = "Ubiquiti Nanostation AC (WA)"; + aliases { + led-boot = &led_rssi3; + led-failsafe = &led_rssi3; + led-upgrade = &led_rssi3; + }; + leds { compatible = "gpio-leds"; @@ -25,7 +31,7 @@ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - rssi3 { + led_rssi3: rssi3 { label = "ubnt:blue:rssi3"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts new file mode 100644 index 0000000000..6b60ed256e --- /dev/null +++ b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; + +#include "ar9342_ubnt_wa.dtsi" + +/ { + compatible = "ubnt,powerbeam-5ac-gen2", "ubnt,wa", "qca,ar9342"; + model = "Ubiquiti PowerBeam 5AC Gen2"; + + aliases { + led-boot = &led_rssi3; + led-failsafe = &led_rssi3; + led-upgrade = &led_rssi3; + }; + + leds { + compatible = "gpio-leds"; + + rssi0 { + label = "ubnt:blue:rssi0"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + + rssi1 { + label = "ubnt:blue:rssi1"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + + rssi2 { + label = "ubnt:blue:rssi2"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + led_rssi3: rssi3 { + label = "ubnt:blue:rssi3"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&mdio0 { + status = "okay"; + + phy-mask = <4>; + phy4: ethernet-phy@4 { + reg = <4>; + }; +}; + +ð0 { + status = "okay"; + + /* default for ar934x, except for 1000M and 10M */ + pll-data = <0x02000000 0x00000101 0x00001313>; + + mtd-mac-address = <&art 0x0>; + + phy-mode = "rgmii-id"; + phy-handle = <&phy4>; + + gmac-config { + device = <&gmac>; + rxd-delay = <3>; + rxdv-delay = <3>; + }; +}; diff --git a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi index 34b47b15f7..13e0b3371a 100644 --- a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi +++ b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi @@ -78,6 +78,8 @@ phy-handle = <&phy0>; pll-data = <0x3000000 0x101 0x1313>; + qca955x-sgmii-fixup; + gmac-config { device = <&gmac>; ge0-sgmii = <0>; @@ -89,5 +91,6 @@ phy0: ethernet-phy@0 { reg = <0>; + at803x-override-sgmii-link-check; }; }; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi index 25e0fee3bd..fc15dd4416 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi @@ -132,6 +132,7 @@ &mdio1 { phy1: ethernet-phy@1 { reg = <1>; + at803x-override-sgmii-link-check; }; }; @@ -141,6 +142,8 @@ phy-handle = <&phy1>; pll-data = <0x03000101 0x00000101 0x00001313>; + + qca955x-sgmii-fixup; }; &wmac { diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts index b790ed11a2..d629f5b6ba 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts @@ -117,6 +117,7 @@ phy2: ethernet-phy@2 { reg = <2>; + at803x-override-sgmii-link-check; }; }; @@ -144,4 +145,5 @@ mtd-mac-address = <&art 0x12>; phy-handle = <&phy2>; pll-data = <0x3000101 0x101 0x1313>; + qca955x-sgmii-fixup; }; diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index edb026544c..2c9777ba53 100644 --- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -1080,16 +1080,9 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return -EOPNOTSUPP; } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)) -static void ag71xx_oom_timer_handler(unsigned long data) -{ - struct net_device *dev = (struct net_device *) data; - struct ag71xx *ag = netdev_priv(dev); -#else static void ag71xx_oom_timer_handler(struct timer_list *t) { struct ag71xx *ag = from_timer(ag, t, oom_timer); -#endif napi_schedule(&ag->napi); } @@ -1214,22 +1207,14 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit) unsigned int offset = ag->rx_buf_offset; int ring_mask = BIT(ring->order) - 1; int ring_size = BIT(ring->order); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)) struct list_head rx_list; struct sk_buff *next; -#else - struct sk_buff_head queue; -#endif struct sk_buff *skb; int done = 0; DBG("%s: rx packets, limit=%d, curr=%u, dirty=%u\n", dev->name, limit, ring->curr, ring->dirty); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)) INIT_LIST_HEAD(&rx_list); -#else - skb_queue_head_init(&queue); -#endif while (done < limit) { unsigned int i = ring->curr & ring_mask; @@ -1271,11 +1256,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit) } else { skb->dev = dev; skb->ip_summed = CHECKSUM_NONE; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)) list_add_tail(&skb->list, &rx_list); -#else - __skb_queue_tail(&queue, skb); -#endif } next: @@ -1287,16 +1268,9 @@ next: ag71xx_ring_rx_refill(ag); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)) list_for_each_entry_safe(skb, next, &rx_list, list) skb->protocol = eth_type_trans(skb, dev); netif_receive_skb_list(&rx_list); -#else - while ((skb = __skb_dequeue(&queue)) != NULL) { - skb->protocol = eth_type_trans(skb, dev); - netif_receive_skb(skb); - } -#endif DBG("%s: rx finish, curr=%u, dirty=%u, done=%d\n", dev->name, ring->curr, ring->dirty, done); @@ -1520,13 +1494,7 @@ static int ag71xx_probe(struct platform_device *pdev) INIT_DELAYED_WORK(&ag->restart_work, ag71xx_restart_work_func); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)) - init_timer(&ag->oom_timer); - ag->oom_timer.data = (unsigned long) dev; - ag->oom_timer.function = ag71xx_oom_timer_handler; -#else timer_setup(&ag->oom_timer, ag71xx_oom_timer_handler, 0); -#endif tx_size = AG71XX_TX_RING_SIZE_DEFAULT; ag->rx_ring.order = ag71xx_ring_size_order(AG71XX_RX_RING_SIZE_DEFAULT); @@ -1581,11 +1549,7 @@ static int ag71xx_probe(struct platform_device *pdev) ag->stop_desc->next = (u32) ag->stop_desc_dma; mac_addr = of_get_mac_address(np); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)) - if (!mac_addr || !is_valid_ether_addr(mac_addr)) { -#else - if (IS_ERR(mac_addr) || !is_valid_ether_addr(mac_addr)) { -#endif + if (IS_ERR_OR_NULL(mac_addr) || !is_valid_ether_addr(mac_addr)) { dev_err(&pdev->dev, "invalid MAC address, using random address\n"); eth_random_addr(dev->dev_addr); } else { diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index ca4bb3dd33..a3c5b3f988 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -282,7 +282,8 @@ ubnt,rocket-m) ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "ubnt:green:link4" "wlan0" "76" "100" ;; ubnt,nanobeam-ac|\ -ubnt,nanostation-ac) +ubnt,nanostation-ac|\ +ubnt,powerbeam-5ac-gen2) ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "ubnt:blue:rssi0" "wlan0" "1" "100" ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "ubnt:blue:rssi1" "wlan0" "26" "100" diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 543543ad54..d7f7eed829 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -53,6 +53,7 @@ ath79_setup_interfaces() ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m-xw|\ ubnt,picostation-m|\ + ubnt,powerbeam-5ac-gen2|\ ubnt,rocket-m|\ ubnt,unifiac-lite|\ ubnt,unifiac-lr|\ @@ -468,7 +469,8 @@ ath79_setup_macs() ubnt,unifi) label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) ;; - ubnt,litebeam-ac-gen2) + ubnt,litebeam-ac-gen2|\ + ubnt,powerbeam-5ac-gen2) label_mac=$(mtd_get_mac_binary art 0x5006) ;; ubnt,routerstation|\ diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index dd821dd339..336b0f3c8f 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -25,6 +25,7 @@ case "$FIRMWARE" in ubnt,nanobeam-ac|\ ubnt,nanostation-ac|\ ubnt,nanostation-ac-loco|\ + ubnt,powerbeam-5ac-gen2|\ ubnt,unifiac-pro|\ yuncore,a770) caldata_extract "art" 0x5000 0x844 diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 7ad54083b6..d056ab6783 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -243,6 +243,14 @@ define Device/ubnt_picostation-m endef TARGET_DEVICES += ubnt_picostation-m +define Device/ubnt_powerbeam-5ac-gen2 + $(Device/ubnt-wa) + DEVICE_MODEL := PowerBeam 5AC + DEVICE_VARIANT := Gen2 + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct rssileds +endef +TARGET_DEVICES += ubnt_powerbeam-5ac-gen2 + define Device/ubnt_rocket-m $(Device/ubnt-xm) SOC := ar7241 diff --git a/target/linux/ath79/patches-4.19/405-mtd-tp-link-partition-parser.patch b/target/linux/ath79/patches-4.19/405-mtd-tp-link-partition-parser.patch deleted file mode 100644 index d65bf663b5..0000000000 --- a/target/linux/ath79/patches-4.19/405-mtd-tp-link-partition-parser.patch +++ /dev/null @@ -1,250 +0,0 @@ ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -193,6 +193,12 @@ config MTD_MYLOADER_PARTS - You will still need the parsing functions to be called by the driver - for your particular device. It won't happen automatically. - -+config MTD_TPLINK_PARTS -+ tristate "TP-Link AR7XXX/AR9XXX partitioning support" -+ depends on ATH79 -+ ---help--- -+ TBD. -+ - comment "User Modules And Translation Layers" - - # ---- a/drivers/mtd/Makefile -+++ b/drivers/mtd/Makefile -@@ -18,6 +18,7 @@ obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63 - obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o - obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o - obj-y += parsers/ -+obj-$(CONFIG_MTD_TPLINK_PARTS) += tplinkpart.o - - # 'Users' - code which presents functionality to userspace. - obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o ---- /dev/null -+++ b/drivers/mtd/tplinkpart.c -@@ -0,0 +1,222 @@ -+/* -+ * Copyright (C) 2011 Gabor Juhos -+ * -+ * 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 -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#define TPLINK_NUM_PARTS 5 -+#define TPLINK_HEADER_V1 0x01000000 -+#define TPLINK_HEADER_V2 0x02000000 -+#define MD5SUM_LEN 16 -+ -+#define TPLINK_ART_LEN 0x10000 -+#define TPLINK_KERNEL_OFFS 0x20000 -+#define TPLINK_64K_KERNEL_OFFS 0x10000 -+ -+struct tplink_fw_header { -+ uint32_t version; /* header version */ -+ char vendor_name[24]; -+ char fw_version[36]; -+ uint32_t hw_id; /* hardware id */ -+ uint32_t hw_rev; /* hardware revision */ -+ uint32_t unk1; -+ uint8_t md5sum1[MD5SUM_LEN]; -+ uint32_t unk2; -+ uint8_t md5sum2[MD5SUM_LEN]; -+ uint32_t unk3; -+ uint32_t kernel_la; /* kernel load address */ -+ uint32_t kernel_ep; /* kernel entry point */ -+ uint32_t fw_length; /* total length of the firmware */ -+ uint32_t kernel_ofs; /* kernel data offset */ -+ uint32_t kernel_len; /* kernel data length */ -+ uint32_t rootfs_ofs; /* rootfs data offset */ -+ uint32_t rootfs_len; /* rootfs data length */ -+ uint32_t boot_ofs; /* bootloader data offset */ -+ uint32_t boot_len; /* bootloader data length */ -+ uint8_t pad[360]; -+} __attribute__ ((packed)); -+ -+static struct tplink_fw_header * -+tplink_read_header(struct mtd_info *mtd, size_t offset) -+{ -+ struct tplink_fw_header *header; -+ size_t header_len; -+ size_t retlen; -+ int ret; -+ u32 t; -+ -+ header = vmalloc(sizeof(*header)); -+ if (!header) -+ goto err; -+ -+ header_len = sizeof(struct tplink_fw_header); -+ ret = mtd_read(mtd, offset, header_len, &retlen, -+ (unsigned char *) header); -+ if (ret) -+ goto err_free_header; -+ -+ if (retlen != header_len) -+ goto err_free_header; -+ -+ /* sanity checks */ -+ t = be32_to_cpu(header->version); -+ if ((t != TPLINK_HEADER_V1) && (t != TPLINK_HEADER_V2)) -+ goto err_free_header; -+ -+ t = be32_to_cpu(header->kernel_ofs); -+ if (t != header_len) -+ goto err_free_header; -+ -+ return header; -+ -+err_free_header: -+ vfree(header); -+err: -+ return NULL; -+} -+ -+static int tplink_check_rootfs_magic(struct mtd_info *mtd, size_t offset) -+{ -+ u32 magic; -+ size_t retlen; -+ int ret; -+ -+ ret = mtd_read(mtd, offset, sizeof(magic), &retlen, -+ (unsigned char *) &magic); -+ if (ret) -+ return ret; -+ -+ if (retlen != sizeof(magic)) -+ return -EIO; -+ -+ if (le32_to_cpu(magic) != SQUASHFS_MAGIC && -+ magic != 0x19852003) -+ return -EINVAL; -+ -+ return 0; -+} -+ -+static int tplink_parse_partitions_offset(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data, -+ size_t offset) -+{ -+ struct mtd_partition *parts; -+ struct tplink_fw_header *header; -+ int nr_parts; -+ size_t art_offset; -+ size_t rootfs_offset; -+ size_t squashfs_offset; -+ int ret; -+ -+ nr_parts = TPLINK_NUM_PARTS; -+ parts = kzalloc(nr_parts * sizeof(struct mtd_partition), GFP_KERNEL); -+ if (!parts) { -+ ret = -ENOMEM; -+ goto err; -+ } -+ -+ header = tplink_read_header(master, offset); -+ if (!header) { -+ pr_notice("%s: no TP-Link header found\n", master->name); -+ ret = -ENODEV; -+ goto err_free_parts; -+ } -+ -+ squashfs_offset = offset + sizeof(struct tplink_fw_header) + -+ be32_to_cpu(header->kernel_len); -+ -+ ret = tplink_check_rootfs_magic(master, squashfs_offset); -+ if (ret == 0) -+ rootfs_offset = squashfs_offset; -+ else -+ rootfs_offset = offset + be32_to_cpu(header->rootfs_ofs); -+ -+ art_offset = master->size - TPLINK_ART_LEN; -+ -+ parts[0].name = "u-boot"; -+ parts[0].offset = 0; -+ parts[0].size = offset; -+ parts[0].mask_flags = MTD_WRITEABLE; -+ -+ parts[1].name = "kernel"; -+ parts[1].offset = offset; -+ parts[1].size = rootfs_offset - offset; -+ -+ parts[2].name = "rootfs"; -+ parts[2].offset = rootfs_offset; -+ parts[2].size = art_offset - rootfs_offset; -+ -+ parts[3].name = "art"; -+ parts[3].offset = art_offset; -+ parts[3].size = TPLINK_ART_LEN; -+ parts[3].mask_flags = MTD_WRITEABLE; -+ -+ parts[4].name = "firmware"; -+ parts[4].offset = offset; -+ parts[4].size = art_offset - offset; -+ -+ vfree(header); -+ -+ *pparts = parts; -+ return nr_parts; -+ -+err_free_parts: -+ kfree(parts); -+err: -+ *pparts = NULL; -+ return ret; -+} -+ -+static int tplink_parse_partitions(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) -+{ -+ return tplink_parse_partitions_offset(master, pparts, data, -+ TPLINK_KERNEL_OFFS); -+} -+ -+static int tplink_parse_64k_partitions(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) -+{ -+ return tplink_parse_partitions_offset(master, pparts, data, -+ TPLINK_64K_KERNEL_OFFS); -+} -+ -+static struct mtd_part_parser tplink_parser = { -+ .owner = THIS_MODULE, -+ .parse_fn = tplink_parse_partitions, -+ .name = "tp-link", -+}; -+ -+static struct mtd_part_parser tplink_64k_parser = { -+ .owner = THIS_MODULE, -+ .parse_fn = tplink_parse_64k_partitions, -+ .name = "tp-link-64k", -+}; -+ -+static int __init tplink_parser_init(void) -+{ -+ register_mtd_parser(&tplink_parser); -+ register_mtd_parser(&tplink_64k_parser); -+ -+ return 0; -+} -+ -+module_init(tplink_parser_init); -+ -+MODULE_LICENSE("GPL v2"); -+MODULE_AUTHOR("Gabor Juhos "); diff --git a/target/linux/ath79/patches-5.4/405-mtd-tp-link-partition-parser.patch b/target/linux/ath79/patches-5.4/405-mtd-tp-link-partition-parser.patch deleted file mode 100644 index 281cd2c351..0000000000 --- a/target/linux/ath79/patches-5.4/405-mtd-tp-link-partition-parser.patch +++ /dev/null @@ -1,244 +0,0 @@ ---- a/drivers/mtd/parsers/Kconfig -+++ b/drivers/mtd/parsers/Kconfig -@@ -184,3 +184,9 @@ config MTD_MYLOADER_PARTS - - You will still need the parsing functions to be called by the driver - for your particular device. It won't happen automatically. -+ -+config MTD_TPLINK_PARTS -+ tristate "TP-Link AR7XXX/AR9XXX partitioning support" -+ depends on ATH79 -+ ---help--- -+ TBD. ---- a/drivers/mtd/parsers/Makefile -+++ b/drivers/mtd/parsers/Makefile -@@ -11,3 +11,4 @@ obj-$(CONFIG_MTD_PARSER_TRX) += parser_ - obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o - obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o - obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o -+obj-$(CONFIG_MTD_TPLINK_PARTS) += tplinkpart.o ---- /dev/null -+++ b/drivers/mtd/parsers/tplinkpart.c -@@ -0,0 +1,222 @@ -+/* -+ * Copyright (C) 2011 Gabor Juhos -+ * -+ * 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 -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#define TPLINK_NUM_PARTS 5 -+#define TPLINK_HEADER_V1 0x01000000 -+#define TPLINK_HEADER_V2 0x02000000 -+#define MD5SUM_LEN 16 -+ -+#define TPLINK_ART_LEN 0x10000 -+#define TPLINK_KERNEL_OFFS 0x20000 -+#define TPLINK_64K_KERNEL_OFFS 0x10000 -+ -+struct tplink_fw_header { -+ uint32_t version; /* header version */ -+ char vendor_name[24]; -+ char fw_version[36]; -+ uint32_t hw_id; /* hardware id */ -+ uint32_t hw_rev; /* hardware revision */ -+ uint32_t unk1; -+ uint8_t md5sum1[MD5SUM_LEN]; -+ uint32_t unk2; -+ uint8_t md5sum2[MD5SUM_LEN]; -+ uint32_t unk3; -+ uint32_t kernel_la; /* kernel load address */ -+ uint32_t kernel_ep; /* kernel entry point */ -+ uint32_t fw_length; /* total length of the firmware */ -+ uint32_t kernel_ofs; /* kernel data offset */ -+ uint32_t kernel_len; /* kernel data length */ -+ uint32_t rootfs_ofs; /* rootfs data offset */ -+ uint32_t rootfs_len; /* rootfs data length */ -+ uint32_t boot_ofs; /* bootloader data offset */ -+ uint32_t boot_len; /* bootloader data length */ -+ uint8_t pad[360]; -+} __attribute__ ((packed)); -+ -+static struct tplink_fw_header * -+tplink_read_header(struct mtd_info *mtd, size_t offset) -+{ -+ struct tplink_fw_header *header; -+ size_t header_len; -+ size_t retlen; -+ int ret; -+ u32 t; -+ -+ header = vmalloc(sizeof(*header)); -+ if (!header) -+ goto err; -+ -+ header_len = sizeof(struct tplink_fw_header); -+ ret = mtd_read(mtd, offset, header_len, &retlen, -+ (unsigned char *) header); -+ if (ret) -+ goto err_free_header; -+ -+ if (retlen != header_len) -+ goto err_free_header; -+ -+ /* sanity checks */ -+ t = be32_to_cpu(header->version); -+ if ((t != TPLINK_HEADER_V1) && (t != TPLINK_HEADER_V2)) -+ goto err_free_header; -+ -+ t = be32_to_cpu(header->kernel_ofs); -+ if (t != header_len) -+ goto err_free_header; -+ -+ return header; -+ -+err_free_header: -+ vfree(header); -+err: -+ return NULL; -+} -+ -+static int tplink_check_rootfs_magic(struct mtd_info *mtd, size_t offset) -+{ -+ u32 magic; -+ size_t retlen; -+ int ret; -+ -+ ret = mtd_read(mtd, offset, sizeof(magic), &retlen, -+ (unsigned char *) &magic); -+ if (ret) -+ return ret; -+ -+ if (retlen != sizeof(magic)) -+ return -EIO; -+ -+ if (le32_to_cpu(magic) != SQUASHFS_MAGIC && -+ magic != 0x19852003) -+ return -EINVAL; -+ -+ return 0; -+} -+ -+static int tplink_parse_partitions_offset(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data, -+ size_t offset) -+{ -+ struct mtd_partition *parts; -+ struct tplink_fw_header *header; -+ int nr_parts; -+ size_t art_offset; -+ size_t rootfs_offset; -+ size_t squashfs_offset; -+ int ret; -+ -+ nr_parts = TPLINK_NUM_PARTS; -+ parts = kzalloc(nr_parts * sizeof(struct mtd_partition), GFP_KERNEL); -+ if (!parts) { -+ ret = -ENOMEM; -+ goto err; -+ } -+ -+ header = tplink_read_header(master, offset); -+ if (!header) { -+ pr_notice("%s: no TP-Link header found\n", master->name); -+ ret = -ENODEV; -+ goto err_free_parts; -+ } -+ -+ squashfs_offset = offset + sizeof(struct tplink_fw_header) + -+ be32_to_cpu(header->kernel_len); -+ -+ ret = tplink_check_rootfs_magic(master, squashfs_offset); -+ if (ret == 0) -+ rootfs_offset = squashfs_offset; -+ else -+ rootfs_offset = offset + be32_to_cpu(header->rootfs_ofs); -+ -+ art_offset = master->size - TPLINK_ART_LEN; -+ -+ parts[0].name = "u-boot"; -+ parts[0].offset = 0; -+ parts[0].size = offset; -+ parts[0].mask_flags = MTD_WRITEABLE; -+ -+ parts[1].name = "kernel"; -+ parts[1].offset = offset; -+ parts[1].size = rootfs_offset - offset; -+ -+ parts[2].name = "rootfs"; -+ parts[2].offset = rootfs_offset; -+ parts[2].size = art_offset - rootfs_offset; -+ -+ parts[3].name = "art"; -+ parts[3].offset = art_offset; -+ parts[3].size = TPLINK_ART_LEN; -+ parts[3].mask_flags = MTD_WRITEABLE; -+ -+ parts[4].name = "firmware"; -+ parts[4].offset = offset; -+ parts[4].size = art_offset - offset; -+ -+ vfree(header); -+ -+ *pparts = parts; -+ return nr_parts; -+ -+err_free_parts: -+ kfree(parts); -+err: -+ *pparts = NULL; -+ return ret; -+} -+ -+static int tplink_parse_partitions(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) -+{ -+ return tplink_parse_partitions_offset(master, pparts, data, -+ TPLINK_KERNEL_OFFS); -+} -+ -+static int tplink_parse_64k_partitions(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) -+{ -+ return tplink_parse_partitions_offset(master, pparts, data, -+ TPLINK_64K_KERNEL_OFFS); -+} -+ -+static struct mtd_part_parser tplink_parser = { -+ .owner = THIS_MODULE, -+ .parse_fn = tplink_parse_partitions, -+ .name = "tp-link", -+}; -+ -+static struct mtd_part_parser tplink_64k_parser = { -+ .owner = THIS_MODULE, -+ .parse_fn = tplink_parse_64k_partitions, -+ .name = "tp-link-64k", -+}; -+ -+static int __init tplink_parser_init(void) -+{ -+ register_mtd_parser(&tplink_parser); -+ register_mtd_parser(&tplink_64k_parser); -+ -+ return 0; -+} -+ -+module_init(tplink_parser_init); -+ -+MODULE_LICENSE("GPL v2"); -+MODULE_AUTHOR("Gabor Juhos "); diff --git a/target/linux/mediatek/patches-5.4/0999-hnat.patch b/target/linux/mediatek/patches-5.4/0999-hnat.patch index b8c81459ae..5e4b4734e5 100644 --- a/target/linux/mediatek/patches-5.4/0999-hnat.patch +++ b/target/linux/mediatek/patches-5.4/0999-hnat.patch @@ -147,26 +147,20 @@ #include "mtk_eth_soc.h" -@@ -76,6 +78,18 @@ u32 mtk_m32(struct mtk_eth *eth, u32 mas +@@ -69,10 +71,12 @@ u32 mtk_m32(struct mtk_eth *eth, u32 mas + { + u32 val; + ++ spin_lock(ð->page_lock); + val = mtk_r32(eth, reg); + val &= ~mask; + val |= set; + mtk_w32(eth, val, reg); ++ spin_unlock(ð->page_lock); return reg; } -+void mtk_m32(struct mtk_eth *eth, u32 clear, u32 set, unsigned reg) -+{ -+ u32 val; -+ -+ spin_lock(ð->page_lock); -+ val = __raw_readl(eth->base + reg); -+ val &= ~clear; -+ val |= set; -+ __raw_writel(val, eth->base + reg); -+ spin_unlock(ð->page_lock); -+} -+ - static int mtk_mdio_busy_wait(struct mtk_eth *eth) - { - unsigned long t_start = jiffies; -@@ -1298,8 +1312,16 @@ static int mtk_poll_rx(struct napi_struc +@@ -1298,8 +1302,16 @@ static int mtk_poll_rx(struct napi_struc (trxd.rxd2 & RX_DMA_VTAG)) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), RX_DMA_VID(trxd.rxd3)); @@ -185,7 +179,7 @@ ring->data[idx] = new_data; rxd->rxd1 = (unsigned int)dma_addr; -@@ -2216,6 +2238,9 @@ static int mtk_open(struct net_device *d +@@ -2216,6 +2228,9 @@ static int mtk_open(struct net_device *d mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); mtk_rx_irq_enable(eth, MTK_RX_DONE_INT); refcount_set(ð->dma_refcnt, 1); @@ -195,7 +189,7 @@ } else refcount_inc(ð->dma_refcnt); -@@ -2274,6 +2299,9 @@ static int mtk_stop(struct net_device *d +@@ -2274,6 +2289,9 @@ static int mtk_stop(struct net_device *d mtk_dma_free(eth); @@ -205,7 +199,7 @@ return 0; } -@@ -2733,6 +2761,27 @@ static int mtk_set_rxnfc(struct net_devi +@@ -2733,6 +2751,27 @@ static int mtk_set_rxnfc(struct net_devi return ret; } @@ -233,7 +227,7 @@ static const struct ethtool_ops mtk_ethtool_ops = { .get_link_ksettings = mtk_get_link_ksettings, .set_link_ksettings = mtk_set_link_ksettings, -@@ -2764,6 +2813,9 @@ static const struct net_device_ops mtk_n +@@ -2764,6 +2803,9 @@ static const struct net_device_ops mtk_n #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = mtk_poll_controller, #endif @@ -243,7 +237,7 @@ }; static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) -@@ -3097,6 +3149,7 @@ static const struct mtk_soc_data mt7622_ +@@ -3097,6 +3139,7 @@ static const struct mtk_soc_data mt7622_ .hw_features = MTK_HW_FEATURES, .required_clks = MT7622_CLKS_BITMAP, .required_pctl = false, @@ -320,7 +314,7 @@ void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg); u32 mtk_r32(struct mtk_eth *eth, unsigned reg); -+void mtk_m32(struct mtk_eth *eth, u32 clear, u32 set, unsigned reg); ++u32 mtk_m32(struct mtk_eth *eth, u32 mask, u32 set, unsigned reg); int mtk_sgmii_init(struct mtk_sgmii *ss, struct device_node *np, u32 ana_rgc3); diff --git a/target/linux/omap/Makefile b/target/linux/omap/Makefile index 285677a60e..a674bfb2ca 100644 --- a/target/linux/omap/Makefile +++ b/target/linux/omap/Makefile @@ -14,7 +14,7 @@ FEATURES:=usb usbgadget ext4 targz fpu audio display nand squashfs CPU_TYPE:=cortex-a8 CPU_SUBTYPE:=vfpv3 -KERNEL_PATCHVER:=4.19 +KERNEL_PATCHVER:=5.4 KERNELNAME:=zImage dtbs diff --git a/target/linux/omap/config-4.14 b/target/linux/omap/config-5.4 similarity index 84% rename from target/linux/omap/config-4.14 rename to target/linux/omap/config-5.4 index bc5e912a32..fd46a90ccb 100644 --- a/target/linux/omap/config-4.14 +++ b/target/linux/omap/config-5.4 @@ -1,18 +1,31 @@ +# CONFIG_AHCI_DM816 is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_AM335X_CONTROL_USB=y CONFIG_AM335X_PHY_USB=y +CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_HAS_BANDGAP=y +CONFIG_ARCH_HAS_BINFMT_FLAT=y +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_KCOV=y +CONFIG_ARCH_HAS_KEEPINITRD=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_ARCH_HAS_PHYS_TO_DMA=y +CONFIG_ARCH_HAS_SETUP_DMA_OPS=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_TICK_BROADCAST=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_MULTI_CPU_AUTO is not set CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y @@ -22,19 +35,19 @@ CONFIG_ARCH_OMAP2PLUS=y CONFIG_ARCH_OMAP2PLUS_TYPICAL=y CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARM=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y -# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARM_ERRATA_430973=y @@ -46,13 +59,13 @@ CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_HEAVY_MB=y CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y -# CONFIG_ARM_LPAE is not set CONFIG_ARM_OMAP2PLUS_CPUFREQ=y -CONFIG_ARM_TI_CPUFREQ=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y CONFIG_ARM_THUMBEE=y +CONFIG_ARM_TI_CPUFREQ=y +CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_AT803X_PHY=y @@ -60,23 +73,23 @@ CONFIG_ATA=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_GENERIC=y -CONFIG_AUDIT_TREE=y -CONFIG_AUDIT_WATCH=y CONFIG_AUTO_ZRELADDR=y CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_BACKLIGHT_PWM is not set # CONFIG_BACKLIGHT_TPS65217 is not set CONFIG_BCH=y +CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_SD=y +CONFIG_BLK_PM=y +CONFIG_BLK_SCSI_REQUEST=y CONFIG_BOUNCE=y CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BUILD_BIN2C=y CONFIG_CACHE_L2X0=y +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CEC_CORE=y # CONFIG_CHARGER_TPS65217 is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y @@ -97,14 +110,15 @@ CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" CONFIG_COMMON_CLK=y # CONFIG_COMMON_CLK_PALMAS is not set # CONFIG_COMMON_CLK_TI_ADPLL is not set +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y +CONFIG_CONTIG_ALLOC=y CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT_PLATDEV=y CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y CONFIG_CPU_ABRT_EV7=y -# CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CPU_CACHE_V7=y CONFIG_CPU_CACHE_VIPT=y CONFIG_CPU_COPY_V6=y @@ -121,16 +135,16 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_HAS_ASID=y -# CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_PABRT_V7=y CONFIG_CPU_PM=y CONFIG_CPU_RMAP=y +CONFIG_CPU_SPECTRE=y CONFIG_CPU_THERMAL=y +CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V7=y CONFIG_CPU_V7=y CONFIG_CRAMFS=y @@ -139,9 +153,11 @@ CONFIG_CRC7=y CONFIG_CRC_CCITT=y CONFIG_CRC_ITU_T=y CONFIG_CRC_T10DIF=y +CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CTR=y @@ -158,9 +174,12 @@ CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_ENGINE=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_LIB_DES=y +CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y @@ -174,17 +193,11 @@ CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_ZSTD=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DDR=y -CONFIG_DEBUG_GPIO=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK=y -# CONFIG_DEBUG_UART_8250 is not set -# CONFIG_DEBUG_USER is not set CONFIG_DM9000=y # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set CONFIG_DMADEVICES=y @@ -192,6 +205,7 @@ CONFIG_DMA_CMA=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_OMAP=y +CONFIG_DMA_REMAP=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DNS_RESOLVER=y @@ -200,22 +214,22 @@ CONFIG_DRM_BRIDGE=y CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_OMAP=y CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=y -CONFIG_DRM_OMAP_CONNECTOR_DVI=y CONFIG_DRM_OMAP_CONNECTOR_HDMI=y # CONFIG_DRM_OMAP_ENCODER_OPA362 is not set -CONFIG_DRM_OMAP_ENCODER_TFP410=y CONFIG_DRM_OMAP_ENCODER_TPD12S015=y -CONFIG_DRM_OMAP_NUM_CRTCS=1 -CONFIG_DRM_OMAP_PANEL_DPI=y CONFIG_DRM_OMAP_PANEL_DSI_CM=y -# CONFIG_DRM_PANEL_LVDS is not set -# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=y -CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=y -CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=y -CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=y -CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=y -CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=y +CONFIG_DRM_PANEL=y +CONFIG_DRM_PANEL_BRIDGE=y +CONFIG_DRM_PANEL_LG_LB035Q02=y +CONFIG_DRM_PANEL_NEC_NL8048HL11=y +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y +CONFIG_DRM_PANEL_SHARP_LS037V7DW01=y +# CONFIG_DRM_PANEL_SIMPLE is not set +CONFIG_DRM_PANEL_SONY_ACX565AKM=y +CONFIG_DRM_PANEL_TPO_TD028TTEC1=y +CONFIG_DRM_PANEL_TPO_TD043MTEA1=y +CONFIG_DRM_TI_TFP410=y +# CONFIG_DRM_TVE200 is not set CONFIG_DTC=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y @@ -228,33 +242,37 @@ CONFIG_EXT4_FS=y CONFIG_EXTCON=y CONFIG_EXTCON_PALMAS=y CONFIG_EXTCON_USB_GPIO=y -CONFIG_FANOTIFY=y -# CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y -# CONFIG_F2FS_FS_SECURITY is not set CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y +CONFIG_FANOTIFY=y CONFIG_FAT_FS=y CONFIG_FB_CMDLINE=y CONFIG_FHANDLE=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FRAME_POINTER=y +CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_ARCH_TOPOLOGY=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PINCONF=y +CONFIG_GENERIC_PINCTRL_GROUPS=y +CONFIG_GENERIC_PINMUX_FUNCTIONS=y CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y @@ -273,50 +291,51 @@ CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TWL4030=y CONFIG_GPIO_TWL6040=y CONFIG_GRACE_PERIOD=y +CONFIG_GRO_CELLS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_BITREVERSE=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARM_SCU=y CONFIG_HAVE_ARM_SMCCC=y CONFIG_HAVE_ARM_TWD=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_EBPF_JIT=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_PCI=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_PROC_CPU=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y CONFIG_HAVE_SMP=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_UID16=y @@ -337,7 +356,6 @@ CONFIG_I2C_OMAP=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_INITRAMFS_SOURCE="" -CONFIG_IOMMU_HELPER=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_DHCP=y @@ -369,7 +387,7 @@ CONFIG_LEDS_TRIGGER_ONESHOT=y CONFIG_LIBCRC32C=y CONFIG_LIBFDT=y CONFIG_LOCKD=y -CONFIG_LOCKDEP=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y @@ -377,7 +395,9 @@ CONFIG_LZO_DECOMPRESS=y # CONFIG_MACH_OMAP3_PANDORA is not set CONFIG_MACH_OMAP_GENERIC=y CONFIG_MAGIC_SYSRQ=y -CONFIG_MDIO_BOARDINFO=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVICE=y +CONFIG_MEMFD_CREATE=y CONFIG_MEMORY=y CONFIG_MEMORY_ISOLATION=y CONFIG_MFD_CORE=y @@ -389,7 +409,6 @@ CONFIG_MFD_TPS65218=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TWL4030_AUDIO=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_MIGHT_HAVE_PCI=y CONFIG_MIGRATION=y CONFIG_MMC=y CONFIG_MMC_BLOCK=y @@ -398,11 +417,8 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_MSDOS_FS=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_BCH=y -CONFIG_MTD_NAND_ECC=y -CONFIG_MTD_NAND_ECC_BCH=y +CONFIG_MTD_NAND_CORE=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP_BCH=y CONFIG_MTD_NAND_OMAP_BCH_BUILD=y @@ -414,6 +430,7 @@ CONFIG_MTD_ONENAND_OMAP2=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_OOPS=y CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_RAW_NAND=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -421,8 +438,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MULTI_IRQ_HANDLER=y # CONFIG_MUSB_PIO_ONLY is not set +CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y CONFIG_NET_FLOW_LIMIT=y @@ -439,20 +456,20 @@ CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_NOP_USB_XCEIV=y -CONFIG_NO_BOOTMEM=y CONFIG_NO_HZ=y CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y CONFIG_NR_CPUS=4 +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_FLATTREE=y CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y +CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OID_REGISTRY=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y @@ -469,21 +486,19 @@ CONFIG_OMAP2_DSS_VENC=y # CONFIG_OMAP3_SDRC_AC_TIMING is not set CONFIG_OMAP3_THERMAL=y CONFIG_OMAP4_DSS_HDMI=y +CONFIG_OMAP4_DSS_HDMI_CEC=y CONFIG_OMAP4_THERMAL=y CONFIG_OMAP5_DSS_HDMI=y CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_CONTROL_PHY=y CONFIG_OMAP_DM_TIMER=y +CONFIG_OMAP_DSS_BASE=y CONFIG_OMAP_GPMC=y # CONFIG_OMAP_GPMC_DEBUG is not set CONFIG_OMAP_INTERCONNECT=y CONFIG_OMAP_INTERCONNECT_BARRIER=y CONFIG_OMAP_IRQCHIP=y -CONFIG_OMAP_MUX=y -CONFIG_OMAP_MUX_DEBUG=y -CONFIG_OMAP_MUX_WARNINGS=y CONFIG_OMAP_OCP2SCP=y -CONFIG_OMAP_PM_NOOP=y CONFIG_OMAP_RESET_CLOCKS=y # CONFIG_OMAP_SSI is not set CONFIG_OMAP_USB2=y @@ -494,22 +509,18 @@ CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_PADATA=y CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PCI_DOMAINS_GENERIC is not set -# CONFIG_PCI_SYSCALL is not set +CONFIG_PAGE_POOL=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y # CONFIG_PHY_DM816X_USB is not set +CONFIG_PHY_TI_GMII_SEL=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_PALMAS is not set CONFIG_PL310_ERRATA_588369=y CONFIG_PL310_ERRATA_727915=y -# CONFIG_PL310_ERRATA_753970 is not set -# CONFIG_PL310_ERRATA_769419 is not set CONFIG_PM=y -# CONFIG_PM_ADVANCED_DEBUG is not set CONFIG_PM_CLK=y -CONFIG_PM_DEBUG=y CONFIG_PM_OPP=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y @@ -522,8 +533,6 @@ CONFIG_PRINTK_TIME=y CONFIG_PRINT_QUOTA_WARNING=y CONFIG_PROC_EVENTS=y CONFIG_PROFILING=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y CONFIG_PTP_1588_CLOCK=y CONFIG_PWM=y # CONFIG_PWM_OMAP_DMTIMER is not set @@ -540,7 +549,9 @@ CONFIG_QUOTACTL=y # CONFIG_QUOTA_NETLINK_INTERFACE is not set CONFIG_QUOTA_TREE=y CONFIG_RATIONAL=y +CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_STALL_COMMON=y +CONFIG_REFCOUNT_FULL=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_IRQ=y @@ -570,11 +581,8 @@ CONFIG_RTC_DRV_PALMAS=y # CONFIG_RTC_DRV_TPS65910 is not set CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_I2C_AND_SPI=y -CONFIG_RTC_MC146818_LIB=y CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_SATA_AHCI_PLATFORM=y -# CONFIG_AHCI_DM816 is not set CONFIG_SCHEDSTATS=y CONFIG_SCHED_INFO=y CONFIG_SCHED_MC=y @@ -583,6 +591,7 @@ CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SDIO_UART=y CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y +# CONFIG_SENSORS_DRIVETEMP is not set CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_LM75=y CONFIG_SENSORS_TMP102=y @@ -595,39 +604,44 @@ CONFIG_SERIAL_8250_NR_UARTS=32 # CONFIG_SERIAL_8250_OMAP is not set CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_SERIO=y +CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y CONFIG_SG_SPLIT=y +CONFIG_SKB_EXTENSIONS=y CONFIG_SMC91X=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SMSC911X=y -# CONFIG_SMSC911X_ARCH_HOOKS is not set CONFIG_SMSC_PHY=y CONFIG_SND=y # CONFIG_SND_COMPRESS_OFFLOAD is not set -CONFIG_SND_DAVINCI_SOC_MCASP=y CONFIG_SND_DMAENGINE_PCM=y CONFIG_SND_JACK=y CONFIG_SND_MIXER_OSS=y -CONFIG_SND_OMAP_SOC=y -CONFIG_SND_OMAP_SOC_DMIC=y -# CONFIG_SND_OMAP_SOC_HDMI_AUDIO is not set -CONFIG_SND_OMAP_SOC_MCBSP=y -CONFIG_SND_OMAP_SOC_MCPDM=y -CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y -CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y -# CONFIG_SND_OMAP_SOC_RX51 is not set CONFIG_SND_PCM=y CONFIG_SND_PCM_OSS=y CONFIG_SND_SIMPLE_CARD=y CONFIG_SND_SIMPLE_CARD_UTILS=y CONFIG_SND_SOC=y +CONFIG_SND_SOC_DAVINCI_MCASP=y CONFIG_SND_SOC_DMIC=y +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_NOKIA_RX51 is not set +# CONFIG_SND_SOC_OMAP3_PANDORA is not set +CONFIG_SND_SOC_OMAP3_TWL4030=y +CONFIG_SND_SOC_OMAP_ABE_TWL6040=y +CONFIG_SND_SOC_OMAP_DMIC=y +CONFIG_SND_SOC_OMAP_HDMI=y +CONFIG_SND_SOC_OMAP_MCBSP=y +CONFIG_SND_SOC_OMAP_MCPDM=y +CONFIG_SND_SOC_TI_EDMA_PCM=y +CONFIG_SND_SOC_TI_SDMA_PCM=y CONFIG_SND_SOC_TLV320AIC3X=y CONFIG_SND_SOC_TWL4030=y CONFIG_SND_SOC_TWL6040=y @@ -644,16 +658,18 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SPARSE_IRQ=y CONFIG_SPI=y CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y CONFIG_SPI_OMAP24XX=y CONFIG_SPI_TI_QSPI=y CONFIG_SRAM=y +CONFIG_SRAM_EXEC=y CONFIG_SRCU=y CONFIG_STACKTRACE=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_SWIOTLB=y CONFIG_SWPHY=y CONFIG_SWP_EMULATE=y +CONFIG_SYNC_FILE=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_THERMAL=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -662,27 +678,28 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_OF=y -# CONFIG_THUMB2_KERNEL is not set CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_TIMER_STATS=y +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y CONFIG_TI_CPPI41=y CONFIG_TI_CPSW=y -CONFIG_TI_CPSW_ALE=y CONFIG_TI_CPSW_PHY_SEL=y CONFIG_TI_CPTS=y -CONFIG_TI_DAVINCI_CPDMA=y +CONFIG_TI_CPTS_MOD=y CONFIG_TI_DAVINCI_EMAC=y CONFIG_TI_DAVINCI_MDIO=y CONFIG_TI_DMA_CROSSBAR=y CONFIG_TI_EDMA=y CONFIG_TI_EMIF=y +# CONFIG_TI_EMIF_SRAM is not set CONFIG_TI_PIPE3=y CONFIG_TI_SOC_THERMAL=y +CONFIG_TI_SYSC=y CONFIG_TI_THERMAL=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRACE_CLOCK=y -CONFIG_TRACE_IRQFLAGS=y CONFIG_TREE_RCU=y +CONFIG_TREE_SRCU=y CONFIG_TWL4030_CORE=y CONFIG_TWL4030_POWER=y CONFIG_TWL4030_USB=y @@ -693,8 +710,9 @@ CONFIG_UBIFS_FS=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y +CONFIG_UBIFS_FS_ZSTD=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_UNWINDER_ARM=y CONFIG_USB=y CONFIG_USB_COMMON=y CONFIG_USB_DWC3=y @@ -722,19 +740,20 @@ CONFIG_USB_TI_CPPI41_DMA=y CONFIG_USB_TUSB_OMAP_DMA=y # CONFIG_USERIO is not set CONFIG_USE_OF=y -CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VFAT_FS=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_VIDEOMODE_HELPERS=y CONFIG_WATCHDOG_CORE=y -# CONFIG_WKUP_M3_RPROC is not set CONFIG_XFRM_ALGO=y CONFIG_XFRM_MIGRATE=y CONFIG_XPS=y +CONFIG_XXHASH=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZSTD_COMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 886f2f06e7..9775261861 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -187,6 +187,7 @@ endef TARGET_DEVICES += asus_rt-ac85p define Device/buffalo_wsr-1166dhp + $(Device/uimage-lzma-loader) IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata IMAGE_SIZE := 15936k DEVICE_VENDOR := Buffalo @@ -197,6 +198,7 @@ endef TARGET_DEVICES += buffalo_wsr-1166dhp define Device/buffalo_wsr-2533dhpl + $(Device/uimage-lzma-loader) IMAGE_SIZE := 7936k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WSR-2533DHPL @@ -218,7 +220,9 @@ define Device/dlink_dir-860l-b1 $(Device/seama) BLOCKSIZE := 64k SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb - KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma + LOADER_TYPE := bin + KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | \ + relocate-kernel | lzma -a0 | uImage lzma IMAGE_SIZE := 16064k DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-860L @@ -284,6 +288,7 @@ endef TARGET_DEVICES += elecom_wrc-1167ghbk2-s define Device/elecom_wrc-1900gst + $(Device/uimage-lzma-loader) IMAGE_SIZE := 11264k DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1900GST @@ -294,6 +299,7 @@ endef TARGET_DEVICES += elecom_wrc-1900gst define Device/elecom_wrc-2533gst + $(Device/uimage-lzma-loader) IMAGE_SIZE := 11264k DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-2533GST @@ -354,6 +360,7 @@ endef TARGET_DEVICES += hiwifi_hc5962 define Device/iodata_wn-ax1167gr + $(Device/uimage-lzma-loader) IMAGE_SIZE := 15552k KERNEL_INITRAMFS := $$(KERNEL) | \ iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin @@ -363,55 +370,50 @@ define Device/iodata_wn-ax1167gr endef TARGET_DEVICES += iodata_wn-ax1167gr -define Device/iodata_wn-ax1167gr2 +define Device/iodata_nand + DEVICE_VENDOR := I-O DATA BLOCKSIZE := 128k PAGESIZE := 2048 UBINIZE_OPTS := -E 5 - UIMAGE_MAGIC := 0x434f4d42 KERNEL_SIZE := 4096k IMAGE_SIZE := 51200k - DEVICE_VENDOR := I-O DATA + LOADER_TYPE := bin + KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | lzma | uImage lzma + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata +endef + +define Device/iodata_wn-ax1167gr2 + $(Device/iodata_nand) + UIMAGE_MAGIC := 0x434f4d42 DEVICE_MODEL := WN-AX1167GR2 KERNEL_INITRAMFS := $(KERNEL_DTB) | custom-initramfs-uimage 3.10(XBC.1)b10 | \ iodata-mstc-header - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-mt7615e wpad-openssl endef TARGET_DEVICES += iodata_wn-ax1167gr2 define Device/iodata_wn-ax2033gr - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 + $(Device/iodata_nand) UIMAGE_MAGIC := 0x434f4d42 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 51200k - DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AX2033GR KERNEL_INITRAMFS := $(KERNEL_DTB) | custom-initramfs-uimage 3.10(VST.1)C10 | \ iodata-mstc-header - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e wpad-openssl endef TARGET_DEVICES += iodata_wn-ax2033gr define Device/iodata_wn-dx1167r - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 + $(Device/iodata_nand) UIMAGE_MAGIC := 0x434f4d43 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 51200k - DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-DX1167R KERNEL_INITRAMFS := $(KERNEL_DTB) | custom-initramfs-uimage 3.10(XIK.1)b10 | \ iodata-mstc-header - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-mt7615e wpad-openssl endef TARGET_DEVICES += iodata_wn-dx1167r define Device/iodata_wn-gx300gr + $(Device/uimage-lzma-loader) IMAGE_SIZE := 7616k DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-GX300GR @@ -420,6 +422,7 @@ endef TARGET_DEVICES += iodata_wn-gx300gr define Device/iodata_wnpr2600g + $(Device/uimage-lzma-loader) DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WNPR2600G IMAGE_SIZE := 13952k @@ -714,6 +717,7 @@ endef TARGET_DEVICES += phicomm_k2p define Device/planex_vr500 + $(Device/uimage-lzma-loader) IMAGE_SIZE := 65216k DEVICE_VENDOR := Planex DEVICE_MODEL := VR500 diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index 70f7a2003d..e90ab630d8 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -963,7 +963,7 @@ define Device/sitecom_wl-351 IMAGE_SIZE := 3776k DEVICE_VENDOR := Sitecom DEVICE_MODEL := WL-351 v1 - DEVICE_PACKAGES := kmod-switch-rtl8366rb kmod-swconfig swconfig + DEVICE_PACKAGES := kmod-switch-rtl8366rb SUPPORTED_DEVICES += wl-351 DEFAULT := n endef diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index b86967b7c3..a1329c49d5 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -12,7 +12,7 @@ define Device/asus_rt-n56u IMAGE/sysupgrade.bin += | mkrtn56uimg -s DEVICE_VENDOR := Asus DEVICE_MODEL := RT-N56U - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 swconfig + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 SUPPORTED_DEVICES += rt-n56u endef TARGET_DEVICES += asus_rt-n56u @@ -23,7 +23,7 @@ define Device/belkin_f9k1109v1 DEVICE_VENDOR := Belkin DEVICE_MODEL := F9K1109 DEVICE_VARIANT := Version 1.0 - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport swconfig + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 7808k KERNEL := kernel-bin | append-dtb | lzma -d16 | uImage lzma # Stock firmware checks for this uImage image name during upload. @@ -40,7 +40,7 @@ define Device/dlink_dir-645 SEAMA_SIGNATURE := wrgn39_dlob.hans_dir645 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-645 - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 swconfig + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 SUPPORTED_DEVICES += dir-645 endef TARGET_DEVICES += dlink_dir-645 @@ -54,7 +54,6 @@ define Device/edimax_br-6475nd append-metadata | check-size DEVICE_VENDOR := Edimax DEVICE_MODEL := BR-6475nD - DEVICE_PACKAGES := swconfig SUPPORTED_DEVICES += br-6475nd endef TARGET_DEVICES += edimax_br-6475nd @@ -89,7 +88,7 @@ define Device/samsung_cy-swr1100 SEAMA_SIGNATURE := wrgnd10_samsung_ss815 DEVICE_VENDOR := Samsung DEVICE_MODEL := CY-SWR1100 - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport swconfig + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += cy-swr1100 endef TARGET_DEVICES += samsung_cy-swr1100 @@ -103,7 +102,7 @@ define Device/sitecom_wlr-6000 senao-header -r 0x0202 -p 0x41 -t 2 DEVICE_VENDOR := Sitecom DEVICE_MODEL := WLR-6000 - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 swconfig + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 SUPPORTED_DEVICES += wlr-6000 endef TARGET_DEVICES += sitecom_wlr-6000 @@ -117,7 +116,6 @@ define Device/trendnet_tew-691gr umedia-header 0x026910 DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-691GR - DEVICE_PACKAGES := swconfig SUPPORTED_DEVICES += tew-691gr endef TARGET_DEVICES += trendnet_tew-691gr @@ -131,7 +129,6 @@ define Device/trendnet_tew-692gr umedia-header 0x026920 DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-692GR - DEVICE_PACKAGES := swconfig SUPPORTED_DEVICES += tew-692gr endef TARGET_DEVICES += trendnet_tew-692gr diff --git a/target/linux/ramips/rt288x/base-files/etc/board.d/02_network b/target/linux/ramips/rt288x/base-files/etc/board.d/02_network index 0cc0e0b28b..a769bdbc43 100755 --- a/target/linux/ramips/rt288x/base-files/etc/board.d/02_network +++ b/target/linux/ramips/rt288x/base-files/etc/board.d/02_network @@ -26,6 +26,8 @@ ramips_setup_interfaces() ;; buffalo,wli-tx4-ag300n|\ dlink,dap-1522-a1) + ucidef_add_switch "switch0" + ucidef_add_switch_attr "switch0" "enable" "false" ucidef_set_interface_lan "eth0" ;; *) diff --git a/target/linux/ramips/rt305x/base-files/etc/board.d/02_network b/target/linux/ramips/rt305x/base-files/etc/board.d/02_network index d6ba16f7a8..5f18aa98f5 100755 --- a/target/linux/ramips/rt305x/base-files/etc/board.d/02_network +++ b/target/linux/ramips/rt305x/base-files/etc/board.d/02_network @@ -48,6 +48,7 @@ ramips_setup_interfaces() hame,mpr-a2|\ hauppauge,broadway|\ hootoo,ht-tm02|\ + huawei,d105|\ intenso,memory2move|\ netgear,wnce2001|\ tenda,3g150b|\ @@ -109,11 +110,6 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0" ;; - huawei,d105) - ucidef_add_switch "switch0" - ucidef_add_switch_attr "switch0" "enable" "false" - ucidef_set_interface_lan "eth0" - ;; huawei,hg255d) ucidef_add_switch "switch0" \ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0" diff --git a/target/linux/ramips/rt3883/base-files/etc/board.d/02_network b/target/linux/ramips/rt3883/base-files/etc/board.d/02_network index 873c72cea3..5f364cfc0f 100755 --- a/target/linux/ramips/rt3883/base-files/etc/board.d/02_network +++ b/target/linux/ramips/rt3883/base-files/etc/board.d/02_network @@ -27,6 +27,8 @@ ramips_setup_interfaces() ;; loewe,wmdr-143n|\ omnima,hpm) + ucidef_add_switch "switch0" + ucidef_add_switch_attr "switch0" "enable" "false" ucidef_set_interface_lan "eth0" ;; samsung,cy-swr1100) diff --git a/target/linux/ramips/rt3883/profiles/00-default.mk b/target/linux/ramips/rt3883/profiles/00-default.mk index b032fb0132..468344198c 100644 --- a/target/linux/ramips/rt3883/profiles/00-default.mk +++ b/target/linux/ramips/rt3883/profiles/00-default.mk @@ -8,7 +8,7 @@ define Profile/Default NAME:=Default Profile PRIORITY:=1 - PACKAGES:=kmod-usb-ohci kmod-usb2 swconfig + PACKAGES:=kmod-usb-ohci kmod-usb2 endef define Profile/Default/Description