Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-07-04 14:10:18 +08:00
commit 9c9fb94772
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
24 changed files with 218 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/kernel-build.mk
View File

@ -51,7 +51,7 @@ endif
define Download/git-kernel
URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI))
PROTO:=git
VERSION:=$(CONFIG_KERNEL_GIT_REF)
SOURCE_VERSION:=$(CONFIG_KERNEL_GIT_REF)
FILE:=$(LINUX_SOURCE)
SUBDIR:=linux-$(LINUX_VERSION)
OPTS:=$(KERNEL_GIT_OPTS)

2
include/netfilter.mk
View File

@ -253,8 +253,6 @@ $(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED))
# tee
$(eval $(call nf_add,IPT_TEE,CONFIG_NETFILTER_XT_TARGET_TEE, $(P_XT)xt_TEE))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV4, $(P_V4)nf_dup_ipv4),))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV6, $(P_V6)nf_dup_ipv6),))
# u32

10
include/target.mk
View File

@ -361,7 +361,15 @@ ifeq ($(DUMP),1)
ifneq ($(CONFIG_CPU_MIPS32_R2),)
FEATURES += mips16
endif
FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v)))
ifneq ($(CONFIG_CPU_V6),)
FEATURES += arm_v6
endif
ifneq ($(CONFIG_CPU_V6K),)
FEATURES += arm_v6
endif
ifneq ($(CONFIG_CPU_V7),)
FEATURES += arm_v7
endif
# remove duplicates
FEATURES:=$(sort $(FEATURES))

24
package/kernel/linux/modules/crypto.mk
View File

@ -81,6 +81,18 @@ endef
$(eval $(call KernelPackage,crypto-authenc))
define KernelPackage/crypto-blake2b
TITLE:=Support for BLAKE2b cryptographic hash function (RFC 7693)
DEPENDS:=+kmod-crypto-hash
KCONFIG:=CONFIG_CRYPTO_BLAKE2B
FILES:=$(LINUX_DIR)/crypto/blake2b_generic.ko
AUTOLOAD:=$(call AutoLoad,09,blake2b_generic)
$(call AddDepends/crypto)
endef
$(eval $(call KernelPackage,crypto-blake2b))
define KernelPackage/crypto-cbc
TITLE:=Cipher Block Chaining CryptoAPI module
DEPENDS:=+kmod-crypto-manager
@ -1158,3 +1170,15 @@ endef
$(eval $(call KernelPackage,crypto-xts))
define KernelPackage/crypto-xxhash
TITLE:=xxHash non-cryptographic hash algorithm
DEPENDS:=+kmod-crypto-hash +kmod-lib-xxhash
KCONFIG:=CONFIG_CRYPTO_XXHASH
FILES:=$(LINUX_DIR)/crypto/xxhash_generic.ko
AUTOLOAD:=$(call AutoLoad,09,xxhash_generic)
$(call AddDepends/crypto)
endef
$(eval $(call KernelPackage,crypto-xxhash))

2
package/kernel/linux/modules/fs.mk
View File

@ -67,7 +67,7 @@ $(eval $(call KernelPackage,fs-autofs4))
define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support
DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd
DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b +kmod-crypto-xxhash
KCONFIG:=\
CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_CHECK_INTEGRITY=n

2
package/kernel/linux/modules/hwmon.mk
View File

@ -148,7 +148,7 @@ define KernelPackage/hwmon-gsc
$(LINUX_DIR)/drivers/mfd/gateworks-gsc.ko \
$(LINUX_DIR)/drivers/hwmon/gsc-hwmon.ko
AUTOLOAD:=$(call AutoLoad,20,gsc-hwmon,1)
$(call AddDepends/hwmon,+kmod-i2c-core)
$(call AddDepends/hwmon,+kmod-i2c-core +kmod-mfd)
endef
define KernelPackage/hwmon-gsc/description

62
package/kernel/linux/modules/lib.mk
View File

@ -122,22 +122,31 @@ endef
$(eval $(call KernelPackage,lib-lzo))
define KernelPackage/lib-xxhash
SUBMENU:=$(LIB_MENU)
TITLE:=xxhash support
HIDDEN:=1
KCONFIG:=CONFIG_XXHASH
FILES:=$(LINUX_DIR)/lib/xxhash.ko
endef
$(eval $(call KernelPackage,lib-xxhash))
define KernelPackage/lib-zstd
SUBMENU:=$(LIB_MENU)
TITLE:=ZSTD support
DEPENDS:=+kmod-crypto-acompress
DEPENDS:=+kmod-crypto-acompress +kmod-lib-xxhash
KCONFIG:= \
CONFIG_CRYPTO_ZSTD \
CONFIG_ZSTD_COMPRESS \
CONFIG_ZSTD_DECOMPRESS \
CONFIG_XXHASH
CONFIG_ZSTD_DECOMPRESS
FILES:= \
$(LINUX_DIR)/crypto/zstd.ko \
$(LINUX_DIR)/lib/xxhash.ko \
$(LINUX_DIR)/lib/zstd/zstd_common.ko@ge6.1 \
$(LINUX_DIR)/lib/zstd/zstd_compress.ko \
$(LINUX_DIR)/lib/zstd/zstd_decompress.ko
AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress)
AUTOLOAD:=$(call AutoProbe,zstd zstd_compress zstd_decompress)
endef
define KernelPackage/lib-zstd/description
@ -147,21 +156,28 @@ endef
$(eval $(call KernelPackage,lib-zstd))
define KernelPackage/lib-lz4-decompress
SUBMENU:=$(LIB_MENU)
TITLE:=LZ4 decompress
HIDDEN:=1
KCONFIG:=CONFIG_LZ4_DECOMPRESS
FILES:=$(LINUX_DIR)/lib/lz4/lz4_decompress.ko
endef
$(eval $(call KernelPackage,lib-lz4-decompress))
define KernelPackage/lib-lz4
SUBMENU:=$(LIB_MENU)
TITLE:=LZ4 support
DEPENDS:=+kmod-crypto-acompress
DEPENDS:=+kmod-crypto-acompress +kmod-lib-lz4-decompress
KCONFIG:= \
CONFIG_CRYPTO_LZ4 \
CONFIG_CRYPTO_LZ4HC \
CONFIG_LZ4_COMPRESS \
CONFIG_LZ4_DECOMPRESS
CONFIG_LZ4_COMPRESS
FILES:= \
$(LINUX_DIR)/crypto/lz4.ko \
$(LINUX_DIR)/lib/lz4/lz4_compress.ko \
$(LINUX_DIR)/lib/lz4/lz4hc_compress.ko \
$(LINUX_DIR)/lib/lz4/lz4_decompress.ko
AUTOLOAD:=$(call AutoProbe,lz4 lz4_compress lz4hc_compress lz4_decompress)
$(LINUX_DIR)/lib/lz4/lz4_compress.ko
AUTOLOAD:=$(call AutoProbe,lz4 lz4_compress)
endef
define KernelPackage/lib-lz4/description
@ -171,6 +187,26 @@ endef
$(eval $(call KernelPackage,lib-lz4))
define KernelPackage/lib-lz4hc
SUBMENU:=$(LIB_MENU)
TITLE:=LZ4HC support
DEPENDS:=+kmod-crypto-acompress +kmod-lib-lz4-decompress
KCONFIG:= \
CONFIG_CRYPTO_LZ4HC \
CONFIG_LZ4HC_COMPRESS
FILES:= \
$(LINUX_DIR)/crypto/lz4hc.ko \
$(LINUX_DIR)/lib/lz4/lz4hc_compress.ko
AUTOLOAD:=$(call AutoProbe,lz4hc lz4hc_compress)
endef
define KernelPackage/lib-lz4hc/description
Kernel module for LZ4HC compression/decompression support
endef
$(eval $(call KernelPackage,lib-lz4hc))
define KernelPackage/lib-842
SUBMENU:=$(LIB_MENU)
TITLE:=842 support

26
package/kernel/linux/modules/netfilter.mk
View File

@ -132,6 +132,22 @@ endef
$(eval $(call KernelPackage,nf-conntrack6))
define KernelPackage/nf-dup-inet
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support
HIDDEN:=1
DEPENDS:=+kmod-nf-conntrack +IPV6:kmod-nf-conntrack6
KCONFIG:= \
CONFIG_NF_DUP_IPV4 \
CONFIG_NF_DUP_IPV6
FILES:= \
$(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \
$(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko
endef
$(eval $(call KernelPackage,nf-dup-inet))
define KernelPackage/nf-log
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter Logging
@ -716,7 +732,7 @@ $(eval $(call KernelPackage,ipt-tproxy))
define KernelPackage/ipt-tee
TITLE:=TEE support
DEPENDS:=+kmod-ipt-conntrack
DEPENDS:=+kmod-ipt-conntrack +kmod-nf-dup-inet
KCONFIG:=$(KCONFIG_IPT_TEE)
FILES:=$(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_TEE-m)))
@ -1150,18 +1166,14 @@ $(eval $(call KernelPackage,nft-bridge))
define KernelPackage/nft-dup-inet
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support
DEPENDS:=+kmod-nft-core +kmod-nf-conntrack +IPV6:kmod-nf-conntrack6
DEPENDS:=+kmod-nft-core +kmod-nf-dup-inet
KCONFIG:= \
CONFIG_NF_DUP_IPV4 \
CONFIG_NF_DUP_IPV6 \
CONFIG_NFT_DUP_IPV4 \
CONFIG_NFT_DUP_IPV6
FILES:= \
$(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \
$(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko \
$(LINUX_DIR)/net/ipv4/netfilter/nft_dup_ipv4.ko \
$(LINUX_DIR)/net/ipv6/netfilter/nft_dup_ipv6.ko
AUTOLOAD:=$(call AutoProbe,nf_dup_ipv4 nf_dup_ipv6 nft_dup_ipv4 nft_dup_ipv6)
AUTOLOAD:=$(call AutoProbe,nft_dup_ipv4 nft_dup_ipv6)
endef
$(eval $(call KernelPackage,nft-dup-inet))

12
package/kernel/linux/modules/netsupport.mk
View File

@ -1245,6 +1245,18 @@ endef
$(eval $(call KernelPackage,sctp))
define KernelPackage/sctp-diag
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=SCTP diag support
DEPENDS:=+kmod-sctp +kmod-inet-diag
KCONFIG:=CONFIG_INET_SCTP_DIAG
FILES:= $(LINUX_DIR)/net/sctp/sctp_diag.ko
AUTOLOAD:= $(call AutoLoad,33,sctp_diag)
endef
$(eval $(call KernelPackage,sctp-diag))
define KernelPackage/netem
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Network emulation functionality

13
package/kernel/linux/modules/other.mk
View File

@ -572,11 +572,24 @@ endef
$(eval $(call KernelPackage,bcma))
define KernelPackage/mfd
SUBMENU:=$(OTHER_MENU)
TITLE:=Multifunction device drivers
HIDDEN:=1
KCONFIG:=CONFIG_MFD_CORE
FILES:=$(LINUX_DIR)/drivers/mfd/mfd-core.ko
AUTOLOAD:=$(call AutoLoad,10,mfd-core)
endef
$(eval $(call KernelPackage,mfd))
define KernelPackage/mtdtests
SUBMENU:=$(OTHER_MENU)
TITLE:=MTD subsystem tests
KCONFIG:=CONFIG_MTD_TESTS
FILES:=\
$(LINUX_DIR)/drivers/mtd/tests/mtd_nandbiterrs.ko \
$(LINUX_DIR)/drivers/mtd/tests/mtd_nandecctest.ko \
$(LINUX_DIR)/drivers/mtd/tests/mtd_oobtest.ko \
$(LINUX_DIR)/drivers/mtd/tests/mtd_pagetest.ko \

2
package/network/config/wifi-scripts/Makefile
View File

@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/wifi-scripts
SECTION:=utils
CATEGORY:=Base system
DEPENDS:=+netifd +ucode +ucode-mod-nl80211 +ucode-mod-ubus
DEPENDS:=+netifd +ucode +ucode-mod-nl80211 +ucode-mod-ubus +ucode-mod-uci
TITLE:=Wi-Fi configuration scripts
PKGARCH:=all
endef

3
package/utils/f2fs-tools/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=f2fs-tools
PKG_VERSION:=1.16.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/
@ -137,6 +137,7 @@ define Package/f2fsck/install
$(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/dump.f2fs
$(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/sload.f2fs
$(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/resize.f2fs
$(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/f2fslabel
endef
Package/f2fsck-selinux/install = $(Package/f2fsck/install)

26
target/linux/bcm27xx/base-files/etc/diag.sh
View File

@ -5,11 +5,23 @@
. /lib/functions.sh
. /lib/functions/leds.sh
status_led_restore_trigger() {
local led_lc=$(echo "$status_led" | awk '{print tolower($0)}')
local led_path="/proc/device-tree/leds/led-$led_lc"
local led_trigger
[ -d "$led_path" ] && \
led_trigger=$(cat "$led_path/linux,default-trigger" 2>/dev/null)
[ -n "$led_trigger" ] && \
led_set_attr $status_led "trigger" "$led_trigger"
}
set_state() {
if [ -d "/sys/class/leds/PWR" ]; then
status_led="PWR"
else
if [ -d "/sys/class/leds/ACT" ]; then
status_led="ACT"
else
return
fi
case "$1" in
@ -22,11 +34,11 @@ set_state() {
preinit_regular)
status_led_blink_preinit_regular
;;
upgrade)
status_led_blink_preinit_regular
;;
upgrade)
status_led_blink_preinit_regular
;;
done)
status_led_on
status_led_restore_trigger
;;
esac
}

20
target/linux/ramips/dts/mt7620a.dtsi
View File

@ -48,7 +48,7 @@
};
timer: timer@100 {
compatible = "ralink,mt7620a-timer", "ralink,rt2880-timer";
compatible = "ralink,rt2880-timer";
reg = <0x100 0x20>;
clocks = <&sysc 5>;
@ -58,7 +58,7 @@
};
watchdog: watchdog@120 {
compatible = "ralink,mt7620a-wdt", "ralink,rt2880-wdt";
compatible = "ralink,rt2880-wdt";
reg = <0x120 0x10>;
clocks = <&sysc 6>;
@ -71,7 +71,7 @@
};
intc: intc@200 {
compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc";
compatible = "ralink,rt2880-intc";
reg = <0x200 0x100>;
interrupt-controller;
@ -106,7 +106,7 @@
};
gpio0: gpio@600 {
compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x600 0x34>;
interrupt-parent = <&intc>;
@ -123,7 +123,7 @@
};
gpio1: gpio@638 {
compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x638 0x24>;
interrupt-parent = <&intc>;
@ -142,7 +142,7 @@
};
gpio2: gpio@660 {
compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x660 0x24>;
interrupt-parent = <&intc>;
@ -161,7 +161,7 @@
};
gpio3: gpio@688 {
compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x688 0x24>;
interrupt-parent = <&intc>;
@ -220,7 +220,7 @@
};
spi0: spi@b00 {
compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb00 0x40>;
clocks = <&sysc 10>;
@ -465,14 +465,14 @@
mediatek,switch = <&gsw>;
port@4 {
compatible = "mediatek,mt7620a-gsw-port", "mediatek,eth-port";
compatible = "mediatek,eth-port";
reg = <4>;
status = "disabled";
};
port@5 {
compatible = "mediatek,mt7620a-gsw-port", "mediatek,eth-port";
compatible = "mediatek,eth-port";
reg = <5>;
status = "disabled";

16
target/linux/ramips/dts/mt7620n.dtsi
View File

@ -48,7 +48,7 @@
};
timer: timer@100 {
compatible = "ralink,mt7620a-timer", "ralink,rt2880-timer";
compatible = "ralink,rt2880-timer";
reg = <0x100 0x20>;
clocks = <&sysc 5>;
@ -58,7 +58,7 @@
};
watchdog: watchdog@120 {
compatible = "ralink,mt7620a-wdt", "ralink,rt2880-wdt";
compatible = "ralink,rt2880-wdt";
reg = <0x120 0x10>;
clocks = <&sysc 6>;
@ -71,7 +71,7 @@
};
intc: intc@200 {
compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc";
compatible = "ralink,rt2880-intc";
reg = <0x200 0x100>;
interrupt-controller;
@ -90,7 +90,7 @@
};
gpio0: gpio@600 {
compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x600 0x34>;
interrupt-parent = <&intc>;
@ -107,7 +107,7 @@
};
gpio1: gpio@638 {
compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x638 0x24>;
interrupt-parent = <&intc>;
@ -126,7 +126,7 @@
};
gpio2: gpio@660 {
compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x660 0x24>;
interrupt-parent = <&intc>;
@ -145,7 +145,7 @@
};
gpio3: gpio@688 {
compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x688 0x24>;
interrupt-parent = <&intc>;
@ -182,7 +182,7 @@
};
spi0: spi@b00 {
compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb00 0x40>;
clocks = <&sysc 10>;

4
target/linux/ramips/dts/mt7628an.dtsi
View File

@ -52,7 +52,7 @@
};
intc: intc@200 {
compatible = "ralink,mt7628an-intc", "ralink,rt2880-intc";
compatible = "ralink,rt2880-intc";
reg = <0x200 0x100>;
interrupt-controller;
@ -418,7 +418,7 @@
};
esw: esw@10110000 {
compatible = "mediatek,mt7628-esw", "ralink,rt3050-esw";
compatible = "ralink,rt3050-esw";
reg = <0x10110000 0x8000>;
resets = <&sysc 24>;

2
target/linux/ramips/dts/rt2880.dtsi
View File

@ -218,7 +218,7 @@
status = "disabled";
port@0 {
compatible = "ralink,rt2880-port", "mediatek,eth-port";
compatible = "mediatek,eth-port";
reg = <0>;
};

18
target/linux/ramips/dts/rt3050.dtsi
View File

@ -47,7 +47,7 @@
};
timer: timer@100 {
compatible = "ralink,rt3050-timer", "ralink,rt2880-timer";
compatible = "ralink,rt2880-timer";
reg = <0x100 0x20>;
clocks = <&sysc 3>;
@ -57,7 +57,7 @@
};
watchdog: watchdog@120 {
compatible = "ralink,rt3050-wdt", "ralink,rt2880-wdt";
compatible = "ralink,rt2880-wdt";
reg = <0x120 0x10>;
clocks = <&sysc 4>;
@ -70,7 +70,7 @@
};
intc: intc@200 {
compatible = "ralink,rt3050-intc", "ralink,rt2880-intc";
compatible = "ralink,rt2880-intc";
reg = <0x200 0x100>;
interrupt-controller;
@ -89,7 +89,7 @@
};
uart: uart@500 {
compatible = "ralink,rt3050-uart", "ralink,rt2880-uart", "ns16550a";
compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
reg = <0x500 0x100>;
clocks = <&sysc 5>;
@ -105,7 +105,7 @@
};
gpio0: gpio@600 {
compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x600 0x34>;
gpio-controller;
@ -122,7 +122,7 @@
};
gpio1: gpio@638 {
compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x638 0x24>;
gpio-controller;
@ -138,7 +138,7 @@
};
gpio2: gpio@660 {
compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x660 0x24>;
gpio-controller;
@ -209,7 +209,7 @@
};
spi0: spi@b00 {
compatible = "ralink,rt3050-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb00 0x100>;
resets = <&sysc 18>;
@ -227,7 +227,7 @@
};
uartlite: uartlite@c00 {
compatible = "ralink,rt3050-uart", "ralink,rt2880-uart", "ns16550a";
compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
reg = <0xc00 0x100>;
clocks = <&sysc 10>;

26
target/linux/ramips/dts/rt3352.dtsi
View File

@ -48,7 +48,7 @@
};
timer: timer@100 {
compatible = "ralink,rt3352-timer", "ralink,rt2880-timer";
compatible = "ralink,rt2880-timer";
reg = <0x100 0x20>;
clocks = <&sysc 4>;
@ -58,7 +58,7 @@
};
watchdog: watchdog@120 {
compatible = "ralink,rt3352-wdt", "ralink,rt2880-wdt";
compatible = "ralink,rt2880-wdt";
reg = <0x120 0x10>;
clocks = <&sysc 5>;
@ -71,7 +71,7 @@
};
intc: intc@200 {
compatible = "ralink,rt3352-intc", "ralink,rt2880-intc";
compatible = "ralink,rt2880-intc";
reg = <0x200 0x100>;
interrupt-controller;
@ -82,7 +82,7 @@
};
memc: memc@300 {
compatible = "ralink,rt3352-memc", "ralink,rt3050-memc";
compatible = "ralink,rt3050-memc";
reg = <0x300 0x100>;
interrupt-parent = <&intc>;
@ -90,7 +90,7 @@
};
uart: uart@500 {
compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a";
compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
reg = <0x500 0x100>;
clocks = <&sysc 6>;
@ -106,7 +106,7 @@
};
gpio0: gpio@600 {
compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x600 0x34>;
gpio-controller;
@ -123,7 +123,7 @@
};
gpio1: gpio@638 {
compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x638 0x24>;
gpio-controller;
@ -139,7 +139,7 @@
};
gpio2: gpio@660 {
compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x660 0x24>;
gpio-controller;
@ -195,7 +195,7 @@
};
spi0: spi@b00 {
compatible = "ralink,rt3352-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb00 0x40>;
#address-cells = <1>;
#size-cells = <0>;
@ -212,7 +212,7 @@
};
spi1: spi@b40 {
compatible = "ralink,rt3352-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb40 0x60>;
#address-cells = <1>;
#size-cells = <0>;
@ -227,7 +227,7 @@
};
uartlite: uartlite@c00 {
compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a";
compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
reg = <0xc00 0x100>;
clocks = <&sysc 11>;
@ -314,7 +314,7 @@
};
ethernet: ethernet@10100000 {
compatible = "ralink,rt3352-eth", "ralink,rt3050-eth";
compatible = "ralink,rt3050-eth";
reg = <0x10100000 0x10000>;
clocks = <&sysc 12>;
@ -329,7 +329,7 @@
};
esw: esw@10110000 {
compatible = "ralink,rt3352-esw", "ralink,rt3050-esw";
compatible = "ralink,rt3050-esw";
reg = <0x10110000 0x8000>;
resets = <&sysc 24>;

20
target/linux/ramips/dts/rt3883.dtsi
View File

@ -48,7 +48,7 @@
};
timer: timer@100 {
compatible = "ralink,rt3883-timer", "ralink,rt2880-timer";
compatible = "ralink,rt2880-timer";
reg = <0x100 0x20>;
clocks = <&sysc 3>;
@ -58,7 +58,7 @@
};
watchdog: watchdog@120 {
compatible = "ralink,rt3883-wdt", "ralink,rt2880-wdt";
compatible = "ralink,rt2880-wdt";
reg = <0x120 0x10>;
clocks = <&sysc 4>;
@ -71,7 +71,7 @@
};
intc: intc@200 {
compatible = "ralink,rt3883-intc", "ralink,rt2880-intc";
compatible = "ralink,rt2880-intc";
reg = <0x200 0x100>;
interrupt-controller;
@ -106,7 +106,7 @@
};
gpio0: gpio@600 {
compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x600 0x34>;
interrupt-parent = <&intc>;
@ -123,7 +123,7 @@
};
gpio1: gpio@638 {
compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x638 0x24>;
gpio-controller;
@ -139,7 +139,7 @@
};
gpio2: gpio@660 {
compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x660 0x24>;
gpio-controller;
@ -155,7 +155,7 @@
};
gpio3: gpio@688 {
compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x688 0x24>;
gpio-controller;
@ -211,7 +211,7 @@
};
spi0: spi@b00 {
compatible = "ralink,rt3883-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb00 0x40>;
#address-cells = <1>;
#size-cells = <0>;
@ -228,7 +228,7 @@
};
spi1: spi@b40 {
compatible = "ralink,rt3883-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb40 0x60>;
#address-cells = <1>;
#size-cells = <0>;
@ -339,7 +339,7 @@
interrupts = <5>;
port@0 {
compatible = "ralink,rt3883-port", "mediatek,eth-port";
compatible = "mediatek,eth-port";
reg = <0>;
};

20
target/linux/ramips/dts/rt5350.dtsi
View File

@ -48,7 +48,7 @@
};
timer: timer@100 {
compatible = "ralink,rt5350-timer", "ralink,rt2880-timer";
compatible = "ralink,rt2880-timer";
reg = <0x100 0x20>;
clocks = <&sysc 4>;
@ -58,7 +58,7 @@
};
watchdog: watchdog@120 {
compatible = "ralink,rt5350-wdt", "ralink,rt2880-wdt";
compatible = "ralink,rt2880-wdt";
reg = <0x120 0x10>;
clocks = <&sysc 5>;
@ -71,7 +71,7 @@
};
intc: intc@200 {
compatible = "ralink,rt5350-intc", "ralink,rt2880-intc";
compatible = "ralink,rt2880-intc";
reg = <0x200 0x100>;
interrupt-controller;
@ -90,7 +90,7 @@
};
uart: uart@500 {
compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a";
compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
reg = <0x500 0x100>;
clocks = <&sysc 6>;
@ -106,7 +106,7 @@
};
gpio0: gpio@600 {
compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x600 0x34>;
interrupt-parent = <&intc>;
@ -123,7 +123,7 @@
};
gpio1: gpio@660 {
compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio";
compatible = "ralink,rt2880-gpio";
reg = <0x660 0x24>;
interrupt-parent = <&intc>;
@ -182,7 +182,7 @@
};
spi0: spi@b00 {
compatible = "ralink,rt5350-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb00 0x40>;
clocks = <&sysc 9>;
@ -200,7 +200,7 @@
};
spi1: spi@b40 {
compatible = "ralink,rt5350-spi", "ralink,rt2880-spi";
compatible = "ralink,rt2880-spi";
reg = <0xb40 0x60>;
clocks = <&sysc 10>;
@ -218,7 +218,7 @@
};
uartlite: uartlite@c00 {
compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a";
compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
reg = <0xc00 0x100>;
clocks = <&sysc 11>;
@ -350,7 +350,7 @@
};
esw: esw@10110000 {
compatible = "ralink,rt5350-esw", "ralink,rt3050-esw";
compatible = "ralink,rt3050-esw";
reg = <0x10110000 0x8000>;
resets = <&sysc 24>;

2
target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch
View File

@ -40,7 +40,7 @@ Cc: linux-gpio@vger.kernel.org
+Example:
+
+ gpio0: gpio@600 {
+ compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio";
+ compatible = "ralink,rt2880-gpio";
+
+ #gpio-cells = <2>;
+ gpio-controller;

4
tools/e2fsprogs/Makefile
View File

@ -39,8 +39,8 @@ endef
define Host/Install
$(call Host/Install/Default)
$(SED) 's|^DIR=.*|DIR=$$$$(STAGING_DIR_HOST)/share/et|' $(STAGING_DIR_HOST)/bin/compile_et
$(SED) 's|^DIR=.*|DIR=$$$$(STAGING_DIR_HOST)/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds
$(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/et|' $(STAGING_DIR_HOST)/bin/compile_et
$(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds
endef
define Host/Uninstall

1
tools/util-linux/Makefile
View File

@ -21,6 +21,7 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_ARGS += \
--with-pic \
--disable-shared \
--disable-all-programs \
--enable-hexdump \