Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
@@ -8,10 +8,10 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_VERSION:=2026.01
|
||||
PKG_VERSION:=2026.04
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_HASH:=b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54
|
||||
PKG_HASH:=ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd
|
||||
|
||||
include $(INCLUDE_DIR)/u-boot.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
@@ -9,9 +9,9 @@ PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
|
||||
PKG_SOURCE_DATE:=2026-04-21
|
||||
PKG_SOURCE_VERSION:=e619cb04cddba8316d6928ff99f55a49e6ddc561
|
||||
PKG_MIRROR_HASH:=a7df56276cd429aeb00e4cd727a385c826db8eb8c0445f813f2c8b08bca35320
|
||||
PKG_SOURCE_DATE:=2026-05-15
|
||||
PKG_SOURCE_VERSION:=6fadf0da50509a510ac4f85d2adb70a83de2e1fc
|
||||
PKG_MIRROR_HASH:=66775a84eec4dbfdea35d460f7978a0cedd1a58ac84d90bd1ff388020f8eddcc
|
||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||
PKG_LICENSE:=ISC
|
||||
|
||||
|
||||
@@ -318,9 +318,14 @@
|
||||
nvmem-cell-names = "mac-address";
|
||||
};
|
||||
|
||||
&pon_pcs {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gdm2 {
|
||||
status = "okay";
|
||||
|
||||
managed = "in-band-status";
|
||||
phy-handle = <&phy8>;
|
||||
phy-mode = "usxgmii";
|
||||
|
||||
@@ -329,9 +334,14 @@
|
||||
openwrt,netdev-name = "wan";
|
||||
};
|
||||
|
||||
ð_pcs {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gdm4 {
|
||||
status = "okay";
|
||||
|
||||
managed = "in-band-status";
|
||||
phy-handle = <&phy5>;
|
||||
phy-mode = "usxgmii";
|
||||
|
||||
|
||||
@@ -68,7 +68,11 @@ define Device/Default
|
||||
DEVICE_DTS = $$(SOC)_$(1)
|
||||
PROFILES = Default
|
||||
MTDPARTS :=
|
||||
ifeq ($(SUBTARGET),tiny)
|
||||
BLOCKSIZE := 4k
|
||||
else
|
||||
BLOCKSIZE := 64k
|
||||
endif
|
||||
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
|
||||
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
|
||||
LOADER_KERNEL_MAGIC :=
|
||||
|
||||
@@ -3,7 +3,6 @@ include ./common-tp-link.mk
|
||||
define Device/tplink_rex5x
|
||||
$(Device/tplink-safeloader)
|
||||
SOC := qca9558
|
||||
BLOCKSIZE := 4k
|
||||
IMAGE_SIZE := 7680k
|
||||
KERNEL_SIZE := 6016k
|
||||
DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
|
||||
|
||||
@@ -81,7 +81,6 @@ TARGET_DEVICES += dlink_dir-869-a1
|
||||
|
||||
define Device/engenius_eap350-v1
|
||||
$(Device/senao_loader_okli)
|
||||
BLOCKSIZE := 4k
|
||||
SOC := ar7242
|
||||
DEVICE_VENDOR := EnGenius
|
||||
DEVICE_MODEL := EAP350
|
||||
@@ -95,7 +94,6 @@ TARGET_DEVICES += engenius_eap350-v1
|
||||
|
||||
define Device/engenius_ecb350-v1
|
||||
$(Device/senao_loader_okli)
|
||||
BLOCKSIZE := 4k
|
||||
SOC := ar7242
|
||||
DEVICE_VENDOR := EnGenius
|
||||
DEVICE_MODEL := ECB350
|
||||
@@ -124,7 +122,6 @@ TARGET_DEVICES += engenius_enh202-v1
|
||||
define Device/nec_wf1200hp
|
||||
DEVICE_MODEL := Aterm WF1200HP
|
||||
SOC := ar9344
|
||||
BLOCKSIZE := 4k
|
||||
IMAGE_SIZE := 7936k
|
||||
NEC_FW_TYPE := H047
|
||||
$(Device/nec-netbsd-aterm)
|
||||
@@ -137,7 +134,6 @@ TARGET_DEVICES += nec_wf1200hp
|
||||
define Device/nec_wf1200hp2
|
||||
DEVICE_MODEL := Aterm WF1200HP2
|
||||
SOC := ar9344
|
||||
BLOCKSIZE := 4k
|
||||
IMAGE_SIZE := 7936k
|
||||
NEC_FW_TYPE := H053
|
||||
$(Device/nec-netbsd-aterm)
|
||||
@@ -150,7 +146,6 @@ TARGET_DEVICES += nec_wf1200hp2
|
||||
define Device/nec_wg600hp
|
||||
DEVICE_MODEL := Aterm WG600HP
|
||||
SOC := ar9344
|
||||
BLOCKSIZE := 4k
|
||||
IMAGE_SIZE := 7936k
|
||||
NEC_FW_TYPE := H044
|
||||
$(Device/nec-netbsd-aterm)
|
||||
@@ -160,7 +155,6 @@ TARGET_DEVICES += nec_wg600hp
|
||||
define Device/nec_wr8750n
|
||||
SOC := ar9344
|
||||
DEVICE_MODEL := Aterm WR8750N
|
||||
BLOCKSIZE := 4k
|
||||
IMAGE_SIZE := 7936k
|
||||
NEC_FW_TYPE := H033a
|
||||
$(Device/nec-netbsd-aterm)
|
||||
@@ -170,7 +164,6 @@ TARGET_DEVICES += nec_wr8750n
|
||||
define Device/nec_wr9500n
|
||||
SOC := ar9344
|
||||
DEVICE_MODEL := Aterm WR9500N
|
||||
BLOCKSIZE := 4k
|
||||
IMAGE_SIZE := 16128k
|
||||
NEC_FW_TYPE := H033
|
||||
$(Device/nec-netbsd-aterm)
|
||||
@@ -193,7 +186,6 @@ define Device/sitecom_wlr-7100
|
||||
DEVICE_VENDOR := Sitecom
|
||||
DEVICE_MODEL := WLR-7100
|
||||
DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct-smallbuffers kmod-usb2
|
||||
BLOCKSIZE := 4k
|
||||
IMAGES += factory.dlf
|
||||
IMAGE/factory.dlf := append-kernel | pad-to $$$$(BLOCKSIZE) | \
|
||||
append-rootfs | pad-rootfs | check-size | \
|
||||
|
||||
@@ -2178,6 +2178,7 @@ CONFIG_FW_LOADER=y
|
||||
CONFIG_FW_LOADER_USER_HELPER=y
|
||||
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
|
||||
# CONFIG_FW_UPLOAD is not set
|
||||
# CONFIG_FWNODE_PCS is not set
|
||||
# CONFIG_FXAS21002C is not set
|
||||
# CONFIG_FXLS8962AF_I2C is not set
|
||||
# CONFIG_FXLS8962AF_SPI is not set
|
||||
|
||||
@@ -2276,6 +2276,7 @@ CONFIG_FW_LOADER=y
|
||||
CONFIG_FW_LOADER_USER_HELPER=y
|
||||
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
|
||||
# CONFIG_FW_UPLOAD is not set
|
||||
# CONFIG_FWNODE_PCS is not set
|
||||
# CONFIG_FXAS21002C is not set
|
||||
# CONFIG_FXLS8962AF_I2C is not set
|
||||
# CONFIG_FXLS8962AF_SPI is not set
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
menu "PCS device drivers"
|
||||
|
||||
+config FWNODE_PCS
|
||||
+ tristate
|
||||
+ bool "PCS Firmware Node"
|
||||
+ depends on (ACPI || OF)
|
||||
+ depends on PHYLINK
|
||||
+ help
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
menu "PCS device drivers"
|
||||
|
||||
+config FWNODE_PCS
|
||||
+ tristate
|
||||
+ bool "PCS Firmware Node"
|
||||
+ depends on (ACPI || OF)
|
||||
+ depends on PHYLINK
|
||||
+ help
|
||||
|
||||
Reference in New Issue
Block a user