Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2023-08-14 23:20:31 +05:30 committed by GitHub
commit 2e59258247
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/firmware/linux-firmware/intel.mk
View file

@ -173,14 +173,14 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl9260))
Package/iwlwifi-firmware-ax200 = $(call Package/firmware-default,Intel AX200 firmware) Package/iwlwifi-firmware-ax200 = $(call Package/firmware-default,Intel AX200 firmware)
define Package/iwlwifi-firmware-ax200/install define Package/iwlwifi-firmware-ax200/install
$(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DIR) $(1)/lib/firmware
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-66.ucode $(1)/lib/firmware $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-72.ucode $(1)/lib/firmware
endef endef
$(eval $(call BuildPackage,iwlwifi-firmware-ax200)) $(eval $(call BuildPackage,iwlwifi-firmware-ax200))
Package/iwlwifi-firmware-ax210 = $(call Package/firmware-default,Intel AX210 firmware) Package/iwlwifi-firmware-ax210 = $(call Package/firmware-default,Intel AX210 firmware)
define Package/iwlwifi-firmware-ax210/install define Package/iwlwifi-firmware-ax210/install
$(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DIR) $(1)/lib/firmware
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-66.ucode $(1)/lib/firmware $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-72.ucode $(1)/lib/firmware
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware
endef endef
$(eval $(call BuildPackage,iwlwifi-firmware-ax210)) $(eval $(call BuildPackage,iwlwifi-firmware-ax210))

20
target/linux/ipq40xx/image/generic.mk
View file

@ -756,28 +756,26 @@ define Device/luma_wrtq-329acn
endef endef
TARGET_DEVICES += luma_wrtq-329acn TARGET_DEVICES += luma_wrtq-329acn
define Device/meraki_mr33 define Device/meraki_common
$(call Device/FitImage) $(call Device/FitImage)
DEVICE_VENDOR := Cisco Meraki DEVICE_VENDOR := Cisco Meraki
DEVICE_MODEL := MR33
SOC := qcom-ipq4029 SOC := qcom-ipq4029
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct DEVICE_DTS_LOADADDR := 0x89000000
DEFAULT := n DEVICE_PACKAGES := ath10k-firmware-qca9887-ct
endef
define Device/meraki_mr33
$(call Device/meraki_common)
DEVICE_MODEL := MR33
endef endef
TARGET_DEVICES += meraki_mr33 TARGET_DEVICES += meraki_mr33
define Device/meraki_mr74 define Device/meraki_mr74
$(call Device/FitImage) $(call Device/meraki_common)
DEVICE_VENDOR := Cisco Meraki
DEVICE_MODEL := MR74 DEVICE_MODEL := MR74
SOC := qcom-ipq4029
BLOCKSIZE := 128k
PAGESIZE := 2048
DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct
DEVICE_DTS_CONFIG := config@3 DEVICE_DTS_CONFIG := config@3
DEFAULT := n
endef endef
TARGET_DEVICES += meraki_mr74 TARGET_DEVICES += meraki_mr74

4
tools/xz/Makefile
View file

@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=xz PKG_NAME:=xz
PKG_VERSION:=5.4.3 PKG_VERSION:=5.4.4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/lzmautils \ PKG_SOURCE_URL:=@SF/lzmautils \
http://tukaani.org/xz http://tukaani.org/xz
PKG_HASH:=9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90 PKG_HASH:=0b6fcde1ac38e90433a2556f500c065950b9bcd2d602006efc334782bdfe6296
PKG_CPE_ID:=cpe:/a:tukaani:xz PKG_CPE_ID:=cpe:/a:tukaani:xz
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1