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

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-02-24 13:44:49 +08:00
commit 9c81dd407f
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/kernel/lantiq/ltq-vdsl-mei/Makefile
View File

@ -38,7 +38,7 @@ define KernelPackage/ltq-vdsl-vr9-mei/description
endef
define Package/ltq-vdsl-mei_test
define Package/ltq-vdsl-mei-test
SECTION:=net
CATEGORY:=Network
TITLE:=Lantiq mei driver test tool
@ -46,7 +46,7 @@ define Package/ltq-vdsl-mei_test
DEPENDS:=@TARGET_lantiq_xrx200
endef
define Package/ltq-vdsl-mei_test/description
define Package/ltq-vdsl-mei-test/description
Userland tool to directly control the mei driver, this is only needed
for test and development purposes.
endef
@ -80,9 +80,9 @@ endef
$(eval $(call KernelPackage,ltq-vdsl-vr9-mei))
define Package/ltq-vdsl-mei_test/install
define Package/ltq-vdsl-mei-test/install
$(INSTALL_DIR) $(1)/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mei_cpe_drv_test $(1)/bin
endef
$(eval $(call BuildPackage,ltq-vdsl-mei_test))
$(eval $(call BuildPackage,ltq-vdsl-mei-test))

4
package/system/urandom-seed/Makefile
View File

@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
define Package/urandom-seed
SECTION:=base
CATEGORY:=Base system
DEPENDS:=+getrandom
@ -25,7 +25,7 @@ define Build/Compile/Default
endef
Build/Compile = $(Build/Compile/Default)
define Package/$(PKG_NAME)/install
define Package/urandom-seed/install
$(CP) ./files/* $(1)/
endef

8
package/system/urngd/Makefile
View File

@ -17,14 +17,14 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/$(PKG_NAME)
define Package/urngd
SECTION:=utils
CATEGORY:=Base system
TITLE:=OpenWrt non-physical true random number generator based on timing jitter
DEPENDS:=+libubox
endef
define Package/$(PKG_NAME)/description
define Package/urngd/description
urngd is OpenWrt's micro non-physical true random number generator based on
timing jitter.
@ -38,11 +38,11 @@ define Package/$(PKG_NAME)/description
Jitter RNGd provides a source of sufficient entropy.
endef
define Package/$(PKG_NAME)/install
define Package/urngd/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin/$(PKG_NAME)
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,urngd))

6
target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
View File

@ -113,6 +113,12 @@
phy12: ethernet-phy@c {
reg = <0xc>;
phy-mode = "mii";
resets = <&rst 8>;
reset-names = "phy";
reset-assert-us = <10000>;
reset-deassert-us = <10000>;
};
};

33
target/linux/kirkwood/base-files/etc/init.d/hwmon_fancontrol
View File

@ -1,23 +1,22 @@
#!/bin/sh /etc/rc.common
START=98
boot() {
. /lib/functions.sh
# configuring (lm85/lm63) onboard temp/fan controller to run the fan on its own
# for more information, please read https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
#configuring (lm85/lm63) onboard temp/fan controller to run the fan on its own
#for more information, please read https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
case $(board_name) in
zyxel,nsa310b)
path_to_hwmon='/sys/devices/platform/ocp@f1000000/f1011000.i2c/i2c-0/0-002e/hwmon/hwmon0'
echo 2 > "$path_to_hwmon/pwm1_enable" # fan is on pwm1
echo 1 > "$path_to_hwmon/pwm1_auto_channels" # temp1 is the only one that changes
echo 23000 > "$path_to_hwmon/temp1_auto_temp_min"
echo 43000 > "$path_to_hwmon/temp1_auto_temp_max" # next step is 49600 millicelsius, or 50 celsius, 43 celsius is better
;;
iom,ix2-200)
path_to_hwmon='/sys/class/hwmon/hwmon0'
echo 2 > "$path_to_hwmon/pwm1_enable" # fan is on pwm1
;;
esac
case $(board_name) in
iom,ix2-200)
path_to_hwmon='/sys/class/hwmon/hwmon0'
echo 2 > "$path_to_hwmon/pwm1_enable" # fan is on pwm1
;;
zyxel,nsa310b)
path_to_hwmon='/sys/devices/platform/ocp@f1000000/f1011000.i2c/i2c-0/0-002e/hwmon/hwmon0'
echo 2 > "$path_to_hwmon/pwm1_enable" # fan is on pwm1
echo 1 > "$path_to_hwmon/pwm1_auto_channels" # temp1 is the only one that changes
echo 23000 > "$path_to_hwmon/temp1_auto_temp_min"
echo 43000 > "$path_to_hwmon/temp1_auto_temp_max" # next step is 49600 millicelsius, or 50 celsius, 43 celsius is better
;;
esac
}

19
target/linux/kirkwood/image/Makefile
View File

@ -62,22 +62,24 @@ define Device/iom_iconnect-1.1
endef
TARGET_DEVICES += iom_iconnect-1.1
define Device/iom_ix2_200
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-i2c-mv64xxx kmod-hwmon-lm63
DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-i2c-mv64xxx kmod-hwmon-core \
kmod-hwmon-lm63
DEVICE_TYPE:=nas
PAGESIZE := 512
SUBPAGESIZE := 256
BLOCKSIZE := 16KiB
BLOCKSIZE := 16k
KERNEL_SIZE := 3072k
KERNEL_IN_UBI :=
UBINIZE_OPTS := -E 5
IMAGE_SIZE := 32505856
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
IMAGE_SIZE := 31744k
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \
check-size $$$$(IMAGE_SIZE)
endef
TARGET_DEVICES += iom_ix2_200
TARGET_DEVICES += iom_ix2-200
define Device/linksys_audi
DEVICE_VENDOR := Linksys
@ -85,7 +87,7 @@ define Device/linksys_audi
DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug
PAGESIZE := 512
SUBPAGESIZE := 256
BLOCKSIZE := 16KiB
BLOCKSIZE := 16k
KERNEL_SIZE := 2624k
KERNEL_IN_UBI :=
UBINIZE_OPTS := -E 5
@ -137,7 +139,8 @@ TARGET_DEVICES += seagate_goflexhome
define Device/zyxel_nsa310b
DEVICE_VENDOR := ZyXEL
DEVICE_MODEL := NSA310b
DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-lm85
DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-core \
kmod-hwmon-lm85
BOARD_NAME := nsa310b
endef
TARGET_DEVICES += zyxel_nsa310b

6
target/linux/x86/modules.mk
View File

@ -20,7 +20,7 @@ endef
$(eval $(call KernelPackage,sound-cs5535audio))
define KernelPackage/sp5100_tco
define KernelPackage/sp5100-tco
SUBMENU:=$(OTHER_MENU)
TITLE:=SP5100 Watchdog Support
DEPENDS:=@TARGET_x86
@ -29,8 +29,8 @@ define KernelPackage/sp5100_tco
AUTOLOAD:=$(call AutoLoad,50,sp5100_tco,1)
endef
define KernelPackage/sp5100_tco/description
define KernelPackage/sp5100-tco/description
Kernel module for the SP5100_TCO hardware watchdog.
endef
$(eval $(call KernelPackage,sp5100_tco))
$(eval $(call KernelPackage,sp5100-tco))