diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index c2f5b95dd6..b5c36bcfa5 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -44,3 +44,31 @@ define Device/tplink_vr200v
   SUPPORTED_DEVICES += VR200v
 endef
 TARGET_DEVICES += tplink_vr200v
+define Device/tplink_tdw8970_16
+  $(Device/dsa-migration)
+  $(Device/lantiqTpLink)
+  IMAGE_SIZE := 15808k
+  DEVICE_TITLE := TP-LINK TD-W8970 16M Flash
+  DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_MODEL := TD-W8970v1-16m
+  DEVICE_VARIANT := v1
+  TPLINK_FLASHLAYOUT := 16Mltq-8Mflsh
+  TPLINK_HWID := 0x89700001
+  TPLINK_HWREV := 1
+
+endef
+TARGET_DEVICES +=tplink_tdw8970_16
+define Device/tplink_tdw8980_16
+  $(Device/dsa-migration)
+  $(Device/lantiqTpLink)
+  IMAGE_SIZE := 15808k
+  DEVICE_TITLE := TP-LINK TD-W8980 16M Flash
+  DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_MODEL := TD-W8980v1-16m
+  DEVICE_VARIANT := v1
+  TPLINK_FLASHLAYOUT := 16Mltq-8Mflsh
+  TPLINK_HWID := 0x89800001
+  TPLINK_HWREV := 14
+
+endef
+TARGET_DEVICES +=tplink_tdw8980_16
\ No newline at end of file
diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
index 6c35c7a4de..f1274002aa 100644
--- a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
@@ -43,6 +43,10 @@ lantiq_setup_interfaces()
    avm,fritz7490-micron|\
    buffalo,wbmr-300hpd|\
    tplink,vr200|\
+   tplink,tdw8970_16|\
+   tplink,tdw8980_16|\
+   tplink,tdw8970|\
+   tplink,tdw8980|\
    tplink,vr200v)
        ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
        ;;
@@ -136,6 +140,13 @@ lantiq_setup_macs()
        lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
        wan_mac="$lan_mac"
        ;;
+   tplink,tdw8970_16|\
+   tplink,tdw8980_16|\
+   tplink,tdw8970|\
+   tplink,tdw8980|\
+       wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0xf100)" 1)
+       ;;
+
    tplink,vr200|\
    tplink,vr200v)
        wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 0xf100)" 1)
diff --git a/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
index 936181c693..abed8fb69a 100644
--- a/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
+++ b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
@@ -28,7 +28,13 @@ case "$FIRMWARE" in
                caldata_extract_ubi "caldata" 0x1000 0x1000
                ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary_ubi caldata 0x110c) 2) 0x10c
                ;;
-           *)
+           tplink,tdw8970_16|\
+           tplink,tdw8980_16|\
+           tplink,tdw8970|\
+           tplink,tdw8980)
+               ath9k_eeprom_extract "boardconfig" 135168 0
+               ;;
+           *)
                caldata_die "board $board is not supported yet"
                ;;
        esac
diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 62222b6daf..17b9b21d6c 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -10,10 +10,9 @@ PKG_NAME:=firmware-utils
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
+PKG_SOURCE_URL=https://github.com/Notupus/firmware-utils.git
 PKG_SOURCE_DATE:=2024-10-20
-PKG_SOURCE_VERSION:=4b7638925d3eac03e614e40bc30cb49f5877c46d
-PKG_MIRROR_HASH:=ea0e30f2b20211e4153704019ebb3f8789269893a4af6d853a85fae7c091802c
+PKG_SOURCE_VERSION:=5835a3f7abe55fe0fedf37f030a973eb4a186fd2

 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk