diff --git a/include/kernel-6.6 b/include/kernel-6.6 index e6f3c97c6e..250365a50f 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .83 -LINUX_KERNEL_HASH-6.6.83 = 894bbbe63b7484a0bc576a1e11a8dbc090fbd476d6424431bdc8435e03c2c208 +LINUX_VERSION-6.6 = .84 +LINUX_KERNEL_HASH-6.6.84 = 7fd20721551a61db347c5ac6ca05818e24058682be4e4389dc51e88d4ac17ba7 diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile index 892c05467e..d2708b60cd 100644 --- a/package/devel/strace/Makefile +++ b/package/devel/strace/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace -PKG_VERSION:=6.12 +PKG_VERSION:=6.14 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION) -PKG_HASH:=c47da93be45b6055f4dc741d7f20efaf50ca10160a5b100c109b294fd9c0bdfe +PKG_HASH:=244f3b5c20a32854ca9b7ca7a3ee091dd3d4bd20933a171ecee8db486c77d3c9 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=LGPL-2.1-or-later diff --git a/package/libs/libtraceevent/Makefile b/package/libs/libtraceevent/Makefile index 54e8652192..7cb8bb6373 100644 --- a/package/libs/libtraceevent/Makefile +++ b/package/libs/libtraceevent/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtraceevent -PKG_VERSION:=1.8.2 +PKG_VERSION:=1.8.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/ -PKG_HASH:=919f0c024c7b5059eace52d854d4df00ae7e361a4033e1b4d6fe01d97064a1b9 +PKG_HASH:=dc456d4d2bf4b4cd4d0c737d3374a8093f9e5ca18c1d7fc2279a4bf41e613121 PKG_MAINTAINER:=Nick Hainke diff --git a/package/libs/libtracefs/Makefile b/package/libs/libtracefs/Makefile index 0496f5983e..b1a370df52 100644 --- a/package/libs/libtracefs/Makefile +++ b/package/libs/libtracefs/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtracefs -PKG_VERSION:=1.8.0 +PKG_VERSION:=1.8.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/ -PKG_HASH:=f92475d5c4cb509983697fb359ee615bef4f08ed8bdc9c690f6118ba68886de0 +PKG_HASH:=d295aa20d711c313a9e229dbd15ba14026f0c1a50d57ae8b0823cc561b23745f PKG_MAINTAINER:=Nick Hainke diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index cab6b702b9..12f4b9c880 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbedtls -PKG_VERSION:=3.6.2 -PKG_RELEASE:=2 +PKG_VERSION:=3.6.3 +PKG_RELEASE:=1 PKG_BUILD_FLAGS:=no-mips16 gc-sections no-lto PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL=https://github.com/Mbed-TLS/$(PKG_NAME)/releases/download/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=8b54fb9bcf4d5a7078028e0520acddefb7900b3e66fec7f7175bb5b7d85ccdca +PKG_HASH:=64cd73842cdc05e101172f7b437c65e7312e476206e1dbfd644433d11bc56327 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE diff --git a/package/libs/mbedtls/patches/101-remove-test.patch b/package/libs/mbedtls/patches/101-remove-test.patch index 5ac5e7c1e8..e584a8036c 100644 --- a/package/libs/mbedtls/patches/101-remove-test.patch +++ b/package/libs/mbedtls/patches/101-remove-test.patch @@ -1,6 +1,7 @@ --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt -@@ -1,13 +1,9 @@ +@@ -3,14 +3,10 @@ add_custom_target(${programs_target}) + add_subdirectory(aes) add_subdirectory(cipher) -if (NOT WIN32) diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index 3fbd0bf4f9..418f64360b 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lldpd -PKG_VERSION:=1.0.18 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.19 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/lldpd/lldpd/releases/download/$(PKG_VERSION)/ -PKG_HASH:=38cd319aa02ab61d9a2ad130e22f906795ccca9ac73a0a0d9dac19ca99a8a870 +PKG_HASH:=4de17fe5137b4d44a7bd57f8dfc80cffe2c8bb3691b4ae3012b5a6ea20d79ee0 PKG_MAINTAINER:=Stijn Tintel PKG_LICENSE:=ISC diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile index 1237c106a9..15136d2d2d 100644 --- a/package/network/utils/iw/Makefile +++ b/package/network/utils/iw/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iw PKG_VERSION:=6.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/iw diff --git a/package/network/utils/iw/patches/100-scan-Add-printing-of-HE-Operation-Element.patch b/package/network/utils/iw/patches/100-scan-Add-printing-of-HE-Operation-Element.patch new file mode 100644 index 0000000000..a251ceea37 --- /dev/null +++ b/package/network/utils/iw/patches/100-scan-Add-printing-of-HE-Operation-Element.patch @@ -0,0 +1,153 @@ +From 422419e06d55a7c852d1f6f054a094e285ebaa27 Mon Sep 17 00:00:00 2001 +From: Christopher A Wills +Date: Tue, 30 Jul 2024 16:27:36 -0700 +Subject: [PATCH] scan: Add printing of HE Operation Element + +Signed-off-by: Christopher A Wills +--- + iw.h | 1 + + scan.c | 8 +++++ + util.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 112 insertions(+) + +--- a/iw.h ++++ b/iw.h +@@ -222,6 +222,7 @@ void print_ampdu_spacing(__u8 spacing); + void print_ht_capability(__u16 cap); + void print_vht_info(__u32 capa, const __u8 *mcs); + void print_he_capability(const uint8_t *ie, int len); ++void print_he_operation(const uint8_t *ie, int len); + void print_he_info(struct nlattr *nl_iftype); + void print_eht_info(struct nlattr *nl_iftype, int band); + void print_s1g_capability(const uint8_t *caps); +--- a/scan.c ++++ b/scan.c +@@ -2384,8 +2384,16 @@ static void print_he_capa(const uint8_t + print_he_capability(data, len); + } + ++static void print_he_oper(const uint8_t type, uint8_t len, const uint8_t *data, ++ const struct print_ies_data *ie_buffer) ++{ ++ printf("\n"); ++ print_he_operation(data, len); ++} ++ + static const struct ie_print ext_printers[] = { + [35] = { "HE capabilities", print_he_capa, 21, 54, BIT(PRINT_SCAN), }, ++ [36] = { "HE Operation", print_he_oper, 6, 15, BIT(PRINT_SCAN), }, + }; + + static void print_extension(unsigned char len, unsigned char *ie, +--- a/util.c ++++ b/util.c +@@ -1733,6 +1733,109 @@ void print_he_capability(const uint8_t * + __print_he_capa(mac_cap, phy_cap - 1, mcs_set, mcs_len, NULL, 0, false); + } + ++void print_he_operation(const uint8_t *ie, int len) ++{ ++ uint8_t oper_parameters[3] = {ie[0], ie[1], ie[2] }; ++ uint8_t bss_color = ie[3]; ++ uint16_t nss_mcs_set = *(uint16_t*)(&ie[4]); ++ uint8_t vht_oper_present = oper_parameters[1] & 0x40; ++ uint8_t co_hosted_bss_present = oper_parameters[1] & 0x80; ++ uint8_t uhb_operation_info_present = oper_parameters[2] & 0x02; ++ uint8_t offset = 6; ++ ++ printf("\t\tHE Operation Parameters: (0x%02x%02x%02x)\n", ++ oper_parameters[2], oper_parameters[1], oper_parameters[0]); ++ printf("\t\t\tDefault PE Duration: %hhu\n", oper_parameters[0] & 0x07); ++ if (oper_parameters[0] & 0x08) ++ printf("\t\t\tTWT Required\n"); ++ ++ printf("\t\t\tTXOP Duration RTS Threshold: %hu\n", ++ (*(uint16_t*)(oper_parameters)) >> 4 & 0x03ff); ++ if (oper_parameters[1] & 0x40) ++ printf("\t\t\tVHT Operation Information Present\n"); ++ ++ if (oper_parameters[1] & 0x80) ++ printf("\t\t\tCo-Hosted BSS\n"); ++ ++ if (oper_parameters[2] & 0x01) ++ printf("\t\t\tER SU Disable\n"); ++ ++ if (oper_parameters[2] & 0x02) ++ printf("\t\t\t6 GHz Operation Information Present\n"); ++ ++ printf("\t\tBSS Color: %hhu\n", bss_color & 0x3F); ++ if (bss_color & 0x40) ++ printf("\t\tPartial BSS Color\n"); ++ ++ if (bss_color & 0x80) ++ printf("\t\tBSS Color Disabled\n"); ++ ++ printf("\t\tBasic HE-MCS NSS Set: 0x%04x\n", nss_mcs_set); ++ for (int k = 0; k < 8; k++) { ++ __u16 mcs = nss_mcs_set; ++ ++ mcs >>= k * 2; ++ mcs &= 0x3; ++ printf("\t\t\t%d streams: ", k + 1); ++ if (mcs == 3) ++ printf("not supported\n"); ++ else ++ printf("MCS 0-%d\n", 7 + (mcs * 2)); ++ } ++ ++ if (vht_oper_present) { ++ if (len - offset < 3) { ++ printf("\t\tVHT Operation Info: Invalid\n"); ++ return; ++ } ++ ++ printf("\t\tVHT Operation Info: 0x%02x%02x%02x\n", ++ ie[offset + 2], ie[offset + 1], ie[offset + 0]); ++ offset += 3; ++ } ++ ++ if (co_hosted_bss_present) { ++ if (len - offset < 1) { ++ printf("\t\tMax Co-Hosted BSSID: Invalid\n"); ++ return; ++ } ++ ++ printf("\t\tMax Co-Hosted BSSID: %hhu\n", ie[offset]); ++ offset += 1; ++ } ++ ++ if (uhb_operation_info_present) { ++ if (len - offset < 5) { ++ printf("\t\t6 GHz Operation Info: Invalid\n"); ++ return; ++ } else { ++ const uint8_t control = ie[offset + 1]; ++ ++ printf("\t\t6 Ghz Operation Information: 0x"); ++ for (uint8_t i = 0; i < 5; i++) ++ printf("%02x", ie[offset + i]); ++ ++ printf("\n"); ++ printf("\t\t\tPrimary Channel: %hhu\n", ie[offset]); ++ printf("\t\t\tChannel Width: "); ++ switch (control & 0x3) { ++ case 0: printf("20 MHz\n"); break; ++ case 1: printf("40 MHz\n"); break; ++ case 2: printf("80 MHz\n"); break; ++ case 3: printf("80+80 or 160 MHz\n"); break; ++ } ++ ++ if (control & 0x4) ++ printf("\t\t\tDuplicate Beacon: True\n"); ++ ++ printf("\t\t\tRegulatory Info: %hhu\n", (control >> 3) & 0xf); ++ printf("\t\t\tCenter Frequency Segment 0: %hhu\n", ie[offset+2]); ++ printf("\t\t\tCenter Frequency Segment 1: %hhu\n", ie[offset+3]); ++ printf("\t\t\tMinimum Rate: %hhu\n", ie[offset+4]); ++ } ++ } ++} ++ + void iw_hexdump(const char *prefix, const __u8 *buf, size_t size) + { + size_t i; diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch index 9924ffa077..dc1cce99a2 100644 --- a/package/network/utils/iw/patches/200-reduce_size.patch +++ b/package/network/utils/iw/patches/200-reduce_size.patch @@ -212,7 +212,7 @@ if (len >= 4 && memcmp(data, wfa_oui, 3) == 0) { if (data[3] < ARRAY_SIZE(wfa_printers) && wfa_printers[data[3]].name && -@@ -2483,6 +2494,7 @@ static void print_capa_non_dmg(__u16 cap +@@ -2491,6 +2502,7 @@ static void print_capa_non_dmg(__u16 cap printf(" ESS"); if (capa & WLAN_CAPABILITY_IBSS) printf(" IBSS"); @@ -220,7 +220,7 @@ if (capa & WLAN_CAPABILITY_CF_POLLABLE) printf(" CfPollable"); if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST) -@@ -2511,6 +2523,7 @@ static void print_capa_non_dmg(__u16 cap +@@ -2519,6 +2531,7 @@ static void print_capa_non_dmg(__u16 cap printf(" DelayedBACK"); if (capa & WLAN_CAPABILITY_IMM_BACK) printf(" ImmediateBACK"); @@ -228,7 +228,7 @@ } static int print_bss_handler(struct nl_msg *msg, void *arg) -@@ -2601,8 +2614,10 @@ static int print_bss_handler(struct nl_m +@@ -2609,8 +2622,10 @@ static int print_bss_handler(struct nl_m else printf("\tfreq: %d\n", freq); @@ -239,7 +239,7 @@ } if (bss[NL80211_BSS_BEACON_INTERVAL]) printf("\tbeacon interval: %d TUs\n", -@@ -2796,6 +2811,7 @@ static int handle_stop_sched_scan(struct +@@ -2804,6 +2819,7 @@ static int handle_stop_sched_scan(struct return 0; } @@ -247,7 +247,7 @@ COMMAND(scan, sched_start, SCHED_SCAN_OPTIONS, NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan, -@@ -2806,3 +2822,4 @@ COMMAND(scan, sched_start, +@@ -2814,3 +2830,4 @@ COMMAND(scan, sched_start, COMMAND(scan, sched_stop, "", NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan, "Stop an ongoing scheduled scan."); diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile index dfee0c19a1..a342c7471f 100644 --- a/package/utils/ucode/Makefile +++ b/package/utils/ucode/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/jow-/ucode.git -PKG_SOURCE_DATE:=2025-03-17 -PKG_SOURCE_VERSION:=c4d7f9164c4a692f96a58cb05a118a1410ebcf62 -PKG_MIRROR_HASH:=4bdce7c5349d221066b44e3d37fcffd59a3dd4a6bce656ef52184bd90a48bde6 +PKG_SOURCE_DATE:=2025-03-24 +PKG_SOURCE_VERSION:=b27d70c977ab4381f4094a0b1208e2a13fc5123f +PKG_MIRROR_HASH:=30a19d71a55ac320c92879beaed18a2f8da7b3b523eb7effa34ad3c4f9e1e50d PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC diff --git a/scripts/tplink-mkimage-2022.py b/scripts/tplink-mkimage-2022.py index 4db69409c9..07ab5a0cb4 100755 --- a/scripts/tplink-mkimage-2022.py +++ b/scripts/tplink-mkimage-2022.py @@ -19,8 +19,10 @@ import argparse import hashlib import os import pprint +import re import struct + def decode_header(datafile): '''Read the tplink2022 image header anbd decode it into a dictionary''' header = {} @@ -151,7 +153,7 @@ def create_image(output_image, root, support): support_list = {} support_list['name'] = 'support-list' - support_list['data'] = support.replace(" ", "\r\n").encode('utf-8') + support_list['data'] = re.sub("\\\\r\\\\n ?", "\r\n", support).encode("utf-8") support_list['offset'] = header['rootfs_size'] support_list['size'] = len(support_list['data']) header['items'].append(support_list) diff --git a/target/linux/bcm27xx/patches-6.6/950-0025-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch b/target/linux/bcm27xx/patches-6.6/950-0025-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch index 4c3ff50b8c..a0981c9c0d 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0025-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0025-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch @@ -89,7 +89,7 @@ Signed-off-by: Maxime Ripard commit->event = kzalloc(sizeof(*commit->event), --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -7298,6 +7298,19 @@ int intel_atomic_commit(struct drm_devic +@@ -7297,6 +7297,19 @@ int intel_atomic_commit(struct drm_devic state->base.legacy_cursor_update = false; } diff --git a/target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index afdb5aca08..9b6617361f 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -243,6 +243,9 @@ +@@ -244,6 +244,9 @@ #define USB_VENDOR_ID_BAANTO 0x2453 #define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100 @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1405,6 +1408,9 @@ +@@ -1408,6 +1411,9 @@ #define USB_VENDOR_ID_XIAOMI 0x2717 #define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014 diff --git a/target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch b/target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch index c4a5537a8c..2fd1278488 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch @@ -29,7 +29,7 @@ Signed-off-by: Nick Hollinghurst }; DRM_ENUM_NAME_FN(drm_get_tv_mode_name, drm_tv_mode_enum_list) -@@ -1736,6 +1737,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su +@@ -1740,6 +1741,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su * TV Mode is CCIR System B (aka 625-lines) together with * the SECAM Color Encoding. * diff --git a/target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch b/target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch index 6d745f6e9d..9dcdb585b1 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch @@ -22,7 +22,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c -@@ -2698,10 +2698,15 @@ int drm_connector_set_orientation_from_p +@@ -2702,10 +2702,15 @@ int drm_connector_set_orientation_from_p { enum drm_panel_orientation orientation; diff --git a/target/linux/generic/backport-6.6/896-01-v6.9-net-dsa-mv88e6xxx-rename-mv88e6xxx_g2_scratch_gpio_s.patch b/target/linux/generic/backport-6.6/896-01-v6.9-net-dsa-mv88e6xxx-rename-mv88e6xxx_g2_scratch_gpio_s.patch index 48dd6ffb67..2c3e99d8e0 100644 --- a/target/linux/generic/backport-6.6/896-01-v6.9-net-dsa-mv88e6xxx-rename-mv88e6xxx_g2_scratch_gpio_s.patch +++ b/target/linux/generic/backport-6.6/896-01-v6.9-net-dsa-mv88e6xxx-rename-mv88e6xxx_g2_scratch_gpio_s.patch @@ -19,7 +19,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3669,7 +3669,7 @@ static int mv88e6xxx_mdio_register(struc +@@ -3699,7 +3699,7 @@ static int mv88e6xxx_mdio_register(struc if (external) { mv88e6xxx_reg_lock(chip); diff --git a/target/linux/generic/backport-6.6/896-02-v6.9-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch b/target/linux/generic/backport-6.6/896-02-v6.9-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch index e5931573f7..875acd3ba1 100644 --- a/target/linux/generic/backport-6.6/896-02-v6.9-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch +++ b/target/linux/generic/backport-6.6/896-02-v6.9-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch @@ -27,7 +27,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3669,7 +3669,10 @@ static int mv88e6xxx_mdio_register(struc +@@ -3699,7 +3699,10 @@ static int mv88e6xxx_mdio_register(struc if (external) { mv88e6xxx_reg_lock(chip); diff --git a/target/linux/generic/backport-6.6/901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch b/target/linux/generic/backport-6.6/901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch index 711246da61..1674359d26 100644 --- a/target/linux/generic/backport-6.6/901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch +++ b/target/linux/generic/backport-6.6/901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch @@ -127,7 +127,7 @@ Signed-off-by: Linus Walleij #include #include #include -@@ -3235,14 +3236,43 @@ static int mv88e6xxx_setup_upstream_port +@@ -3265,14 +3266,43 @@ static int mv88e6xxx_setup_upstream_port static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) { struct device_node *phy_handle = NULL; @@ -173,7 +173,7 @@ Signed-off-by: Linus Walleij err = mv88e6xxx_port_setup_mac(chip, port, LINK_UNFORCED, SPEED_UNFORCED, DUPLEX_UNFORCED, -@@ -4461,6 +4491,7 @@ static const struct mv88e6xxx_ops mv88e6 +@@ -4491,6 +4521,7 @@ static const struct mv88e6xxx_ops mv88e6 .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, .port_get_cmode = mv88e6352_port_get_cmode, @@ -181,7 +181,7 @@ Signed-off-by: Linus Walleij .port_setup_message_port = mv88e6xxx_setup_message_port, .stats_snapshot = mv88e6320_g1_stats_snapshot, .stats_set_histogram = mv88e6095_g1_stats_set_histogram, -@@ -4563,6 +4594,7 @@ static const struct mv88e6xxx_ops mv88e6 +@@ -4593,6 +4624,7 @@ static const struct mv88e6xxx_ops mv88e6 .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, .port_get_cmode = mv88e6352_port_get_cmode, @@ -189,7 +189,7 @@ Signed-off-by: Linus Walleij .port_setup_message_port = mv88e6xxx_setup_message_port, .stats_snapshot = mv88e6320_g1_stats_snapshot, .stats_set_histogram = mv88e6095_g1_stats_set_histogram, -@@ -4838,6 +4870,7 @@ static const struct mv88e6xxx_ops mv88e6 +@@ -4868,6 +4900,7 @@ static const struct mv88e6xxx_ops mv88e6 .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, .port_get_cmode = mv88e6352_port_get_cmode, @@ -197,7 +197,7 @@ Signed-off-by: Linus Walleij .port_setup_message_port = mv88e6xxx_setup_message_port, .stats_snapshot = mv88e6320_g1_stats_snapshot, .stats_set_histogram = mv88e6095_g1_stats_set_histogram, -@@ -5260,6 +5293,7 @@ static const struct mv88e6xxx_ops mv88e6 +@@ -5290,6 +5323,7 @@ static const struct mv88e6xxx_ops mv88e6 .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, .port_get_cmode = mv88e6352_port_get_cmode, diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 index 851e3047a3..1b1367d8b0 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -4361,10 +4361,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NVMEM_BCM_OCOTP is not set # CONFIG_NVMEM_BLOCK is not set # CONFIG_NVMEM_IMX_OCOTP is not set +# CONFIG_NVMEM_LAYOUT_ASCII_ENV is not set # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set # CONFIG_NVMEM_LAYOUT_SL28_VPD is not set # CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set -# CONFIG_NVMEM_LAYOUT_ASCII_ENV is not set # CONFIG_NVMEM_REBOOT_MODE is not set # CONFIG_NVMEM_RMEM is not set # CONFIG_NVMEM_SYSFS is not set diff --git a/target/linux/generic/hack-6.6/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-6.6/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index bf93a87e02..ab594a471e 100644 --- a/target/linux/generic/hack-6.6/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-6.6/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3405,6 +3405,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -3435,6 +3435,9 @@ static int mv88e6xxx_setup_port(struct m else reg = 1 << port; diff --git a/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch b/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch index 3ca98788ab..4d2ea46212 100644 --- a/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4485,6 +4485,7 @@ int wake_up_state(struct task_struct *p, +@@ -4486,6 +4486,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch index 373b3e87ba..1ae6f89399 100644 --- a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch +++ b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -8470,7 +8470,7 @@ static int nft_register_flowtable_net_ho +@@ -8469,7 +8469,7 @@ static int nft_register_flowtable_net_ho err = flowtable->data.type->setup(&flowtable->data, hook->ops.dev, FLOW_BLOCK_BIND); diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 18e675a89a..9b665e8cbc 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -228,6 +228,30 @@ $(call Device/adtran_smartrg) endef TARGET_DEVICES += smartrg_sdg-8734 +define Device/arcadyan_mozart + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := Mozart + DEVICE_DTS := mt7988a-arcadyan-mozart + DEVICE_DTS_DIR := ../dts + DEVICE_DTC_FLAGS := --pad 4096 + DEVICE_DTS_LOADADDR := 0x45f00000 + DEVICE_PACKAGES := kmod-hwmon-pwmfan e2fsprogs f2fsck mkf2fs kmod-mt7996-firmware + KERNEL_LOADADDR := 0x46000000 + KERNEL := kernel-bin | gzip + KERNEL_INITRAMFS := kernel-bin | lzma | \ + fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k + KERNEL_INITRAMFS_SUFFIX := .itb + IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m + IMAGES := sysupgrade.itb + IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata + ARTIFACTS := emmc-preloader.bin emmc-bl31-uboot.fip emmc-gpt.bin + ARTIFACT/emmc-gpt.bin := mt798x-gpt emmc + ARTIFACT/emmc-preloader.bin := mt7988-bl2 emmc-comb + ARTIFACT/emmc-bl31-uboot.fip := mt7988-bl31-uboot arcadyan_mozart + SUPPORTED_DEVICES += arcadyan,mozart +endef +TARGET_DEVICES += arcadyan_mozart + define Device/asus_rt-ax59u DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AX59U @@ -254,30 +278,6 @@ define Device/asus_tuf-ax4200 endef TARGET_DEVICES += asus_tuf-ax4200 -define Device/arcadyan_mozart - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := Mozart - DEVICE_DTS := mt7988a-arcadyan-mozart - DEVICE_DTS_DIR := ../dts - DEVICE_DTC_FLAGS := --pad 4096 - DEVICE_DTS_LOADADDR := 0x45f00000 - DEVICE_PACKAGES := kmod-hwmon-pwmfan e2fsprogs f2fsck mkf2fs kmod-mt7996-firmware - KERNEL_LOADADDR := 0x46000000 - KERNEL := kernel-bin | gzip - KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k - KERNEL_INITRAMFS_SUFFIX := .itb - IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m - IMAGES := sysupgrade.itb - IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | pad-rootfs | append-metadata - ARTIFACTS := emmc-preloader.bin emmc-bl31-uboot.fip emmc-gpt.bin - ARTIFACT/emmc-gpt.bin := mt798x-gpt emmc - ARTIFACT/emmc-preloader.bin := mt7988-bl2 emmc-comb - ARTIFACT/emmc-bl31-uboot.fip := mt7988-bl31-uboot arcadyan_mozart - SUPPORTED_DEVICES += arcadyan,mozart -endef -TARGET_DEVICES += arcadyan_mozart - define Device/asus_tuf-ax6000 DEVICE_VENDOR := ASUS DEVICE_MODEL := TUF-AX6000 @@ -357,8 +357,9 @@ define Device/bananapi_bpi-r3-mini DEVICE_DTS_CONFIG := config-mt7986a-bananapi-bpi-r3-mini DEVICE_DTS_DIR := ../dts DEVICE_DTS_LOADADDR := 0x43f00000 - DEVICE_PACKAGES := kmod-hwmon-pwmfan kmod-mt7915e kmod-mt7986-firmware kmod-phy-airoha-en8811h \ - kmod-usb3 f2fsck mkf2fs mt7986-wo-firmware automount + DEVICE_PACKAGES := kmod-eeprom-at24 kmod-hwmon-pwmfan kmod-mt7915e kmod-mt7986-firmware \ + kmod-phy-airoha-en8811h kmod-usb3 e2fsprogs f2fsck mkf2fs mt7986-wo-firmware \ + automount KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts index bff781f683..e7505bb93a 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts @@ -169,6 +169,26 @@ partitions { compatible = "qcom,smem-part"; + #address-cells = <1>; + #size-cells = <1>; + + partition-0-devinfo { + label = "devinfo"; + read-only; + #address-cells = <1>; + #size-cells = <1>; + + nvmem-layout { + compatible = "ascii-eq-delim-env"; + #address-cells = <1>; + #size-cells = <1>; + + hw_mac_addr: hw_mac_addr { + compatible = "mac-base"; + #nvmem-cell-cells = <1>; + }; + }; + }; }; }; }; @@ -266,30 +286,40 @@ status = "okay"; phy-handle = <&qca8075_0>; label = "lan1"; + nvmem-cells = <&hw_mac_addr 1>; + nvmem-cell-names = "mac-address"; }; &dp2 { status = "okay"; phy-handle = <&qca8075_1>; label = "lan2"; + nvmem-cells = <&hw_mac_addr 1>; + nvmem-cell-names = "mac-address"; }; &dp3 { status = "okay"; phy-handle = <&qca8075_2>; label = "lan3"; + nvmem-cells = <&hw_mac_addr 1>; + nvmem-cell-names = "mac-address"; }; &dp4 { status = "okay"; phy-handle = <&qca8075_3>; label = "lan4"; + nvmem-cells = <&hw_mac_addr 1>; + nvmem-cell-names = "mac-address"; }; &dp5 { status = "okay"; phy-handle = <&qca8075_4>; label = "wan"; + nvmem-cells = <&hw_mac_addr 0>; + nvmem-cell-names = "mac-address"; }; &wifi { diff --git a/target/linux/qualcommax/image/ipq60xx.mk b/target/linux/qualcommax/image/ipq60xx.mk index c8624a38a7..c3bbecfeb9 100644 --- a/target/linux/qualcommax/image/ipq60xx.mk +++ b/target/linux/qualcommax/image/ipq60xx.mk @@ -1,3 +1,5 @@ +DEVICE_VARS += TPLINK_SUPPORT_STRING + define Device/8devices_mango-dvk $(call Device/FitImageLzma) DEVICE_VENDOR := 8devices @@ -105,9 +107,9 @@ define Device/tplink_eap610-outdoor DEVICE_PACKAGES := ipq-wifi-tplink_eap610-outdoor IMAGES += web-ui-factory.bin IMAGE/web-ui-factory.bin := append-ubi | tplink-image-2022 - TPLINK_SUPPORT_STRING := SupportList: \ - EAP610-Outdoor(TP-Link|UN|AX1800-D):1.0 \ - EAP610-Outdoor(TP-Link|JP|AX1800-D):1.0 \ + TPLINK_SUPPORT_STRING := SupportList:\r\n \ + EAP610-Outdoor(TP-Link|UN|AX1800-D):1.0\r\n \ + EAP610-Outdoor(TP-Link|JP|AX1800-D):1.0\r\n \ EAP610-Outdoor(TP-Link|CA|AX1800-D):1.0 endef TARGET_DEVICES += tplink_eap610-outdoor @@ -122,6 +124,8 @@ define Device/yuncore_fap650 DEVICE_DTS_CONFIG := config@cp03-c1 SOC := ipq6000 DEVICE_PACKAGES := ipq-wifi-yuncore_fap650 + IMAGES := factory.ubi factory.ubin sysupgrade.bin + IMAGE/factory.ubin := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += yuncore_fap650 diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk index ee313894c6..dba794f50f 100644 --- a/target/linux/qualcommax/image/ipq807x.mk +++ b/target/linux/qualcommax/image/ipq807x.mk @@ -1,4 +1,4 @@ -DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID +DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID TPLINK_SUPPORT_STRING define Build/asus-fake-ramdisk rm -rf $(KDIR)/tmp/fakerd @@ -28,7 +28,7 @@ define Build/wax6xx-netgear-tar mv $@ $@.tmp/nand-ipq807x-apps.img md5sum $@.tmp/nand-ipq807x-apps.img | cut -c 1-32 > $@.tmp/nand-ipq807x-apps.md5sum echo $(DEVICE_MODEL) > $@.tmp/metadata.txt - echo $(DEVICE_MODEL)"_V9.9.9.9" > $@.tmp/version + echo $(DEVICE_MODEL)"_V99.9.9.9" > $@.tmp/version tar -C $@.tmp/ -cf $@ . rm -rf $@.tmp endef @@ -108,6 +108,8 @@ define Device/cmcc_rm2-6 PAGESIZE := 2048 DEVICE_DTS_CONFIG := config@ac02 SOC := ipq8070 + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand DEVICE_PACKAGES := ipq-wifi-cmcc_rm2-6 kmod-hwmon-gpiofan endef TARGET_DEVICES += cmcc_rm2-6 @@ -122,6 +124,7 @@ define Device/compex_wpq873 DEVICE_DTS_CONFIG := config@hk09.wpq873 SOC := ipq8072 DEVICE_PACKAGES := ipq-wifi-compex_wpq873 + IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += compex_wpq873 @@ -148,6 +151,7 @@ define Device/edgecore_eap102 DEVICE_DTS_CONFIG := config@ac02 SOC := ipq8071 DEVICE_PACKAGES := ipq-wifi-edgecore_eap102 + IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += edgecore_eap102 @@ -312,6 +316,8 @@ define Device/netgear_wax620 BLOCKSIZE := 128k PAGESIZE := 2048 SOC := ipq8072 + IMAGES += ui-factory.tar + IMAGE/ui-factory.tar := append-ubi | qsdk-ipq-factory-nand | pad-to 4096 | wax6xx-netgear-tar DEVICE_PACKAGES := kmod-spi-gpio kmod-gpio-nxp-74hc164 ipq-wifi-netgear_wax620 endef TARGET_DEVICES += netgear_wax620 @@ -326,7 +332,7 @@ define Device/netgear_wax630 PAGESIZE := 2048 SOC := ipq8074 IMAGES += ui-factory.tar - IMAGE/ui-factory.tar := append-ubi | wax6xx-netgear-tar + IMAGE/ui-factory.tar := append-ubi | qsdk-ipq-factory-nand | pad-to 4096 | wax6xx-netgear-tar DEVICE_PACKAGES := kmod-spi-gpio ipq-wifi-netgear_wax630 endef TARGET_DEVICES += netgear_wax630 @@ -380,6 +386,7 @@ define Device/spectrum_sax1v1k DEVICE_MODEL := SAX1V1K DEVICE_DTS_CONFIG := config@rt5010w-d187-rev6 SOC := ipq8072 + IMAGES := sysupgrade.bin DEVICE_PACKAGES := ipq-wifi-spectrum_sax1v1k endef TARGET_DEVICES += spectrum_sax1v1k @@ -394,6 +401,8 @@ define Device/tplink_eap620hd-v1 PAGESIZE := 2048 SOC := ipq8072 DEVICE_PACKAGES := ipq-wifi-tplink_eap620hd-v1 + IMAGES += web-ui-factory.bin + IMAGE/web-ui-factory.bin := append-ubi | tplink-image-2022 TPLINK_SUPPORT_STRING := SupportList:\r\nEAP620 HD(TP-Link|UN|AX1800-D):1.0\r\n endef TARGET_DEVICES += tplink_eap620hd-v1 @@ -408,6 +417,8 @@ define Device/tplink_eap660hd-v1 PAGESIZE := 2048 SOC := ipq8072 DEVICE_PACKAGES := ipq-wifi-tplink_eap660hd-v1 + IMAGES += web-ui-factory.bin + IMAGE/web-ui-factory.bin := append-ubi | tplink-image-2022 TPLINK_SUPPORT_STRING := SupportList:\r\nEAP660 HD(TP-Link|UN|AX3600-D):1.0\r\n endef TARGET_DEVICES += tplink_eap660hd-v1 @@ -471,6 +482,8 @@ define Device/yuncore_ax880 DEVICE_DTS_CONFIG := config@hk09 SOC := ipq8072 DEVICE_PACKAGES := ipq-wifi-yuncore_ax880 + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += yuncore_ax880 @@ -484,6 +497,8 @@ define Device/zbtlink_zbt-z800ax DEVICE_DTS_CONFIG := config@hk09 SOC := ipq8072 DEVICE_PACKAGES := ipq-wifi-zbtlink_zbt-z800ax + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand endef TARGET_DEVICES += zbtlink_zbt-z800ax diff --git a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network index 4f3133c58e..ddcd92dcd1 100755 --- a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network +++ b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network @@ -54,11 +54,6 @@ ipq60xx_setup_macs() local label_mac="" case "$board" in - linksys,mr7350) - wan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) - lan_mac=$(macaddr_add "$wan_mac" 1) - label_mac=$wan_mac - ;; qihoo,360v6) wan_mac=$(mtd_get_mac_ascii factory lanMac) lan_mac=$(macaddr_add "$wan_mac" 1) diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount b/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount index d21c2889da..6a4ee3ca09 100755 --- a/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount +++ b/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount @@ -17,6 +17,10 @@ boot() { linksys,mx8500) mtd resetbc s_env || true ;; + netgear,wax620|\ + netgear,wax630) + fw_setenv boot_count 0 + ;; redmi,ax6-stock|\ xiaomi,ax3600-stock) # OTA handling should not be used. Reset it just in case. diff --git a/target/linux/ramips/dts/mt7620a_bolt_bl100.dts b/target/linux/ramips/dts/mt7620a_bolt_bl100.dts index d12933a81f..09f3123b4f 100644 --- a/target/linux/ramips/dts/mt7620a_bolt_bl100.dts +++ b/target/linux/ramips/dts/mt7620a_bolt_bl100.dts @@ -19,10 +19,6 @@ label-mac-device = ðernet; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ramips/dts/mt7621_confiabits_mt7621-v1.dts b/target/linux/ramips/dts/mt7621_confiabits_mt7621-v1.dts index 858747ecad..8758aeb368 100644 --- a/target/linux/ramips/dts/mt7621_confiabits_mt7621-v1.dts +++ b/target/linux/ramips/dts/mt7621_confiabits_mt7621-v1.dts @@ -17,10 +17,6 @@ led-upgrade = &led_power_green; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts b/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts index 2a556190d0..398a1a1180 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts +++ b/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts @@ -17,11 +17,6 @@ led-upgrade = &led_power; }; - - chosen { - bootargs = "console=ttyS0,57600"; - }; - gpio_export { compatible = "gpio-export"; #size-cells = <0>; diff --git a/target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts b/target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts index 6e6202f02b..f6c26a7bd9 100644 --- a/target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts +++ b/target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts @@ -8,10 +8,6 @@ compatible = "yuncore,cpe200", "mediatek,mt7628an-soc"; model = "Yuncore CPE200"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - aliases { label-mac = ðernet; led-boot = &led_power; diff --git a/target/linux/ramips/dts/mt7628an_yuncore_m300.dts b/target/linux/ramips/dts/mt7628an_yuncore_m300.dts index 8897c11d67..b8ea61492a 100644 --- a/target/linux/ramips/dts/mt7628an_yuncore_m300.dts +++ b/target/linux/ramips/dts/mt7628an_yuncore_m300.dts @@ -8,10 +8,6 @@ compatible = "yuncore,m300", "mediatek,mt7628an-soc"; model = "Yuncore M300"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network index adf7ce0eb6..bae10ca6f0 100644 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network @@ -248,7 +248,7 @@ ramips_setup_interfaces() tplink,archer-mr200) ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0" - ucidef_set_interface_wan "usb0" + ucidef_set_interface_wan "eth1" ;; tplink,ec220-g5-v2) ucidef_add_switch "switch0" diff --git a/tools/isl/Makefile b/tools/isl/Makefile index 1ce20fb49c..481c29634e 100644 --- a/tools/isl/Makefile +++ b/tools/isl/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=isl -PKG_VERSION:=0.26 +PKG_VERSION:=0.27 PKG_SOURCE_URL:=https://libisl.sourceforge.io/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=b10473024cbf17d7db85323121eff0e50f03de14342a03738b4d384b587ce212 +PKG_HASH:=7a1a3f04d57c7c72fee5a6148cd3b02b05db6a6dd9a58def7bdc00972a6301c3 HOST_BUILD_PARALLEL:=1