diff --git a/backports/0001-build-build-kernel-image-before-building-modules-pac.patch b/backports/0001-build-build-kernel-image-before-building-modules-pac.patch index f33c28e54..cf11e3af7 100644 --- a/backports/0001-build-build-kernel-image-before-building-modules-pac.patch +++ b/backports/0001-build-build-kernel-image-before-building-modules-pac.patch @@ -1,7 +1,7 @@ -From 98ff38f7b7cd28c035b9c2e36a45af17f85c5244 Mon Sep 17 00:00:00 2001 +From 08be0915e06fb6f2b62c022099e82bb4d849a8c6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 22 Oct 2020 10:29:34 +0200 -Subject: [PATCH 01/37] build: build kernel image before building +Subject: [PATCH 1/9] build: build kernel image before building modules/packages This is needed for linux 5.10, where modules.builtin is generated from diff --git a/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch b/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch index 94fb13563..cec74bb0f 100644 --- a/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch +++ b/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch @@ -1,7 +1,7 @@ -From cf2dbd13b7dd8c8c52fc3378da69ebae454520aa Mon Sep 17 00:00:00 2001 +From 6d2e2ff2778ca6360af9bf1e712d7ff276afa54b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 17 Feb 2021 13:49:14 +0100 -Subject: [PATCH 02/37] build: fix build with CONFIG_STRIP_KERNEL_EXPORTS +Subject: [PATCH 2/9] build: fix build with CONFIG_STRIP_KERNEL_EXPORTS Only use symtab.h on the final kernel link diff --git a/backports/0003-kernel-add-linux-5.10-support.patch b/backports/0003-kernel-add-linux-5.10-support.patch index 1921b1ff3..27621b52b 100644 --- a/backports/0003-kernel-add-linux-5.10-support.patch +++ b/backports/0003-kernel-add-linux-5.10-support.patch @@ -1,7 +1,7 @@ -From 31e71ca55e6d452994b8d154ab34113ce532d3cd Mon Sep 17 00:00:00 2001 +From 8d2914fefae283882989fa5f0ba352fde2ac64f1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 24 Oct 2020 21:14:16 +0200 -Subject: [PATCH 03/37] kernel: add linux 5.10 support +Subject: [PATCH 3/9] kernel: add linux 5.10 support Signed-off-by: Felix Fietkau --- @@ -54,7 +54,6 @@ Signed-off-by: Felix Fietkau .../files/drivers/mtd/mtdsplit/Kconfig | 5 + .../files/drivers/mtd/mtdsplit/Makefile | 1 + .../drivers/mtd/mtdsplit/mtdsplit_bcm63xx.c | 186 + - .../mtd/mtdsplit/mtdsplit_cfe_bootfs.c | 14 +- .../files/drivers/mtd/mtdsplit/mtdsplit_fit.c | 6 + .../generic/files/drivers/net/phy/ar8216.c | 16 + .../generic/hack-5.10/204-module_strip.patch | 196 + @@ -218,7 +217,7 @@ Signed-off-by: Felix Fietkau .../pending-5.10/834-ledtrig-libata.patch | 149 + ...40-hwrng-bcm2835-set-quality-to-1000.patch | 26 + .../pending-5.10/920-mangle_bootargs.patch | 71 + - 213 files changed, 37361 insertions(+), 59 deletions(-) + 212 files changed, 37352 insertions(+), 54 deletions(-) create mode 100644 target/linux/generic/backport-5.10/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch create mode 100644 target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch create mode 100644 target/linux/generic/backport-5.10/071-crypto-arm-chacha-neon-optimize-for-non-block-size-m.patch @@ -12851,40 +12850,6 @@ index 0000000000..3a4b8a754f +} + +module_init(mtdsplit_bcm63xx_init); -diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_cfe_bootfs.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_cfe_bootfs.c -index 5c8a5e1b9b..a3474c9dc2 100644 ---- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_cfe_bootfs.c -+++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_cfe_bootfs.c -@@ -17,7 +17,7 @@ - #define je16_to_cpu(x) ((x).v16) - #define je32_to_cpu(x) ((x).v32) - --#define NR_PARTS 1 -+#define NR_PARTS 2 - - static int mtdsplit_cfe_bootfs_parse(struct mtd_info *mtd, - const struct mtd_partition **pparts, -@@ -58,12 +58,16 @@ static int mtdsplit_cfe_bootfs_parse(struct mtd_info *mtd, - if (!parts) - return -ENOMEM; - -+ parts[0].name = "bootfs"; -+ parts[0].offset = 0; -+ parts[0].size = rootfs_offset; -+ - if (type == MTDSPLIT_PART_TYPE_UBI) -- parts[0].name = UBI_PART_NAME; -+ parts[1].name = UBI_PART_NAME; - else -- parts[0].name = ROOTFS_PART_NAME; -- parts[0].offset = rootfs_offset; -- parts[0].size = mtd->size - rootfs_offset; -+ parts[1].name = ROOTFS_PART_NAME; -+ parts[1].offset = rootfs_offset; -+ parts[1].size = mtd->size - rootfs_offset; - - *pparts = parts; - diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c index 67ee33d085..5cc1658dbd 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c diff --git a/backports/0004-mediatek-update-to-latest-HEAD.patch b/backports/0004-mediatek-update-to-latest-trunk-version.patch similarity index 99% rename from backports/0004-mediatek-update-to-latest-HEAD.patch rename to backports/0004-mediatek-update-to-latest-trunk-version.patch index ea00b14b7..7adf4df61 100644 --- a/backports/0004-mediatek-update-to-latest-HEAD.patch +++ b/backports/0004-mediatek-update-to-latest-trunk-version.patch @@ -1,7 +1,7 @@ -From 1c4e9e9ae8d5b765da47891f0e430e6ae360b6fb Mon Sep 17 00:00:00 2001 +From 4cfe3cdd0f08c34fbc35f791cc9a753877eea996 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 9 Apr 2020 09:53:24 +0200 -Subject: [PATCH 01/34] mediatek: update to latest trunk version +Subject: [PATCH 4/9] mediatek: update to latest trunk version Signed-off-by: Felix Fietkau --- @@ -168,12 +168,12 @@ Signed-off-by: Felix Fietkau .../base-files/lib/preinit/79_move_config | 18 - .../mt7622/base-files/lib/upgrade/buffalo.sh | 126 + .../mt7622/base-files/lib/upgrade/platform.sh | 61 +- - .../mt7622/{config-5.4 => config-5.10} | 184 +- + .../mt7622/{config-5.4 => config-5.10} | 181 +- target/linux/mediatek/mt7622/target.mk | 3 +- .../mt7623/base-files/etc/board.d/02_network | 1 - - target/linux/mediatek/mt7623/config-5.4 | 2 +- + target/linux/mediatek/mt7623/config-5.4 | 1 + .../mt7629/base-files/etc/board.d/02_network | 1 - - target/linux/mediatek/mt7629/config-5.4 | 2 +- + target/linux/mediatek/mt7629/config-5.4 | 1 + .../100-dts-update-mt7622-rfb1.patch | 119 + .../101-dts-update-mt7629-rfb.patch | 37 + .../110-dts-fix-bpi2-console.patch | 10 + @@ -212,11 +212,7 @@ Signed-off-by: Felix Fietkau .../patches-5.4/0310-mtk-bmt-support.patch | 837 + ...trx-Allow-to-specify-trx-magic-in-DT.patch | 75 + ...ove-dependency-to-BRCM-architectures.patch | 23 + - ...e-resolved-link-config-via-mac_link_.patch | 10 +- - ...se-resolved-link-config-in-mac_link_.patch | 14 +- - ...xtend-device-data-ready-for-adding-a.patch | 12 +- - ...530-Add-the-support-of-MT7531-switch.patch | 48 +- - 211 files changed, 105095 insertions(+), 1609 deletions(-) + 207 files changed, 105053 insertions(+), 1562 deletions(-) create mode 100644 target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts rename target/linux/mediatek/{files-5.4/arch/arm64/boot/dts/mediatek => dts}/mt7622-elecom-wrc-2533gent.dts (99%) create mode 100644 target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts @@ -101938,7 +101934,7 @@ diff --git a/target/linux/mediatek/mt7622/config-5.4 b/target/linux/mediatek/mt7 similarity index 67% rename from target/linux/mediatek/mt7622/config-5.4 rename to target/linux/mediatek/mt7622/config-5.10 -index 1b0b1e36a6..7f1c3d169a 100644 +index b873bdc40c..7f1c3d169a 100644 --- a/target/linux/mediatek/mt7622/config-5.4 +++ b/target/linux/mediatek/mt7622/config-5.10 @@ -1,59 +1,6 @@ @@ -102191,7 +102187,7 @@ index 1b0b1e36a6..7f1c3d169a 100644 CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LZO_COMPRESS=y -@@ -382,23 +228,25 @@ CONFIG_MDIO_BUS=y +@@ -382,22 +228,25 @@ CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y CONFIG_MEDIATEK_MT6577_AUXADC=y CONFIG_MEDIATEK_WATCHDOG=y @@ -102204,7 +102200,6 @@ index 1b0b1e36a6..7f1c3d169a 100644 +CONFIG_MMC_BLOCK=y +CONFIG_MMC_CQHCI=y CONFIG_MMC_MTK=y --# CONFIG_MMC_TIFM_SD is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_MT753X_GSW=y @@ -102220,7 +102215,7 @@ index 1b0b1e36a6..7f1c3d169a 100644 CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_FIT_FW=y CONFIG_MTD_UBI=y -@@ -423,7 +271,6 @@ CONFIG_NET_DSA=y +@@ -422,7 +271,6 @@ CONFIG_NET_DSA=y CONFIG_NET_DSA_MT7530=y CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_FLOW_LIMIT=y @@ -102228,15 +102223,7 @@ index 1b0b1e36a6..7f1c3d169a 100644 CONFIG_NET_MEDIATEK_SOC=y CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_MEDIATEK=y -@@ -433,7 +280,6 @@ CONFIG_NO_HZ_IDLE=y - CONFIG_NR_CPUS=2 - CONFIG_NVMEM=y - CONFIG_NVMEM_SYSFS=y --# CONFIG_OCTEONTX2_AF is not set - CONFIG_OF=y - CONFIG_OF_ADDRESS=y - CONFIG_OF_EARLY_FLATTREE=y -@@ -449,13 +295,11 @@ CONFIG_PARTITION_PERCPU=y +@@ -447,7 +295,6 @@ CONFIG_PARTITION_PERCPU=y CONFIG_PCI=y CONFIG_PCIEAER=y CONFIG_PCIEASPM=y @@ -102244,13 +102231,7 @@ index 1b0b1e36a6..7f1c3d169a 100644 # CONFIG_PCIEASPM_DEFAULT is not set CONFIG_PCIEASPM_PERFORMANCE=y # CONFIG_PCIEASPM_POWERSAVE is not set - # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set - CONFIG_PCIEPORTBUS=y --# CONFIG_PCIE_AL is not set - CONFIG_PCIE_MEDIATEK=y - CONFIG_PCIE_PME=y - CONFIG_PCI_DEBUG=y -@@ -463,6 +307,7 @@ CONFIG_PCI_DOMAINS=y +@@ -460,6 +307,7 @@ CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -102258,7 +102239,7 @@ index 1b0b1e36a6..7f1c3d169a 100644 CONFIG_PGTABLE_LEVELS=3 CONFIG_PHYLIB=y CONFIG_PHYLINK=y -@@ -480,7 +325,7 @@ CONFIG_PINCTRL_MT7622=y +@@ -477,7 +325,7 @@ CONFIG_PINCTRL_MT7622=y CONFIG_PINCTRL_MT8516=y CONFIG_PINCTRL_MTK=y CONFIG_PINCTRL_MTK_MOORE=y @@ -102267,7 +102248,7 @@ index 1b0b1e36a6..7f1c3d169a 100644 CONFIG_PM=y CONFIG_PM_CLK=y CONFIG_PM_GENERIC_DOMAINS=y -@@ -502,7 +347,6 @@ CONFIG_RATIONAL=y +@@ -499,7 +347,6 @@ CONFIG_RATIONAL=y CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_STALL_COMMON=y CONFIG_REALTEK_PHY=y @@ -102275,7 +102256,7 @@ index 1b0b1e36a6..7f1c3d169a 100644 CONFIG_REGMAP=y CONFIG_REGMAP_MMIO=y CONFIG_REGULATOR=y -@@ -517,6 +361,7 @@ CONFIG_RTC_DRV_MT7622=y +@@ -514,6 +361,7 @@ CONFIG_RTC_DRV_MT7622=y CONFIG_RTC_I2C_AND_SPI=y CONFIG_RTL8367S_GSW=y CONFIG_RWSEM_SPIN_ON_OWNER=y @@ -102283,7 +102264,7 @@ index 1b0b1e36a6..7f1c3d169a 100644 CONFIG_SCSI=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_SERIAL_8250_FSL=y -@@ -555,7 +400,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +@@ -552,7 +400,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_EMULATION=y CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -102318,15 +102299,10 @@ index 391b1ddc07..2006248530 . /lib/functions.sh . /lib/functions/uci-defaults.sh diff --git a/target/linux/mediatek/mt7623/config-5.4 b/target/linux/mediatek/mt7623/config-5.4 -index dbd3055d3b..45ae7a4261 100644 +index d079c78578..45ae7a4261 100644 --- a/target/linux/mediatek/mt7623/config-5.4 +++ b/target/linux/mediatek/mt7623/config-5.4 -@@ -327,11 +327,11 @@ CONFIG_MMC_MTK=y - CONFIG_MMC_SDHCI=y - # CONFIG_MMC_SDHCI_PCI is not set - CONFIG_MMC_SDHCI_PLTFM=y --# CONFIG_MMC_TIFM_SD is not set - CONFIG_MODULES_USE_ELF_REL=y +@@ -331,6 +331,7 @@ CONFIG_MODULES_USE_ELF_REL=y # CONFIG_MT753X_GSW is not set CONFIG_MTD_BLOCK2MTD=y CONFIG_MTD_CMDLINE_PARTS=y @@ -102346,18 +102322,10 @@ index 24c66de788..c39417abbc . /lib/functions.sh . /lib/functions/uci-defaults.sh diff --git a/target/linux/mediatek/mt7629/config-5.4 b/target/linux/mediatek/mt7629/config-5.4 -index 7fe01d1748..1c7d54cd37 100644 +index 46eac73240..1c7d54cd37 100644 --- a/target/linux/mediatek/mt7629/config-5.4 +++ b/target/linux/mediatek/mt7629/config-5.4 -@@ -91,7 +91,6 @@ CONFIG_CPU_CP15=y - CONFIG_CPU_CP15_MMU=y - CONFIG_CPU_HAS_ASID=y - CONFIG_CPU_IDLE=y --# CONFIG_CPU_IDLE_GOV_LADDER is not set - CONFIG_CPU_IDLE_GOV_MENU=y - CONFIG_CPU_PABRT_V7=y - CONFIG_CPU_PM=y -@@ -240,6 +239,7 @@ CONFIG_MT753X_GSW=y +@@ -239,6 +239,7 @@ CONFIG_MT753X_GSW=y CONFIG_MTD_NAND_CORE=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_NAND_MTK=y @@ -108750,400 +108718,6 @@ index 0000000000..fa94c22304 + help + TRX is a firmware format used by Broadcom on their devices. It + may contain up to 3/4 partitions (depending on the version). -diff --git a/target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch b/target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch -index f122a502a4..4c939e8017 100644 ---- a/target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch -+++ b/target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch -@@ -12,7 +12,7 @@ Signed-off-by: David S. Miller - - --- a/drivers/net/dsa/b53/b53_common.c - +++ b/drivers/net/dsa/b53/b53_common.c --@@ -1291,7 +1291,9 @@ EXPORT_SYMBOL(b53_phylink_mac_link_down) -+@@ -1284,7 +1284,9 @@ EXPORT_SYMBOL(b53_phylink_mac_link_down) - void b53_phylink_mac_link_up(struct dsa_switch *ds, int port, - unsigned int mode, - phy_interface_t interface, -@@ -38,7 +38,7 @@ Signed-off-by: David S. Miller - const struct switchdev_obj_port_vlan *vlan); - --- a/drivers/net/dsa/bcm_sf2.c - +++ b/drivers/net/dsa/bcm_sf2.c --@@ -634,7 +634,9 @@ static void bcm_sf2_sw_mac_link_down(str -+@@ -636,7 +636,9 @@ static void bcm_sf2_sw_mac_link_down(str - static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port, - unsigned int mode, - phy_interface_t interface, -@@ -64,7 +64,7 @@ Signed-off-by: David S. Miller - - --- a/drivers/net/dsa/mt7530.c - +++ b/drivers/net/dsa/mt7530.c --@@ -1452,7 +1452,9 @@ static void mt7530_phylink_mac_link_down -+@@ -1450,7 +1450,9 @@ static void mt7530_phylink_mac_link_down - static void mt7530_phylink_mac_link_up(struct dsa_switch *ds, int port, - unsigned int mode, - phy_interface_t interface, -@@ -103,7 +103,7 @@ Signed-off-by: David S. Miller - } - --- a/include/net/dsa.h - +++ b/include/net/dsa.h --@@ -401,7 +401,9 @@ struct dsa_switch_ops { -+@@ -406,7 +406,9 @@ struct dsa_switch_ops { - void (*phylink_mac_link_up)(struct dsa_switch *ds, int port, - unsigned int mode, - phy_interface_t interface, -@@ -128,7 +128,7 @@ Signed-off-by: David S. Miller - - --- a/net/dsa/dsa_priv.h - +++ b/net/dsa/dsa_priv.h --@@ -180,9 +180,11 @@ void dsa_port_phylink_mac_link_down(stru -+@@ -192,9 +192,11 @@ void dsa_port_phylink_mac_link_down(stru - unsigned int mode, - phy_interface_t interface); - void dsa_port_phylink_mac_link_up(struct phylink_config *config, -diff --git a/target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch b/target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch -index ae153847dc..de5b260778 100644 ---- a/target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch -+++ b/target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch -@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller - - --- a/drivers/net/dsa/mt7530.c - +++ b/drivers/net/dsa/mt7530.c --@@ -490,17 +490,6 @@ mt7530_mib_reset(struct dsa_switch *ds) -+@@ -488,17 +488,6 @@ mt7530_mib_reset(struct dsa_switch *ds) - mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE); - } - -@@ -33,7 +33,7 @@ Signed-off-by: David S. Miller - static int mt7530_phy_read(struct dsa_switch *ds, int port, int regnum) - { - struct mt7530_priv *priv = ds->priv; --@@ -674,7 +663,7 @@ mt7530_port_enable(struct dsa_switch *ds -+@@ -672,7 +661,7 @@ mt7530_port_enable(struct dsa_switch *ds - priv->ports[port].enable = true; - mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, - priv->ports[port].pm); -@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller - - mutex_unlock(&priv->reg_mutex); - --@@ -697,7 +686,7 @@ mt7530_port_disable(struct dsa_switch *d -+@@ -695,7 +684,7 @@ mt7530_port_disable(struct dsa_switch *d - priv->ports[port].enable = false; - mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, - PCR_MATRIX_CLR); -@@ -51,7 +51,7 @@ Signed-off-by: David S. Miller - - mutex_unlock(&priv->reg_mutex); - } --@@ -1407,8 +1396,7 @@ static void mt7530_phylink_mac_config(st -+@@ -1405,8 +1394,7 @@ static void mt7530_phylink_mac_config(st - - mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port)); - mcr_new = mcr_cur; -@@ -61,7 +61,7 @@ Signed-off-by: David S. Miller - mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN | - PMCR_BACKPR_EN | PMCR_FORCE_MODE; - --@@ -1416,26 +1404,6 @@ static void mt7530_phylink_mac_config(st -+@@ -1414,26 +1402,6 @@ static void mt7530_phylink_mac_config(st - if (port == 5 && dsa_is_user_port(ds, 5)) - mcr_new |= PMCR_EXT_PHY; - -@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller - if (mcr_new != mcr_cur) - mt7530_write(priv, MT7530_PMCR_P(port), mcr_new); - } --@@ -1446,7 +1414,7 @@ static void mt7530_phylink_mac_link_down -+@@ -1444,7 +1412,7 @@ static void mt7530_phylink_mac_link_down - { - struct mt7530_priv *priv = ds->priv; - -@@ -97,7 +97,7 @@ Signed-off-by: David S. Miller - } - - static void mt7530_phylink_mac_link_up(struct dsa_switch *ds, int port, --@@ -1457,8 +1425,31 @@ static void mt7530_phylink_mac_link_up(s -+@@ -1455,8 +1423,31 @@ static void mt7530_phylink_mac_link_up(s - bool tx_pause, bool rx_pause) - { - struct mt7530_priv *priv = ds->priv; -diff --git a/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch b/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch -index b86c5b8283..04189e8e31 100644 ---- a/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch -+++ b/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch -@@ -47,7 +47,7 @@ Signed-off-by: Sean Wang - return -EINVAL; - } - --@@ -1344,12 +1346,11 @@ mt7530_setup(struct dsa_switch *ds) -+@@ -1342,12 +1344,11 @@ mt7530_setup(struct dsa_switch *ds) - return 0; - } - -@@ -63,7 +63,7 @@ Signed-off-by: Sean Wang - - switch (port) { - case 0: /* Internal phy */ --@@ -1358,33 +1359,114 @@ static void mt7530_phylink_mac_config(st -+@@ -1356,33 +1357,114 @@ static void mt7530_phylink_mac_config(st - case 3: - case 4: - if (state->interface != PHY_INTERFACE_MODE_GMII) -@@ -189,7 +189,7 @@ Signed-off-by: Sean Wang - return; - } - --@@ -1452,61 +1534,44 @@ static void mt7530_phylink_mac_link_up(s -+@@ -1450,61 +1532,44 @@ static void mt7530_phylink_mac_link_up(s - mt7530_set(priv, MT7530_PMCR_P(port), mcr); - } - -@@ -274,7 +274,7 @@ Signed-off-by: Sean Wang - phylink_set(mask, Pause); - phylink_set(mask, Asym_Pause); - --@@ -1602,12 +1667,45 @@ static int mt7530_set_mac_eee(struct dsa -+@@ -1600,12 +1665,45 @@ static int mt7530_set_mac_eee(struct dsa - return 0; - } - -@@ -323,7 +323,7 @@ Signed-off-by: Sean Wang - .get_ethtool_stats = mt7530_get_ethtool_stats, - .get_sset_count = mt7530_get_sset_count, - .port_enable = mt7530_port_enable, --@@ -1624,18 +1722,43 @@ static const struct dsa_switch_ops mt753 -+@@ -1622,18 +1720,43 @@ static const struct dsa_switch_ops mt753 - .port_vlan_del = mt7530_port_vlan_del, - .port_mirror_add = mt7530_port_mirror_add, - .port_mirror_del = mt7530_port_mirror_del, -@@ -372,7 +372,7 @@ Signed-off-by: Sean Wang - { /* sentinel */ }, - }; - MODULE_DEVICE_TABLE(of, mt7530_of_match); --@@ -1673,8 +1796,21 @@ mt7530_probe(struct mdio_device *mdiodev -+@@ -1671,8 +1794,21 @@ mt7530_probe(struct mdio_device *mdiodev - /* Get the hardware identifier from the devicetree node. - * We will need it for some of the clock and regulator setup. - */ -diff --git a/target/linux/mediatek/patches-5.4/0604-net-dsa-mt7530-Add-the-support-of-MT7531-switch.patch b/target/linux/mediatek/patches-5.4/0604-net-dsa-mt7530-Add-the-support-of-MT7531-switch.patch -index 1e6126eb7f..9333f03aaf 100644 ---- a/target/linux/mediatek/patches-5.4/0604-net-dsa-mt7530-Add-the-support-of-MT7531-switch.patch -+++ b/target/linux/mediatek/patches-5.4/0604-net-dsa-mt7530-Add-the-support-of-MT7531-switch.patch -@@ -41,7 +41,7 @@ Signed-off-by: Sean Wang - _mt7530_read(struct mt7530_dummy_poll *p) - { - struct mii_bus *bus = p->priv->bus; --@@ -483,6 +489,108 @@ mt7530_pad_clk_setup(struct dsa_switch * -+@@ -481,6 +487,108 @@ mt7530_pad_clk_setup(struct dsa_switch * - return 0; - } - -@@ -150,7 +150,7 @@ Signed-off-by: Sean Wang - static void - mt7530_mib_reset(struct dsa_switch *ds) - { --@@ -507,6 +615,217 @@ static int mt7530_phy_write(struct dsa_s -+@@ -505,6 +613,217 @@ static int mt7530_phy_write(struct dsa_s - return mdiobus_write_nested(priv->bus, port, regnum, val); - } - -@@ -368,7 +368,7 @@ Signed-off-by: Sean Wang - static void - mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset, - uint8_t *data) --@@ -623,9 +942,14 @@ unlock_exit: -+@@ -621,9 +940,14 @@ unlock_exit: - } - - static int -@@ -385,7 +385,7 @@ Signed-off-by: Sean Wang - /* Enable Mediatek header mode on the cpu port */ - mt7530_write(priv, MT7530_PVC_P(port), - PORT_SPEC_TAG); --@@ -638,7 +962,7 @@ mt7530_cpu_port_enable(struct mt7530_pri -+@@ -636,7 +960,7 @@ mt7530_cpu_port_enable(struct mt7530_pri - mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port)); - - /* CPU port gets connected to all user ports of -@@ -394,7 +394,7 @@ Signed-off-by: Sean Wang - */ - mt7530_write(priv, MT7530_PCR_P(port), - PCR_MATRIX(dsa_user_ports(priv->ds))); --@@ -1132,27 +1456,42 @@ mt7530_port_vlan_del(struct dsa_switch * -+@@ -1130,27 +1454,42 @@ mt7530_port_vlan_del(struct dsa_switch * - return 0; - } - -@@ -444,7 +444,7 @@ Signed-off-by: Sean Wang - - val = mt7530_read(priv, MT7530_PCR_P(port)); - if (ingress) { --@@ -1167,7 +1506,7 @@ static int mt7530_port_mirror_add(struct -+@@ -1165,7 +1504,7 @@ static int mt7530_port_mirror_add(struct - return 0; - } - -@@ -453,7 +453,7 @@ Signed-off-by: Sean Wang - struct dsa_mall_mirror_tc_entry *mirror) - { - struct mt7530_priv *priv = ds->priv; --@@ -1184,9 +1523,9 @@ static void mt7530_port_mirror_del(struc -+@@ -1182,9 +1521,9 @@ static void mt7530_port_mirror_del(struc - mt7530_write(priv, MT7530_PCR_P(port), val); - - if (!priv->mirror_rx && !priv->mirror_tx) { -@@ -466,7 +466,7 @@ Signed-off-by: Sean Wang - } - } - --@@ -1292,7 +1631,7 @@ mt7530_setup(struct dsa_switch *ds) -+@@ -1290,7 +1629,7 @@ mt7530_setup(struct dsa_switch *ds) - PCR_MATRIX_CLR); - - if (dsa_is_cpu_port(ds, i)) -@@ -475,7 +475,7 @@ Signed-off-by: Sean Wang - else - mt7530_port_disable(ds, i); - --@@ -1346,6 +1685,118 @@ mt7530_setup(struct dsa_switch *ds) -+@@ -1344,6 +1683,118 @@ mt7530_setup(struct dsa_switch *ds) - return 0; - } - -@@ -594,7 +594,7 @@ Signed-off-by: Sean Wang - static bool - mt7530_phy_mode_supported(struct dsa_switch *ds, int port, - const struct phylink_link_state *state) --@@ -1384,6 +1835,47 @@ unsupported: -+@@ -1382,6 +1833,47 @@ unsupported: - return false; - } - -@@ -642,7 +642,7 @@ Signed-off-by: Sean Wang - static bool - mt753x_phy_mode_supported(struct dsa_switch *ds, int port, - const struct phylink_link_state *state) --@@ -1416,6 +1908,227 @@ mt7530_mac_config(struct dsa_switch *ds, -+@@ -1414,6 +1906,227 @@ mt7530_mac_config(struct dsa_switch *ds, - return 0; - } - -@@ -870,7 +870,7 @@ Signed-off-by: Sean Wang - static int - mt753x_mac_config(struct dsa_switch *ds, int port, unsigned int mode, - const struct phylink_link_state *state) --@@ -1451,6 +2164,8 @@ mt753x_phylink_mac_config(struct dsa_swi -+@@ -1449,6 +2162,8 @@ mt753x_phylink_mac_config(struct dsa_swi - if (mt753x_mac_config(ds, port, mode, state) < 0) - goto unsupported; - -@@ -879,7 +879,7 @@ Signed-off-by: Sean Wang - break; - case 6: /* 1st cpu port */ - if (priv->p6_interface == state->interface) --@@ -1470,7 +2185,8 @@ unsupported: -+@@ -1468,7 +2183,8 @@ unsupported: - return; - } - -@@ -889,7 +889,7 @@ Signed-off-by: Sean Wang - dev_err(ds->dev, "%s: in-band negotiation unsupported\n", - __func__); - return; --@@ -1480,7 +2196,7 @@ unsupported: -+@@ -1478,7 +2194,7 @@ unsupported: - mcr_new = mcr_cur; - mcr_new &= ~PMCR_LINK_SETTINGS_MASK; - mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN | -@@ -898,7 +898,7 @@ Signed-off-by: Sean Wang - - /* Are we connected to external phy */ - if (port == 5 && dsa_is_user_port(ds, 5)) --@@ -1490,7 +2206,18 @@ unsupported: -+@@ -1488,7 +2204,18 @@ unsupported: - mt7530_write(priv, MT7530_PMCR_P(port), mcr_new); - } - -@@ -918,7 +918,7 @@ Signed-off-by: Sean Wang - unsigned int mode, - phy_interface_t interface) - { --@@ -1499,7 +2226,19 @@ static void mt7530_phylink_mac_link_down -+@@ -1497,7 +2224,19 @@ static void mt7530_phylink_mac_link_down - mt7530_clear(priv, MT7530_PMCR_P(port), PMCR_LINK_SETTINGS_MASK); - } - -@@ -939,7 +939,7 @@ Signed-off-by: Sean Wang - unsigned int mode, - phy_interface_t interface, - struct phy_device *phydev, --@@ -1509,18 +2248,29 @@ static void mt7530_phylink_mac_link_up(s -+@@ -1507,18 +2246,29 @@ static void mt7530_phylink_mac_link_up(s - struct mt7530_priv *priv = ds->priv; - u32 mcr; - -@@ -971,7 +971,7 @@ Signed-off-by: Sean Wang - break; - } - if (duplex == DUPLEX_FULL) { --@@ -1534,6 +2284,45 @@ static void mt7530_phylink_mac_link_up(s -+@@ -1532,6 +2282,45 @@ static void mt7530_phylink_mac_link_up(s - mt7530_set(priv, MT7530_PMCR_P(port), mcr); - } - -@@ -1017,7 +1017,7 @@ Signed-off-by: Sean Wang - static void - mt7530_mac_port_validate(struct dsa_switch *ds, int port, - unsigned long *supported) --@@ -1542,6 +2331,14 @@ mt7530_mac_port_validate(struct dsa_swit -+@@ -1540,6 +2329,14 @@ mt7530_mac_port_validate(struct dsa_swit - phylink_set(supported, 1000baseX_Full); - } - -@@ -1032,7 +1032,7 @@ Signed-off-by: Sean Wang - static void - mt753x_phylink_validate(struct dsa_switch *ds, int port, - unsigned long *supported, --@@ -1558,7 +2355,8 @@ mt753x_phylink_validate(struct dsa_switc -+@@ -1556,7 +2353,8 @@ mt753x_phylink_validate(struct dsa_switc - - phylink_set_port_modes(mask); - -@@ -1042,7 +1042,7 @@ Signed-off-by: Sean Wang - phylink_set(mask, 10baseT_Half); - phylink_set(mask, 10baseT_Full); - phylink_set(mask, 100baseT_Half); --@@ -1577,6 +2375,11 @@ mt753x_phylink_validate(struct dsa_switc -+@@ -1575,6 +2373,11 @@ mt753x_phylink_validate(struct dsa_switc - - linkmode_and(supported, supported, mask); - linkmode_and(state->advertising, state->advertising, mask); -@@ -1054,7 +1054,7 @@ Signed-off-by: Sean Wang - } - - static int --@@ -1667,6 +2470,63 @@ static int mt7530_set_mac_eee(struct dsa -+@@ -1665,6 +2468,63 @@ static int mt7530_set_mac_eee(struct dsa - return 0; - } - -@@ -1118,7 +1118,7 @@ Signed-off-by: Sean Wang - static int - mt753x_phylink_mac_link_state(struct dsa_switch *ds, int port, - struct phylink_link_state *state) --@@ -1720,13 +2580,14 @@ static const struct dsa_switch_ops mt753 -+@@ -1718,13 +2578,14 @@ static const struct dsa_switch_ops mt753 - .port_vlan_prepare = mt7530_port_vlan_prepare, - .port_vlan_add = mt7530_port_vlan_add, - .port_vlan_del = mt7530_port_vlan_del, -@@ -1137,7 +1137,7 @@ Signed-off-by: Sean Wang - .get_mac_eee = mt7530_get_mac_eee, - .set_mac_eee = mt7530_set_mac_eee, - }; --@@ -1754,11 +2615,26 @@ static const struct mt753x_info mt753x_t -+@@ -1752,11 +2613,26 @@ static const struct mt753x_info mt753x_t - .mac_port_get_state = mt7530_phylink_mac_link_state, - .mac_port_config = mt7530_mac_config, - }, -- 2.25.1 diff --git a/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch b/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch index 2c70d2a7d..aa55f8c21 100644 --- a/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch +++ b/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch @@ -1,7 +1,7 @@ -From 53e43a9bedff657125f9023384c588eca871ef97 Mon Sep 17 00:00:00 2001 +From 0a0953b5c81a2b5b366a3f0f543db71ffc81f713 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 20 Feb 2021 08:36:43 +0100 -Subject: [PATCH 05/37] sysupgrade-nand: allow limiting rootfs_data by setting +Subject: [PATCH 5/9] sysupgrade-nand: allow limiting rootfs_data by setting env variable Check if firmware environment variable 'rootfs_data_max' exists and is diff --git a/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch b/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch index b5f6b8e9a..7c1816d81 100644 --- a/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch +++ b/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch @@ -1,7 +1,7 @@ -From fa6f7e0c0d7bf5d6c9697096e598372b52f51085 Mon Sep 17 00:00:00 2001 +From aa59e42ae6e3299f5d1b8015a8bd90d5ac34a510 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 30 Jan 2021 13:58:16 +0000 -Subject: [PATCH 06/37] uboot-mediatek: add support for linksys e8450 +Subject: [PATCH 6/9] uboot-mediatek: add support for linksys e8450 Build U-Boot for the Linksys E8450 in order to have support for UBI. The loader has a default environment with scripts handling the reset diff --git a/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch b/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch index 3c14a94b0..cf70f5d17 100644 --- a/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch +++ b/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch @@ -1,7 +1,7 @@ -From afdb544b7378d99ad776e8b2bc66a00dbeb48c06 Mon Sep 17 00:00:00 2001 +From 7837219939ea5d8ecab21acf943a8199bea7e89a Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 12 Feb 2021 03:09:39 +0000 -Subject: [PATCH 07/37] uboot-envtools: add defaults for linksys-e8450-ubi +Subject: [PATCH 7/9] uboot-envtools: add defaults for linksys-e8450-ubi Add U-Boot environment configuration for the Linksys E8450 (UBI) to allow access to the bootloader environment from OpenWrt via diff --git a/backports/0008-realtek-update-to-latest-owrt-HEAD.patch b/backports/0008-realtek-update-to-latest-owrt-HEAD.patch index a478794b6..c9568f395 100644 --- a/backports/0008-realtek-update-to-latest-owrt-HEAD.patch +++ b/backports/0008-realtek-update-to-latest-owrt-HEAD.patch @@ -1,7 +1,7 @@ -From c07c28c4cbd35e1cfd5033b1da6226d1a54f0454 Mon Sep 17 00:00:00 2001 +From 9f20103ebfb0b3a07b87157299353ff4984f94bc Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 16 Mar 2021 10:46:51 +0100 -Subject: [PATCH 08/37] realtek: update to latest owrt HEAD +Subject: [PATCH 8/9] realtek: update to latest owrt HEAD Signed-off-by: John Crispin --- diff --git a/backports/0009-include-set-kernel-version.mk.patch b/backports/0009-include-set-kernel-version.mk.patch index ffbdc700f..41ee36e55 100644 --- a/backports/0009-include-set-kernel-version.mk.patch +++ b/backports/0009-include-set-kernel-version.mk.patch @@ -1,7 +1,7 @@ -From a8c9777a9edb012fd67d2419b207a7c591f08aba Mon Sep 17 00:00:00 2001 +From 0e4596cd23310f6aacc88093edfed5bfda79e27f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 7 Apr 2021 10:46:26 +0200 -Subject: [PATCH 09/37] include: set kernel-version.mk +Subject: [PATCH 9/9] include: set kernel-version.mk Signed-off-by: John Crispin --- @@ -9,7 +9,7 @@ Signed-off-by: John Crispin 1 file changed, 4 insertions(+) diff --git a/include/kernel-version.mk b/include/kernel-version.mk -index aff812e57f..ace6d45149 100644 +index 52e5c11d75..f6f4a14779 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,9 +6,13 @@ ifdef CONFIG_TESTING_KERNEL @@ -17,11 +17,11 @@ index aff812e57f..ace6d45149 100644 endif +LINUX_VERSION-4.4 = .60 - LINUX_VERSION-5.4 = .108 + LINUX_VERSION-5.4 = .111 +LINUX_VERSION-5.10 = .27 +LINUX_KERNEL_HASH-4.4.60 = 2cd8df6f1ac6a5329c5a286ec9b5956215977221a1b731597ed169fff74a9659 - LINUX_KERNEL_HASH-5.4.108 = f212ac07c21bd33e6898fdbb2ddba2a454f74578bbe7bef8fe4dbbbc0ec52172 + LINUX_KERNEL_HASH-5.4.111 = 21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03 +LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/backports/0010-mt76-update-to-latest-HEAD-revision.patch b/backports/0010-mt76-update-to-latest-HEAD-revision.patch deleted file mode 100644 index 860331f84..000000000 --- a/backports/0010-mt76-update-to-latest-HEAD-revision.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ea0fbd7e8fcf269feaf54b639512651faf96dcfd Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Wed, 7 Apr 2021 11:11:04 +0200 -Subject: [PATCH 10/37] mt76: update to latest HEAD revision - -Signed-off-by: John Crispin ---- - package/kernel/mt76/Makefile | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile -index 45375ef564..c58d9aa9f6 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:=2021-02-14 --PKG_SOURCE_VERSION:=289cd7804587dc48f776d450db9cd3762692a370 --PKG_MIRROR_HASH:=91885feca9d935586c6e33a8e3734bfa61991d869bf42ac0d1c8c3b19bfa9653 -+PKG_SOURCE_DATE:=2021-04-07 -+PKG_SOURCE_VERSION:=813db729c02ffa74fdda6d461afeb5aabc5706bb -+PKG_MIRROR_HASH:=63bd913f8ba3e85ae7a4575737a2c66377ebf59fa543e025150c650dd9ae13f2 - - PKG_MAINTAINER:=Felix Fietkau - PKG_BUILD_PARALLEL:=1 -@@ -407,6 +407,14 @@ define KernelPackage/mt7915e/install - $(1)/lib/firmware/mediatek - endef - -+define KernelPackage/mt7921e/install -+ $(INSTALL_DIR) $(1)/lib/firmware/mediatek -+ cp \ -+ $(PKG_BUILD_DIR)/firmware/WIFI_MT7961_patch_mcu_1_2_hdr.bin \ -+ $(PKG_BUILD_DIR)/firmware/WIFI_RAM_CODE_MT7961_1.bin \ -+ $(1)/lib/firmware/mediatek -+endef -+ - define Package/mt76-test/install - mkdir -p $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin --- -2.25.1 - diff --git a/config.yml b/config.yml index 0f5b39291..e37fdc3f1 100644 --- a/config.yml +++ b/config.yml @@ -1,6 +1,6 @@ repo: https://github.com/openwrt/openwrt.git branch: openwrt-21.02 -revision: 64ddac2c1cdf068e66a1325eb4c4d6972a6a8b4f +revision: 6fd65c657351908302b37447675ee352ec927d93 output_dir: ./output patch_folders: diff --git a/feeds/ucentral/firewall4/Makefile b/feeds/ucentral/firewall4/Makefile new file mode 100644 index 000000000..3cc6af6c7 --- /dev/null +++ b/feeds/ucentral/firewall4/Makefile @@ -0,0 +1,44 @@ +# +# Copyright (C) 2021 Jo-Philipp Wich +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=firewall4 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall4.git +PKG_SOURCE_DATE:=2021-03-31 +PKG_SOURCE_VERSION:=29fba840201287b9265888adba6298779b750af5 +PKG_MIRROR_HASH:=1d26a611aeecdf37f09e4cdee6b192e5da087abf6e0fc7a9ca97a80e58d14222 +PKG_MAINTAINER:=Jo-Philipp Wich +PKG_LICENSE:=ISC + +include $(INCLUDE_DIR)/package.mk + +define Package/firewall4 + SECTION:=net + CATEGORY:=Base system + TITLE:=OpenWrt 4th gen firewall + DEPENDS:=+ucode +ucode-mod-fs +ucode-mod-uci +ucode-mod-ubus +kmod-nft-core +kmod-nft-fib +kmod-nft-nat +kmod-nft-nat6 +nftables-json +endef + +define Package/firewall4/description + This package provides an nftables-based implementation of the UCI firewall + sharing the same configuration format. +endef + +define Package/firewall4/conffiles +/etc/config/firewall +/etc/nftables.d/ +endef + +define Package/firewall4/install + $(CP) -a $(PKG_BUILD_DIR)/root/* $(1)/ +endef + +define Build/Compile +endef + +$(eval $(call BuildPackage,firewall4)) diff --git a/feeds/ucentral/ratelimit/files/usr/bin/ratelimit b/feeds/ucentral/ratelimit/files/usr/bin/ratelimit index b9a1ac2e9..192881039 100755 --- a/feeds/ucentral/ratelimit/files/usr/bin/ratelimit +++ b/feeds/ucentral/ratelimit/files/usr/bin/ratelimit @@ -128,7 +128,7 @@ addiface() { waitiface() { local iface=$1 - ubus -t 15 wait_for hostapd.$1 + ubus -t 75 wait_for hostapd.$1 [ $? -eq 0 ] || exit 0 diff --git a/feeds/ucentral/ucentral-defaults/files/etc/uci-defaults/99-ucentral-network b/feeds/ucentral/ucentral-defaults/files/etc/uci-defaults/99-ucentral-network index 230ba85aa..35c090b04 100755 --- a/feeds/ucentral/ucentral-defaults/files/etc/uci-defaults/99-ucentral-network +++ b/feeds/ucentral/ucentral-defaults/files/etc/uci-defaults/99-ucentral-network @@ -1,4 +1,4 @@ #!/bin/sh uci set network.wan6.ifname=@wan -[ -n "$(uci get network.bridge)" ] && uci set network.wan.type=bridge +[ -n "$(uci get network.bridge)" ] || uci set network.wan.type=bridge diff --git a/feeds/ucentral/ucentral-wifi/Makefile b/feeds/ucentral/ucentral-wifi/Makefile index 8354194b9..1c6615705 100644 --- a/feeds/ucentral/ucentral-wifi/Makefile +++ b/feeds/ucentral/ucentral-wifi/Makefile @@ -5,8 +5,8 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/blogic/ucentral-wifi.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-02-15 -PKG_SOURCE_VERSION:=34fa9c0fff6e271b7013a2d177513154de7ec105 +PKG_SOURCE_DATE:=2021-04-13 +PKG_SOURCE_VERSION:=b5a5fee87f23333a922f7d515f4da21daaf9b7ea PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/feeds/ucentral/udhcpsnoop/Makefile b/feeds/ucentral/udhcpsnoop/Makefile new file mode 100644 index 000000000..77ee08184 --- /dev/null +++ b/feeds/ucentral/udhcpsnoop/Makefile @@ -0,0 +1,30 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=udhcpsnoop +PKG_RELEASE:=1 + +PKG_LICENSE:=GPL-2.0 +PKG_MAINTAINER:=John Crispin + +PKG_SOURCE_URL=https://github.com/blogic/udhcpsnoop.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2021-04-12 +PKG_SOURCE_VERSION:=7c3831318747a4f0c221292c5eb41f411cf0c3bd + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/udhcpsnoop + SECTION:=net + CATEGORY:=Network + TITLE:=DHCP Snooping Daemon + DEPENDS:=+libubox +libubus +libuci +endef + +define Package/udhcpsnoop/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/udhcpsnoop $(1)/usr/sbin/ + $(CP) ./files/* $(1) +endef + +$(eval $(call BuildPackage,udhcpsnoop)) diff --git a/feeds/ucentral/udhcpsnoop/files/etc/config/dhcpsnooping b/feeds/ucentral/udhcpsnoop/files/etc/config/dhcpsnooping new file mode 100644 index 000000000..3f7682ddc --- /dev/null +++ b/feeds/ucentral/udhcpsnoop/files/etc/config/dhcpsnooping @@ -0,0 +1,3 @@ +config snooping + #option lan 1 + #option wan 1 diff --git a/feeds/ucentral/udhcpsnoop/files/etc/hotplug.d/iface/30-dhcpsnooping b/feeds/ucentral/udhcpsnoop/files/etc/hotplug.d/iface/30-dhcpsnooping new file mode 100755 index 000000000..413a7870d --- /dev/null +++ b/feeds/ucentral/udhcpsnoop/files/etc/hotplug.d/iface/30-dhcpsnooping @@ -0,0 +1,3 @@ +#!/bin/sh +[ "$ACTION" == "ifup" -o "$ACTION" == "ifupdate" ] || exit 0 +[ "$(uci get dhcpsnooping.@snooping[-1].$INTERFACE)" -eq 1 ] && udhcpsnoop $INTERFACE $DEVICE diff --git a/feeds/ucentral/wired-802.1x/Makefile b/feeds/ucentral/wired-802.1x/Makefile new file mode 100644 index 000000000..35dbc0d88 --- /dev/null +++ b/feeds/ucentral/wired-802.1x/Makefile @@ -0,0 +1,30 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=wired-802.1x +PKG_RELEASE:=1 + +PKG_LICENSE:=GPL-2.0 +PKG_MAINTAINER:=John Crispin + +PKG_SOURCE_URL=https://github.com/blogic/wired-802.1x.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2021-04-12 +PKG_SOURCE_VERSION:=2f394a8416d8bed2298efe9737b86bcebe69744f + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/wired-802.1x + SECTION:=net + CATEGORY:=Network + TITLE:=Wired 802.1x + DEPENDS:=+libubox +libubus +libuci +endef + +define Package/wired-802.1x/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wired-802.1x $(1)/usr/sbin/ + $(CP) ./files/* $(1) +endef + +$(eval $(call BuildPackage,wired-802.1x)) diff --git a/feeds/ucentral/wired-802.1x/files/etc/config/wired1x b/feeds/ucentral/wired-802.1x/files/etc/config/wired1x new file mode 100644 index 000000000..66d644a7b --- /dev/null +++ b/feeds/ucentral/wired-802.1x/files/etc/config/wired1x @@ -0,0 +1,3 @@ +config network + #option ports 'lan1 lan2 lan3' + #option network lan diff --git a/feeds/ucentral/wired-802.1x/files/etc/init.d/wired-802.1x b/feeds/ucentral/wired-802.1x/files/etc/init.d/wired-802.1x new file mode 100755 index 000000000..8afa4518d --- /dev/null +++ b/feeds/ucentral/wired-802.1x/files/etc/init.d/wired-802.1x @@ -0,0 +1,17 @@ +#!/bin/sh /etc/rc.common + +START=80 + +USE_PROCD=1 +PROG=/usr/sbin/wired-802.1x + +service_triggers() { + procd_add_reload_trigger wired1x +} + +start_service() { + procd_open_instance + procd_set_param command "$PROG" + procd_set_param respawn + procd_close_instance +} diff --git a/profiles/tplink_cpe210_v3.yml b/profiles/tplink_cpe210_v3.yml new file mode 100644 index 000000000..c9f03a614 --- /dev/null +++ b/profiles/tplink_cpe210_v3.yml @@ -0,0 +1,7 @@ +--- +profile: tplink_cpe210-v3 +target: ath79 +subtarget: generic +description: Build image for the TPLink CPE 210 v3 +include: + - ucentral-ap-light diff --git a/profiles/ucentral-ap-light.yml b/profiles/ucentral-ap-light.yml new file mode 100644 index 000000000..ad0e10fb5 --- /dev/null +++ b/profiles/ucentral-ap-light.yml @@ -0,0 +1,36 @@ +--- +description: Add the ucentral dependencies +feeds: + - name: ucentral + path: ../../feeds/ucentral + - name: tip + path: ../../feeds/tip + +packages: + - curl + - ip-bridge + - ucentral-client + - ucentral-jsonschema + - ucentral-schema + - ucentral-wifi + - ucentral-defaults + - ucentral-tools + - ucode + - usteer + - wpad-openssl +diffconfig: | + CONFIG_OPENSSL_ENGINE=y + CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y + CONFIG_OPENSSL_WITH_ASM=y + CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y + CONFIG_OPENSSL_WITH_CMS=y + CONFIG_OPENSSL_WITH_DEPRECATED=y + CONFIG_OPENSSL_WITH_ERROR_MESSAGES=y + CONFIG_OPENSSL_WITH_PSK=y + CONFIG_OPENSSL_WITH_SRP=y + CONFIG_OPENSSL_WITH_TLS13=y + # CONFIG_PACKAGE_wpad-basic-wolfssl is not set + CONFIG_IMAGEOPT=y + CONFIG_PREINITOPT=y + CONFIG_TARGET_PREINIT_SUPPRESS_STDERR=y + CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y diff --git a/profiles/ucentral-ap.yml b/profiles/ucentral-ap.yml index f82bb3ab1..e4f94396c 100644 --- a/profiles/ucentral-ap.yml +++ b/profiles/ucentral-ap.yml @@ -30,11 +30,13 @@ packages: - ucentral-defaults - ucentral-tools - ucode + - udhcpsnoop - uledd - usteer - udevmand - umdns - vxlan + - wired-802.1x - wpad-mesh-openssl diffconfig: | CONFIG_OPENSSL_ENGINE=y