Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
kiddin9 committed Jan 28, 2025
1 parent d2aa9e8 commit 34e4d5a
Show file tree
Hide file tree
Showing 12 changed files with 317 additions and 4,161 deletions.
8 changes: 4 additions & 4 deletions devices/armsr_armv8/patches/rootfs.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/target/linux/armsr/image/Makefile
+++ b/target/linux/armsr/image/Makefile
@@ -81,10 +81,8 @@ define Device/efi-default
IMAGE/combined.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata
IMAGE/combined.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata
IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
- IMAGES-y := rootfs.img.gz
IMAGES-y += combined.img.gz
IMAGES-y += combined-efi.img.gz
else
- IMAGES-y := rootfs.img
IMAGES-y += combined.img
IMAGES-y += combined-efi.img
endif
ifeq ($(CONFIG_VMDK_IMAGES),y)
@@ -116,4 +114,24 @@ define Device/generic
Expand Down
17 changes: 3 additions & 14 deletions devices/ath79_nand/.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,9 @@
CONFIG_TARGET_ath79=y
CONFIG_TARGET_ath79_nand=y
CONFIG_TARGET_MULTI_PROFILE=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-ar300m-nand=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-ar750s-nor-nand=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-e750=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-xe300=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_r6100=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr3700-v4=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300-v2=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300sw=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300tn=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4500-v3=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_zte_mf286=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_zte_mf281=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_domywifi_dw33d=y
CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_meraki_mr18=n





Expand Down
2 changes: 2 additions & 0 deletions devices/common/.config
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ CONFIG_PACKAGE_kmod-pcie_mhi=n

CONFIG_PACKAGE_kmod-rtl8189es=n

CONFIG_PACKAGE_kmod-aic8800=n

CONFIG_IMAGEOPT=y
CONFIG_VERSIONOPT=y

Expand Down
2 changes: 1 addition & 1 deletion devices/common/diy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ wget -N https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/go
#sed -i "/call Build\/check-size,\$\$(KERNEL_SIZE)/d" include/image.mk

git_clone_path master https://github.com/coolsnowwolf/lede mv target/linux/generic/hack-6.6
rm -rf target/linux/generic/hack-6.6/929-Revert-genetlink*
rm -rf target/linux/generic/hack-6.6/929-Revert-genetlink* target/linux/generic/hack-6.6/767-net-phy-realtek-add-led*
wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch -P target/linux/generic/pending-6.6/

wget -N https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/16414.patch -P devices/common/patches/
Expand Down
2 changes: 1 addition & 1 deletion devices/common/patches/imagebuilder.patch
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
+ $(shell echo "`grep kwrt_kiddin9 $(TOPDIR)/repositories.conf | sed -e 's/kiddin9/small_flash/g'`" >>$(TOPDIR)/repositories.conf)
+ endif
+ ifneq ($(findstring /data/bcache/,$(BIN_DIR)),)
+ BUILD_PACKAGES += -luci-app-homeproxy -luci-app-istorex -luci-theme-argon -htop -bash -openssh-sftp-server -luci-ssl-nginx luci-ssl
+ BUILD_PACKAGES += -luci-app-homeproxy -luci-app-istorex -luci-theme-argon -htop -bash -openssh-sftp-server -luci-nginx luci-ssl
+ endif
+else
+ $(shell sed -i "/small_flash/d" $(TOPDIR)/repositories.conf)
Expand Down
16 changes: 0 additions & 16 deletions devices/common/patches/luci-base.patch
Original file line number Diff line number Diff line change
Expand Up @@ -158,22 +158,6 @@
</body>
</html>

--- a/package/feeds/luci/luci-base/htdocs/luci-static/resources/ui.js
+++ b/package/feeds/luci/luci-base/htdocs/luci-static/resources/ui.js
@@ -3129,12 +3129,6 @@ var UIMenu = baseclass.singleton(/** @lends LuCI.ui.menu.prototype */ {

for (var i = 0; root != null && i < path.length; i++)
root = L.isObject(root.children) ? root.children[path[i]] : null;
-
- if (root)
- subnode = Object.assign({}, subnode, {
- children: root.children,
- action: root.action
- });
}

children.push(subnode);

--- a/package/feeds/luci/luci-base/root/etc/init.d/ucitrack
+++ b/package/feeds/luci/luci-base/root/etc/init.d/ucitrack
@@ -8,7 +8,7 @@ register_init() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>

#include "mt7981.dtsi"

/ {
model = "Huasifei WH3000 eMMC version";
compatible = "huasifei,wh3000-emmc", "mediatek,mt7981";

aliases {
serial0 = &uart0;
led-boot = &wlan_led;
led-failsafe = &wlan_led;
led-upgrade = &wlan_led;
};

chosen {
bootargs = "root=PARTLABEL=rootfs rootwait rootfstype=squashfs,f2fs";
stdout-path = "serial0:115200n8";
};

memory@40000000 {
reg = <0 0x40000000 0 0x40000000>;
};

gpio-keys {
compatible = "gpio-keys";

button-mode {
label = "mode";
linux,code = <BTN_0>;
linux,input-type = <EV_SW>;
gpios = <&pio 0 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};

button-reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&pio 1 GPIO_ACTIVE_LOW>;
};
};

gpio-leds {
compatible = "gpio-leds";

wan_led: led-0 {
function = LED_FUNCTION_WAN;
color = <LED_COLOR_ID_RED>;
gpios = <&pio 11 GPIO_ACTIVE_LOW>;
};

wlan_led: led-1 {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_WHITE>;
gpios = <&pio 10 GPIO_ACTIVE_LOW>;
};
};

usb_vbus: regulator-usb {
compatible = "regulator-fixed";
regulator-name = "usb-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpios = <&pio 9 GPIO_ACTIVE_LOW>;
regulator-boot-on;
};
};

&eth {
pinctrl-names = "default";
pinctrl-0 = <&mdio_pins>;
status = "okay";

gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;
nvmem-cells = <&macaddr_factory_4 2>;
nvmem-cell-names = "mac-address";
phy-mode = "2500base-x";
phy-handle = <&phy1>;
};

gmac1: mac@1 {
compatible = "mediatek,eth-mac";
reg = <1>;
nvmem-cells = <&macaddr_factory_4 3>;
nvmem-cell-names = "mac-address";
phy-mode = "gmii";
phy-handle = <&int_gbe_phy>;
};
};

&mdio_bus {
phy1: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c45";
reg = <1>;
interrupts = <38 IRQ_TYPE_LEVEL_LOW>;
interrupt-parent = <&pio>;
reset-assert-us = <100000>;
reset-deassert-us = <100000>;
reset-gpios = <&pio 39 GPIO_ACTIVE_LOW>;
realtek,aldps-enable;
};
};

&mmc0 {
bus-width = <8>;
cap-mmc-highspeed;
max-frequency = <52000000>;
no-sd;
no-sdio;
non-removable;
pinctrl-names = "default", "state_uhs";
pinctrl-0 = <&mmc0_pins_default>;
pinctrl-1 = <&mmc0_pins_uhs>;
vmmc-supply = <&reg_3p3v>;
status = "okay";

card@0 {
compatible = "mmc-card";
reg = <0>;

block {
compatible = "block-device";

partitions {
block-partition-factory {
partname = "factory";

nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;

eeprom_factory_0: eeprom@0 {
reg = <0x0 0x1000>;
};

macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
};
};
};

&pio {
mmc0_pins_default: mmc0-pins-default {
mux {
function = "flash";
groups = "emmc_45";
};
};

mmc0_pins_uhs: mmc0-pins-uhs {
mux {
function = "flash";
groups = "emmc_45";
};
};
};

&uart0 {
status = "okay";
};

&watchdog {
status = "okay";
};

&wifi {
nvmem-cells = <&eeprom_factory_0>;
nvmem-cell-names = "eeprom";
status = "okay";

band@1 {
reg = <1>;
nvmem-cells = <&macaddr_factory_4 1>;
nvmem-cell-names = "mac-address";
};
};

&usb_phy {
status = "okay";
};

&xhci {
status = "okay";
vbus-supply = <&usb_vbus>;
};
85 changes: 85 additions & 0 deletions devices/mediatek_filogic/patches/35-wh3000-emmc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -57,7 +57,8 @@ acer,vero-w6m|\
glinet,gl-mt2500|\
glinet,gl-mt6000|\
glinet,gl-x3000|\
-glinet,gl-xe3000)
+glinet,gl-xe3000|\
+huasifei,wh3000-emmc)
local envdev=$(find_mmc_part "u-boot-env")
ubootenv_add_uci_config "$envdev" "0x0" "0x80000"
;;

--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -49,6 +49,10 @@ glinet,gl-xe3000)
ucidef_set_led_netdev "wlan2g" "WLAN2G" "green:wifi2g" "phy0-ap0"
ucidef_set_led_netdev "wlan5g" "WLAN5G" "green:wifi5g" "phy1-ap0"
;;
+huasifei,wh3000-emmc)
+ ucidef_set_led_netdev "wan" "WAN" "red:wan" "eth1"
+ ucidef_set_led_netdev "wlan" "WLAN" "white:wlan" "phy1-ap0"
+ ;;
ikuai,q3000)
ucidef_set_led_default "green" "GREEN" "q3000:green" "1"
ucidef_set_led_default "blue" "BLUE" "q3000:blue" "0"

--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -70,7 +70,8 @@ mediatek_setup_interfaces()
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "sfp1 wan"
;;
bananapi,bpi-r3-mini|\
- edgecore,eap111)
+ edgecore,eap111|\
+ huasifei,wh3000-emmc)
ucidef_set_interfaces_lan_wan eth0 eth1
;;
bananapi,bpi-r4)

--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -105,6 +105,7 @@ platform_do_upgrade() {
glinet,gl-mt6000|\
glinet,gl-x3000|\
glinet,gl-xe3000|\
+ huasifei,wh3000-emmc|\
smartrg,sdg-8612|\
smartrg,sdg-8614|\
smartrg,sdg-8622|\
@@ -229,6 +230,7 @@ platform_copy_config() {
glinet,gl-mt6000|\
glinet,gl-x3000|\
glinet,gl-xe3000|\
+ huasifei,wh3000-emmc|\
jdcloud,re-cp-03|\
nradio,c8-668gl|\
smartrg,sdg-8612|\

--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -954,6 +954,23 @@ define Device/h3c_magic-nx30-pro-nmbm
endef
TARGET_DEVICES += h3c_magic-nx30-pro-nmbm

+define Device/huasifei_wh3000-emmc
+ DEVICE_VENDOR := Huasifei
+ DEVICE_MODEL := WH3000 eMMC
+ DEVICE_ALT0_VENDOR := Fudy
+ DEVICE_ALT0_MODEL := MT3000
+ DEVICE_DTS := mt7981b-huasifei-wh3000-emmc
+ DEVICE_DTS_DIR := ../dts
+ DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware \
+ kmod-usb-net-cdc-mbim kmod-usb-net-qmi-wwan kmod-usb-serial-option \
+ kmod-usb3 automount f2fsck mkf2fs uqmi
+ KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
+ KERNEL_INITRAMFS := kernel-bin | lzma | \
+ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
+ IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+endef
+TARGET_DEVICES += huasifei_wh3000-emmc
+
define Device/imou_lc-hx3001
DEVICE_VENDOR := Imou
DEVICE_MODEL := LC-HX3001
Loading

0 comments on commit 34e4d5a

Please sign in to comment.