diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index d2edef1a34..fe908f7aa4 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -327,7 +327,7 @@ group_add_next() { gids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/group) gid=65536 while echo "$gids" | grep -q "^$gid$"; do - gid=$((gid + 1)) + gid=$((gid + 1)) done group_add $1 $gid echo $gid @@ -355,7 +355,7 @@ user_add() { uids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/passwd) uid=65536 while echo "$uids" | grep -q "^$uid$"; do - uid=$((uid + 1)) + uid=$((uid + 1)) done } [ -z "$gid" ] && gid=$uid diff --git a/package/kernel/hwmon-gsc/Makefile b/package/kernel/hwmon-gsc/Makefile index 454f685f8f..95f6fab4c0 100644 --- a/package/kernel/hwmon-gsc/Makefile +++ b/package/kernel/hwmon-gsc/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/hwmon-gsc SUBMENU:=Hardware Monitoring Support - DEPENDS:=@TARGET_imx6||TARGET_cns3xxx kmod-hwmon-core +kmod-i2c-core + DEPENDS:=@TARGET_imx6||TARGET_cns3xxx +kmod-hwmon-core +kmod-i2c-core TITLE:=Driver for the Gateworks System Controller AUTOLOAD:=$(call AutoLoad,60,gsc) FILES:=$(PKG_BUILD_DIR)/gsc.ko diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk index c0a477856e..73b448022d 100644 --- a/package/kernel/linux/modules/hwmon.mk +++ b/package/kernel/linux/modules/hwmon.mk @@ -26,7 +26,7 @@ $(eval $(call KernelPackage,hwmon-core)) define AddDepends/hwmon SUBMENU:=$(HWMON_MENU) - DEPENDS:=kmod-hwmon-core $(1) + DEPENDS:=+kmod-hwmon-core $(1) endef define KernelPackage/hwmon-ads1015 diff --git a/package/kernel/linux/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk index 0b23b2439c..90eee8b8f5 100644 --- a/package/kernel/linux/modules/i2c.mk +++ b/package/kernel/linux/modules/i2c.mk @@ -42,7 +42,7 @@ I2C_ALGOBIT_MODULES:= \ define KernelPackage/i2c-algo-bit $(call i2c_defaults,$(I2C_ALGOBIT_MODULES),55) TITLE:=I2C bit-banging interfaces - DEPENDS:=kmod-i2c-core + DEPENDS:=+kmod-i2c-core endef define KernelPackage/i2c-algo-bit/description @@ -58,7 +58,7 @@ I2C_ALGOPCA_MODULES:= \ define KernelPackage/i2c-algo-pca $(call i2c_defaults,$(I2C_ALGOPCA_MODULES),55) TITLE:=I2C PCA 9564 interfaces - DEPENDS:=kmod-i2c-core + DEPENDS:=+kmod-i2c-core endef define KernelPackage/i2c-algo-pca/description @@ -74,7 +74,7 @@ I2C_ALGOPCF_MODULES:= \ define KernelPackage/i2c-algo-pcf $(call i2c_defaults,$(I2C_ALGOPCF_MODULES),55) TITLE:=I2C PCF 8584 interfaces - DEPENDS:=kmod-i2c-core + DEPENDS:=+kmod-i2c-core endef define KernelPackage/i2c-algo-pcf/description @@ -107,7 +107,7 @@ I2C_I801_MODULES:= \ define KernelPackage/i2c-i801 $(call i2c_defaults,$(I2C_I801_MODULES),59) TITLE:=Intel I801 and compatible I2C interfaces - DEPENDS:=@PCI_SUPPORT @TARGET_x86 kmod-i2c-core +kmod-i2c-smbus + DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-core +kmod-i2c-smbus endef define KernelPackage/i2c-i801/description @@ -132,7 +132,7 @@ I2C_MUX_MODULES:= \ define KernelPackage/i2c-mux $(call i2c_defaults,$(I2C_MUX_MODULES),51) TITLE:=I2C bus multiplexing support - DEPENDS:=kmod-i2c-core + DEPENDS:=+kmod-i2c-core endef define KernelPackage/i2c-mux/description @@ -194,7 +194,7 @@ I2C_PIIX4_MODULES:= \ define KernelPackage/i2c-piix4 $(call i2c_defaults,$(I2C_PIIX4_MODULES),59) TITLE:=Intel PIIX4 and compatible I2C interfaces - DEPENDS:=@PCI_SUPPORT @TARGET_x86 kmod-i2c-core + DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-core endef define KernelPackage/i2c-piix4/description @@ -216,7 +216,7 @@ I2C_PXA_MODULES:= \ define KernelPackage/i2c-pxa $(call i2c_defaults,$(I2C_PXA_MODULES),50) TITLE:=Intel PXA I2C bus driver - DEPENDS:=kmod-i2c-core + DEPENDS:=+kmod-i2c-core endef define KernelPackage/i2c-pxa/description @@ -232,7 +232,7 @@ I2C_SMBUS_MODULES:= \ define KernelPackage/i2c-smbus $(call i2c_defaults,$(I2C_SMBUS_MODULES),58) TITLE:=SMBus-specific protocols helper - DEPENDS:=kmod-i2c-core + DEPENDS:=+kmod-i2c-core endef define KernelPackage/i2c-smbus/description @@ -249,7 +249,7 @@ I2C_TINY_USB_MODULES:= \ define KernelPackage/i2c-tiny-usb $(call i2c_defaults,$(I2C_TINY_USB_MODULES),59) TITLE:=I2C Tiny USB adaptor - DEPENDS:=@USB_SUPPORT kmod-i2c-core +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-i2c-core +kmod-usb-core endef define KernelPackage/i2c-tiny-usb/description diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr740n-v5.dts b/target/linux/ath79/dts/ar9331_tplink_tl-wr740n-v5.dts new file mode 100644 index 0000000000..a031bf3875 --- /dev/null +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr740n-v5.dts @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9331_tplink_tl-wr741nd-v4.dtsi" + +/ { + model = "TP-Link TL-WR740N v5"; + compatible = "tplink,tl-wr740n-v5", "qca,ar9331"; +}; diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 322c3ae07f..5a0b0ab67e 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -159,7 +159,7 @@ define Device/aruba_ap-105 DEVICE_VENDOR := Aruba DEVICE_MODEL := AP-105 IMAGE_SIZE := 16000k - DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-tpm-i2c-atmel + DEVICE_PACKAGES := kmod-i2c-gpio kmod-tpm-i2c-atmel endef TARGET_DEVICES += aruba_ap-105 @@ -1021,7 +1021,7 @@ define Device/pisen_wmb001n DEVICE_VENDOR := PISEN DEVICE_MODEL := WMB001N IMAGE_SIZE := 14080k - DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-usb2 + DEVICE_PACKAGES := kmod-i2c-gpio kmod-usb2 LOADER_TYPE := bin LOADER_FLASH_OFFS := 0x20000 COMPILE := loader-$(1).bin loader-$(1).uImage @@ -1182,7 +1182,7 @@ define Device/winchannel_wb2000 DEVICE_VENDOR := Winchannel DEVICE_MODEL := WB2000 IMAGE_SIZE := 15872k - DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-rtc-ds1307 kmod-usb2 \ + DEVICE_PACKAGES := kmod-i2c-gpio kmod-rtc-ds1307 kmod-usb2 \ kmod-usb-ledtrig-usbport endef TARGET_DEVICES += winchannel_wb2000 @@ -1233,7 +1233,7 @@ define Device/zbtlink_zbt-wd323 DEVICE_VENDOR := ZBT DEVICE_MODEL := WD323 IMAGE_SIZE := 16000k - DEVICE_PACKAGES := kmod-usb2 kmod-i2c-core kmod-i2c-gpio kmod-rtc-pcf8563 \ + DEVICE_PACKAGES := kmod-usb2 kmod-i2c-gpio kmod-rtc-pcf8563 \ kmod-usb-serial kmod-usb-serial-cp210x uqmi endef TARGET_DEVICES += zbtlink_zbt-wd323 diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index 29fdfec1e5..dc91a74ae1 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -186,6 +186,15 @@ define Device/tplink_tl-wr740n-v4 endef TARGET_DEVICES += tplink_tl-wr740n-v4 +define Device/tplink_tl-wr740n-v5 + $(Device/tplink-4mlzma) + SOC := ar9331 + DEVICE_MODEL := TL-WR740N + DEVICE_VARIANT := v5 + TPLINK_HWID := 0x07400005 +endef +TARGET_DEVICES += tplink_tl-wr740n-v5 + define Device/tplink_tl-wr741-v1 $(Device/tplink-4m) SOC := ar7240 diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds index c62fdfd083..ecd7aaaf35 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds @@ -51,6 +51,7 @@ tplink,tl-wa901nd-v1) ;; tplink,tl-mr3420-v2|\ tplink,tl-wr740n-v4|\ +tplink,tl-wr740n-v5|\ tplink,tl-wr741nd-v4|\ tplink,tl-wr841-v8) ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/02_network b/target/linux/ath79/tiny/base-files/etc/board.d/02_network index 29c55c98a1..d448144c93 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/02_network +++ b/target/linux/ath79/tiny/base-files/etc/board.d/02_network @@ -60,6 +60,7 @@ ath79_setup_interfaces() ;; tplink,tl-mr3420-v2|\ tplink,tl-wr740n-v4|\ + tplink,tl-wr740n-v5|\ tplink,tl-wr741nd-v4|\ tplink,tl-wr841-v8) ucidef_set_interface_wan "eth1" diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 7de62d13ca..67dd53af70 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -65,7 +65,7 @@ define Device/iom_ix2-200 DEVICE_VENDOR := Iomega DEVICE_MODEL := StorCenter ix2-200 DEVICE_DTS := kirkwood-iomega_ix2_200 - DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-hwmon-core kmod-hwmon-lm63 + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-hwmon-lm63 DEVICE_TYPE:=nas PAGESIZE := 512 SUBPAGESIZE := 256 @@ -137,8 +137,7 @@ TARGET_DEVICES += seagate_goflexhome define Device/zyxel_nsa310b DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NSA310b - DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-core \ - kmod-hwmon-lm85 + DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-lm85 BOARD_NAME := nsa310b endef TARGET_DEVICES += zyxel_nsa310b diff --git a/target/linux/lantiq/modules.mk b/target/linux/lantiq/modules.mk index e7fbad3a29..8cd720093c 100644 --- a/target/linux/lantiq/modules.mk +++ b/target/linux/lantiq/modules.mk @@ -11,7 +11,7 @@ I2C_LANTIQ_MODULES:= \ define KernelPackage/i2c-lantiq TITLE:=Lantiq I2C controller $(call i2c_defaults,$(I2C_LANTIQ_MODULES),52) - DEPENDS:=kmod-i2c-core @TARGET_lantiq_falcon + DEPENDS:=+kmod-i2c-core @TARGET_lantiq_falcon endef define KernelPackage/i2c-lantiq/description diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index ff4846c9bf..280a07168a 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -275,7 +275,7 @@ define Device/traverse-ls1043 DEVICE_PACKAGES += \ layerscape-fman-ls1043ardb \ uboot-envtools \ - kmod-i2c-core kmod-i2c-mux-pca954x \ + kmod-i2c-mux kmod-i2c-mux-pca954x \ kmod-hwmon-core \ kmod-gpio-pca953x kmod-input-gpio-keys-polled \ kmod-rtc-isl1208 diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile index 98fe51c7e9..40002c13c4 100644 --- a/target/linux/mpc85xx/image/Makefile +++ b/target/linux/mpc85xx/image/Makefile @@ -111,7 +111,7 @@ define Device/freescale_p2020rdb DEVICE_VENDOR := Freescale DEVICE_MODEL := P2020RDB DEVICE_DTS_DIR := $(DTS_DIR)/fsl - DEVICE_PACKAGES := kmod-hwmon-core kmod-hwmon-lm90 kmod-rtc-ds1307 \ + DEVICE_PACKAGES := kmod-hwmon-lm90 kmod-rtc-ds1307 \ kmod-gpio-pca953x kmod-eeprom-at24 BLOCKSIZE := 128k KERNEL := kernel-bin | gzip | \ diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk index a7a4d7c2e7..014f46c952 100644 --- a/target/linux/mvebu/image/cortexa72.mk +++ b/target/linux/mvebu/image/cortexa72.mk @@ -22,7 +22,7 @@ define Device/marvell_macchiatobin DEVICE_MODEL := MACCHIATObin DEVICE_ALT0_VENDOR := SolidRun DEVICE_ALT0_MODEL := Armada 8040 Community Board - DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x + DEVICE_PACKAGES += kmod-i2c-mux kmod-i2c-mux-pca954x DEVICE_DTS := armada-8040-mcbin SUPPORTED_DEVICES := marvell,armada8040-mcbin endef diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk index 257d76f19f..a215536bf8 100644 --- a/target/linux/mvebu/image/cortexa9.mk +++ b/target/linux/mvebu/image/cortexa9.mk @@ -15,7 +15,7 @@ define Device/cznic_turris-omnia DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ wpad-basic kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \ - partx-utils kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x + partx-utils kmod-i2c-mux kmod-i2c-mux-pca954x IMAGES := $$(IMAGE_PREFIX)-sysupgrade.img.gz omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-img | sdcard-img | gzip | append-metadata IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip diff --git a/target/linux/oxnas/image/ox820.mk b/target/linux/oxnas/image/ox820.mk index 41ab3e230a..c0e0733f8e 100644 --- a/target/linux/oxnas/image/ox820.mk +++ b/target/linux/oxnas/image/ox820.mk @@ -71,7 +71,7 @@ define Device/shuttle_kd20 KERNEL_INITRAMFS = kernel-bin | append-dtb | uImage none | omninas-factory | encrypt-3des sohmuntitnlaes DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ata-oxnas-sata kmod-usb-ledtrig-usbport \ kmod-usb3 kmod-i2c-gpio kmod-rtc-pcf8563 kmod-gpio-beeper \ - kmod-hwmon-core kmod-hwmon-gpiofan \ + kmod-hwmon-gpiofan \ kmod-md-mod kmod-md-raid0 kmod-md-raid1 kmod-fs-ext4 kmod-fs-xfs endef TARGET_DEVICES += shuttle_kd20 diff --git a/target/linux/oxnas/ox820/profiles/00-default.mk b/target/linux/oxnas/ox820/profiles/00-default.mk index fedf730088..c68d7cd9d6 100644 --- a/target/linux/oxnas/ox820/profiles/00-default.mk +++ b/target/linux/oxnas/ox820/profiles/00-default.mk @@ -9,9 +9,8 @@ define Profile/Default NAME:=Default Profile PRIORITY:=1 PACKAGES:=\ - kmod-i2c-gpio kmod-gpio-beeper kmod-hwmon-core \ - kmod-hwmon-gpiofan kmod-rtc-pcf8563 kmod-rtc-ds1307 \ - kmod-usb3 + kmod-i2c-gpio kmod-gpio-beeper kmod-hwmon-gpiofan \ + kmod-rtc-pcf8563 kmod-rtc-ds1307 kmod-usb3 endef define Profile/Default/Description diff --git a/target/linux/ramips/dts/mt7628an_totolink_a3.dts b/target/linux/ramips/dts/mt7628an_totolink_a3.dts new file mode 100644 index 0000000000..87dd8559b7 --- /dev/null +++ b/target/linux/ramips/dts/mt7628an_totolink_a3.dts @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7628an_iptime.dtsi" + +/ { + compatible = "totolink,a3", "mediatek,mt7628an-soc"; + model = "TOTOLINK A3"; + + aliases { + led-boot = &led_cpu; + led-failsafe = &led_cpu; + led-running = &led_cpu; + led-upgrade = &led_cpu; + }; + + leds { + compatible = "gpio-leds"; + + led_cpu: cpu { + label = "a3:blue:cpu"; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + }; + + wlan { + label = "a3:blue:wlan"; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + }; +}; + +&esw { + mediatek,portmap = <0x3e>; + mediatek,portdisable = <0x32>; +}; diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index faa2ca1c5a..51f630f42a 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -229,6 +229,15 @@ define Device/tama_w06 endef TARGET_DEVICES += tama_w06 +define Device/totolink_a3 + IMAGE_SIZE := 7936k + UIMAGE_NAME := za3 + DEVICE_VENDOR := TOTOLINK + DEVICE_MODEL := A3 + DEVICE_PACKAGES := kmod-mt76x2 +endef +TARGET_DEVICES += totolink_a3 + define Device/totolink_lr1200 IMAGE_SIZE := 7872k DEVICE_VENDOR := TOTOLINK diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index f63891ac7c..155e86e3d3 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -111,7 +111,7 @@ define Device/allnet_all5002 DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL5002 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x + kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x SUPPORTED_DEVICES += all5002 endef TARGET_DEVICES += allnet_all5002 @@ -122,7 +122,7 @@ define Device/allnet_all5003 DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL5003 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x + kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x SUPPORTED_DEVICES += all5003 endef TARGET_DEVICES += allnet_all5003 @@ -184,7 +184,7 @@ define Device/asiarf_awm002-evb-4m DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWM002-EVB DEVICE_VARIANT := 4M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-gpio + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-gpio SUPPORTED_DEVICES += awm002-evb-4M endef TARGET_DEVICES += asiarf_awm002-evb-4m @@ -195,7 +195,7 @@ define Device/asiarf_awm002-evb-8m DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWM002-EVB/AWM003-EVB DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-gpio + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-gpio SUPPORTED_DEVICES += awm002-evb-8M endef TARGET_DEVICES += asiarf_awm002-evb-8m @@ -727,7 +727,7 @@ define Device/nixcore_x1-16m DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ kmod-spi-dev SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-16M endef @@ -739,7 +739,7 @@ define Device/nixcore_x1-8m DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ kmod-spi-dev SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-8M endef @@ -750,7 +750,7 @@ define Device/olimex_rt5350f-olinuxino IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ kmod-spi-dev SUPPORTED_DEVICES += rt5350f-olinuxino endef @@ -761,7 +761,7 @@ define Device/olimex_rt5350f-olinuxino-evb IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino-EVB - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ kmod-spi-dev SUPPORTED_DEVICES += rt5350f-olinuxino-evb endef @@ -1100,7 +1100,7 @@ define Device/vocore_vocore-16m DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ kmod-spi-dev SUPPORTED_DEVICES += vocore vocore-16M endef @@ -1112,7 +1112,7 @@ define Device/vocore_vocore-8m DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-ralink \ kmod-spi-dev SUPPORTED_DEVICES += vocore vocore-8M endef diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk index 89bdc6c95c..1ce914439c 100644 --- a/target/linux/ramips/modules.mk +++ b/target/linux/ramips/modules.mk @@ -47,7 +47,7 @@ I2C_RALINK_MODULES:= \ define KernelPackage/i2c-ralink $(call i2c_defaults,$(I2C_RALINK_MODULES),59) TITLE:=Ralink I2C Controller - DEPENDS:=kmod-i2c-core @TARGET_ramips \ + DEPENDS:=+kmod-i2c-core @TARGET_ramips \ @!(TARGET_ramips_mt7621||TARGET_ramips_mt76x8) endef @@ -64,7 +64,7 @@ I2C_MT7621_MODULES:= \ define KernelPackage/i2c-mt7628 $(call i2c_defaults,$(I2C_MT7621_MODULES),59) TITLE:=MT7628/88 I2C Controller - DEPENDS:=kmod-i2c-core \ + DEPENDS:=+kmod-i2c-core \ @(TARGET_ramips_mt76x8) endef diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index 913a0817dc..5230717506 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -72,7 +72,8 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan" "1:lan" "4:wan" "6@eth0" ;; - iptime,a3) + iptime,a3|\ + totolink,a3) ucidef_add_switch "switch0" \ "2:lan:2" "3:lan:1" "0:wan" "6@eth0" ;; @@ -166,7 +167,8 @@ ramips_setup_macs() wan_mac=$(macaddr_add "$lan_mac" 1) ;; iptime,a3|\ - iptime,a604m) + iptime,a604m|\ + totolink,a3) wan_mac=$(mtd_get_mac_binary u-boot 0x1fc40) ;; mediatek,linkit-smart-7688|\