Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
kiddin9 committed Mar 16, 2024
1 parent 302af72 commit 63f6ba0
Show file tree
Hide file tree
Showing 24 changed files with 4,335 additions and 1,146 deletions.
1 change: 0 additions & 1 deletion .github/workflows/Openwrt-AutoBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ jobs:
mkdir -p firmware/${{matrix.target}}
cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
cd openwrt/bin/targets/*/*/
mv -f profiles.json profiles.json.b || true
cp $GITHUB_WORKSPACE/openwrt/.config ${{matrix.target}}.config || true
cp $GITHUB_WORKSPACE/openwrt/build_dir/target-*/linux-*/linux-*/.config ${{matrix.target}}_kernel.config || true
cd -
Expand Down
7 changes: 0 additions & 7 deletions devices/common/.config
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,11 @@ CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y
CONFIG_KERNEL_EXT4_FS_SECURITY=y
CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y

CONFIG_PACKAGE_kmod-drm-nouveau=n
CONFIG_PACKAGE_kmod-rtl8821cu=n
CONFIG_PACKAGE_kmod-rtl88x2bu=n

CONFIG_PACKAGE_kmod-rtl8189es=n

CONFIG_PACKAGE_kmod-sprd_pcie=n

CONFIG_PACKAGE_kmod-pcie_mhi=n

CONFIG_PACKAGE_kmod-mii=n

CONFIG_IMAGEOPT=y
CONFIG_VERSIONOPT=y

Expand Down
3 changes: 2 additions & 1 deletion devices/common/patches/LINUX_VERSION.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
include $(INCLUDE_DIR)/depends.mk
include $(INCLUDE_DIR)/subdir.mk
include target/Makefile
@@ -131,6 +132,9 @@ world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-
@@ -131,6 +132,10 @@ world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-
$(_SINGLE)$(SUBMAKE) -r package/index
$(_SINGLE)$(SUBMAKE) -r json_overview_image_info
$(_SINGLE)$(SUBMAKE) -r checksum
+ cp -f $(BIN_DIR)/packages/Packages.manifest $(BIN_DIR)/
+ rm -rf $(BIN_DIR)/$(LINUX_VERSION)
+ mv -f $(BIN_DIR)/packages $(BIN_DIR)/$(LINUX_VERSION) 2>/dev/null
+ mv -f $(BIN_DIR)/profiles.json $(BIN_DIR)/profiles.json.b 2>/dev/null
ifneq ($(CONFIG_CCACHE),)
$(STAGING_DIR_HOST)/bin/ccache -s
endif
6 changes: 5 additions & 1 deletion devices/mediatek_filogic/.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_tplink_tl-xdr6086=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_tplink_tl-xdr6088=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_glinet_gl-mt3000=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_h3c_magic-nx30-pro=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_mi-router-wr30u-112m-nmbm=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_mi-router-wr30u=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_redmi-router-ax6000=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_qihoo_360t7=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_mi-router-ax3000t=y
Expand All @@ -28,5 +28,9 @@ CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_netcore_n60=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_cmcc_a10=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_konka_komi-a31=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_imou_lc-hx3001=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_bananapi_bpi-r3-mini=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_bananapi_bpi-r4=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_glinet_gl-x3000=y
CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_glinet_gl-xe3000=y
CONFIG_PACKAGE_luci-ssl=y # uhttpd服务

13 changes: 13 additions & 0 deletions devices/mediatek_filogic/diy.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
#!/bin/bash

shopt -s extglob

git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1

sed -i "s/mi-router-wr30u-stock/mi-router-wr30u/" package/boot/uboot-envtools/files/mediatek_filogic
sed -i "s/mi-router-wr30u-stock/mi-router-wr30u/" target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
sed -i "s/mi-router-wr30u-stock/mi-router-wr30u/" target/linux/mediatek/filogic/base-files/etc/board.d/02_network
sed -i "s/mi-router-wr30u-stock/mi-router-wr30u/" target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh

rm -rf package/feeds/kiddin9/quectel_Gobinet devices/common/patches/kernel_version.patch devices/common/patches/rootfstargz.patch target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}

curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch

rm -rf package/feeds/packages/libpfring
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/dts-v1/;
#include "mt7981b-xiaomi-mi-router-wr30u.dtsi"

/ {
model = "Xiaomi Mi Router WR30U";
compatible = "xiaomi,mi-router-wr30u", "mediatek,mt7981";
};

&spi_nand {
mediatek,nmbm;
mediatek,bmt-max-ratio = <1>;
mediatek,bmt-max-reserved-blocks = <64>;
};

&partitions {
partition@600000 {
label = "ubi";
reg = <0x600000 0x7000000>;
};
};
2 changes: 1 addition & 1 deletion devices/mediatek_filogic/patches/01-360t7.patch
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
UBINIZE_OPTS := -E 5
BLOCKSIZE := 128k
PAGESIZE := 2048
+ IMAGE_SIZE := 36864k
+ IMAGE_SIZE := 112640k
KERNEL_IN_UBI := 1
- UBOOTENV_IN_UBI := 1
- IMAGES := sysupgrade.itb
Expand Down
15 changes: 7 additions & 8 deletions devices/mediatek_filogic/patches/02-ax6000.patch
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,14 @@ index 0000000000000..759baae3aeb18

--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -95,6 +95,8 @@ platform_do_upgrade() {
@@ -134,6 +134,7 @@ platform_do_upgrade() {
tplink,tl-xdr4288|\
tplink,tl-xdr6086|\
tplink,tl-xdr6088|\
xiaomi,mi-router-wr30u-112m-nmbm|\
xiaomi,mi-router-wr30u-ubootmod|\
+ xiaomi,mi-router-ax3000t|\
+ xiaomi,redmi-router-ax6000|\
xiaomi,redmi-router-ax6000-ubootmod)
+ xiaomi,redmi-router-ax6000|\
xiaomi,mi-router-ax3000t-ubootmod|\
xiaomi,mi-router-wr30u-ubootmod)
CI_KERNPART="fit"
nand_do_upgrade "$1"

--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
Expand All @@ -90,7 +89,7 @@ index 0000000000000..759baae3aeb18
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -56,6 +56,7 @@ mediatek_setup_interfaces()
xiaomi,mi-router-wr30u-stock|\
xiaomi,mi-router-wr30u|\
xiaomi,mi-router-wr30u-ubootmod|\
xiaomi,redmi-router-ax6000-stock|\
+ xiaomi,redmi-router-ax6000|\
Expand Down
Loading

0 comments on commit 63f6ba0

Please sign in to comment.