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-03-03 11:09:24 +08:00
commit 95a8510ab2
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/prereq-build.mk
View File

@ -125,7 +125,6 @@ $(eval $(call SetupHostCommand,grep,Please install GNU 'grep', \
$(eval $(call SetupHostCommand,getopt, \
Please install an extended getopt version that supports --long, \
gnugetopt -o t --long test -- --test | grep '^ *--test *--', \
/usr/local/bin/getopt -o t --long test -- --test | grep '^ *--test *--', \
getopt -o t --long test -- --test | grep '^ *--test *--'))
$(eval $(call SetupHostCommand,stat,Cannot find a file stat utility, \

4
package/kernel/linux/modules/iio.mk
View File

@ -303,7 +303,7 @@ $(eval $(call KernelPackage,iio-st_accel))
define KernelPackage/iio-st_sensors-i2c
SUBMENU:=$(IIO_MENU)
TITLE:=STMicroelectronics accelerometer 3-Axis Driver (I2C)
DEPENDS:=+kmod-iio-st_accel +kmod-i2c-core
DEPENDS:=+kmod-iio-st_accel +kmod-i2c-core +kmod-regmap-i2c
KCONFIG:= CONFIG_IIO_ST_ACCEL_I2C_3AXIS
FILES:=$(LINUX_DIR)/drivers/iio/common/st_sensors/st_sensors_i2c.ko
AUTOLOAD:=$(call AutoLoad,56,st_sensors_i2c)
@ -319,7 +319,7 @@ $(eval $(call KernelPackage,iio-st_sensors-i2c))
define KernelPackage/iio-st_sensors-spi
SUBMENU:=$(IIO_MENU)
TITLE:=STMicroelectronics accelerometer 3-Axis Driver (SPI)
DEPENDS:=+kmod-iio-st_accel
DEPENDS:=+kmod-iio-st_accel +kmod-regmap-spi
KCONFIG:= CONFIG_IIO_ST_ACCEL_SPI_3AXIS
FILES:=$(LINUX_DIR)/drivers/iio/common/st_sensors/st_sensors_spi.ko
AUTOLOAD:=$(call AutoLoad,56,st_sensors_spi)

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

@ -79,7 +79,7 @@ endef
define Build/asus-trx
$(STAGING_DIR_HOST)/bin/asustrx \
-p $(PRODUCTID) -i $@ -o $@.new
-p $(ASUS_PRODUCTID) -i $@ -o $@.new
mv $@.new $@
endef
@ -107,8 +107,10 @@ define Build/seama-nand
-i $@.entity
endef
DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD
DEVICE_VARS += ASUS_PRODUCTID
DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR
DEVICE_VARS += SIGNATURE
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD
DEVICE_VARS += LUXUL_BOARD
IEEE8021X := wpad-basic
@ -138,35 +140,40 @@ define Device/Default
endef
define Device/asus
DEVICE_VENDOR := ASUS
IMAGES := trx
IMAGE/trx := append-ubi | trx-nand | asus-trx
endef
define Device/asus-rt-ac56u
DEVICE_VENDOR := ASUS
$(call Device/asus)
DEVICE_MODEL := RT-AC56U
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
ASUS_PRODUCTID := RT-AC56U
endef
TARGET_DEVICES += asus-rt-ac56u
define Device/asus-rt-ac68u
DEVICE_VENDOR := ASUS
$(call Device/asus)
DEVICE_MODEL := RT-AC68U
DEVICE_PACKAGES := $(USB3_PACKAGES)
ASUS_PRODUCTID := RT-AC68U
endef
TARGET_DEVICES += asus-rt-ac68u
define Device/asus-rt-ac87u
DEVICE_VENDOR := ASUS
$(call Device/asus)
DEVICE_MODEL := RT-AC87U
DEVICE_PACKAGES := $(USB3_PACKAGES)
ASUS_PRODUCTID := RT-AC87U
endef
TARGET_DEVICES += asus-rt-ac87u
define Device/asus-rt-n18u
DEVICE_VENDOR := ASUS
$(call Device/asus)
DEVICE_MODEL := RT-N18U
DEVICE_PACKAGES := $(USB3_PACKAGES)
ASUS_PRODUCTID := RT-N18U
endef
TARGET_DEVICES += asus-rt-n18u

4
target/linux/x86/64/config-5.4
View File

@ -70,8 +70,8 @@ CONFIG_BLK_MQ_VIRTIO=y
CONFIG_BLK_PM=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
CONFIG_BTT=y
CONFIG_CALGARY_IOMMU=y
CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
# CONFIG_CALGARY_IOMMU is not set
# CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set
CONFIG_CONNECTOR=y
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set