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

Merge branch 'master' of https://github.com/DifuseHQ/difos

Browse source
This commit is contained in:
hayzamjs 2023-01-08 01:42:15 +01:00
commit 8eb3a77782
403 changed files with 16973 additions and 3681 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/bug-report.yml vendored
View file

@ -32,7 +32,9 @@ body:
id: device id: device
attributes: attributes:
label: Device label: Device
description: The device exhibiting this bug. description: |
The device exhibiting this bug (if unsure, use command below).
```cat /tmp/sysinfo/model```
validations: validations:
required: true required: true
- type: dropdown - type: dropdown

2
.github/workflows/build.yml vendored
View file

@ -169,7 +169,7 @@ jobs:
fi fi
if [ -n "$major_ver" ]; then if [ -n "$major_ver" ]; then
git fetch --tags git fetch --tags -f
latest_tag="$(git tag --sort=-creatordate -l $major_ver* | head -n1)" latest_tag="$(git tag --sort=-creatordate -l $major_ver* | head -n1)"
if [ -n "$latest_tag" ]; then if [ -n "$latest_tag" ]; then
TOOLCHAIN_PATH=releases/$(echo $latest_tag | sed 's/^v//') TOOLCHAIN_PATH=releases/$(echo $latest_tag | sed 's/^v//')

14
include/image-commands.mk
View file

@ -306,11 +306,25 @@ define Build/fit
@mv $@.new $@ @mv $@.new $@
endef endef
define Build/libdeflate-gzip
$(STAGING_DIR_HOST)/bin/libdeflate-gzip -f -12 -c $@ $(1) > $@.new
@mv $@.new $@
endef
define Build/gzip define Build/gzip
$(STAGING_DIR_HOST)/bin/gzip -f -9n -c $@ $(1) > $@.new $(STAGING_DIR_HOST)/bin/gzip -f -9n -c $@ $(1) > $@.new
@mv $@.new $@ @mv $@.new $@
endef endef
define Build/gzip-filename
@mkdir -p $@.tmp
@cp $@ $@.tmp/$(word 1,$(1))
$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $@.tmp/$(word 1,$(1)) $(word 2,$(1)))
$(STAGING_DIR_HOST)/bin/gzip -f -9 -N -c $@.tmp/$(word 1,$(1)) $(word 2,$(1)) > $@.new
@mv $@.new $@
@rm -rf $@.tmp
endef
define Build/install-dtb define Build/install-dtb
$(call locked, \ $(call locked, \
$(foreach dts,$(DEVICE_DTS), \ $(foreach dts,$(DEVICE_DTS), \

2
include/image.mk
View file

@ -359,6 +359,7 @@ define Device/Init
ARTIFACTS := ARTIFACTS :=
DEVICE_IMG_PREFIX := $(IMG_PREFIX)-$(1) DEVICE_IMG_PREFIX := $(IMG_PREFIX)-$(1)
DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2) DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2)
FACTORY_IMG_NAME :=
IMAGE_SIZE := IMAGE_SIZE :=
KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX) KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
KERNEL_SUFFIX := -kernel.bin KERNEL_SUFFIX := -kernel.bin
@ -418,6 +419,7 @@ DEFAULT_DEVICE_VARS := \
DEVICE_FDT_NUM DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \ DEVICE_FDT_NUM DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \
SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \ SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
UBOOT_PATH IMAGE_SIZE \ UBOOT_PATH IMAGE_SIZE \
FACTORY_IMG_NAME \
DEVICE_PACKAGES DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \ DEVICE_PACKAGES DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \
DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \ DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \
DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \ DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \

4
include/kernel-5.10
View file

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .161 LINUX_VERSION-5.10 = .162
LINUX_KERNEL_HASH-5.10.161 = 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 LINUX_KERNEL_HASH-5.10.162 = 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217

4
include/kernel-5.15
View file

@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .85 LINUX_VERSION-5.15 = .86
LINUX_KERNEL_HASH-5.15.85 = 2c0bae29fac98e0a9408914a4551b2971365ac0000351cb255d6bd9aa0849808 LINUX_KERNEL_HASH-5.15.86 = 80fcd9efa443502de9e2750f6dfb59e8de43a5d87a6d2be09dca748d79b5f2ee

27
package/base-files/files/lib/functions/system.sh
View file

@ -129,11 +129,22 @@ mtd_get_mac_encrypted_deco() {
echo $macaddr echo $macaddr
} }
mtd_get_mac_uci_config_ubi() {
local volumename="$1"
. /lib/upgrade/nand.sh
local ubidev=$(nand_attach_ubi $CI_UBIPART)
local part=$(nand_find_volume $ubidev $volumename)
cat "/dev/$part" | sed -n 's/^\s*option macaddr\s*'"'"'\?\([0-9A-F:]\+\)'"'"'\?/\1/Ip'
}
mtd_get_mac_text() { mtd_get_mac_text() {
local mtdname=$1 local mtdname="$1"
local offset=$(($2)) local offset=$((${2:-0}))
local length="${3:-17}"
local part local part
local mac_dirty
part=$(find_mtd_part "$mtdname") part=$(find_mtd_part "$mtdname")
if [ -z "$part" ]; then if [ -z "$part" ]; then
@ -141,15 +152,9 @@ mtd_get_mac_text() {
return return
fi fi
if [ -z "$offset" ]; then [ $((offset + length)) -le $(mtd_get_part_size "$mtdname") ] || return
echo "mtd_get_mac_text: offset missing!" >&2
return
fi
mac_dirty=$(dd if="$part" bs=1 skip="$offset" count=17 2>/dev/null) macaddr_canonicalize $(dd bs=1 if="$part" skip="$offset" count="$length" 2>/dev/null)
# "canonicalize" mac
[ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
} }
mtd_get_mac_binary() { mtd_get_mac_binary() {

2
package/base-files/files/lib/upgrade/stage2
View file

@ -41,7 +41,7 @@ switch_to_ramfs() {
pivot_root mount_root reboot sync kill sleep \ pivot_root mount_root reboot sync kill sleep \
md5sum hexdump cat zcat dd tar gzip \ md5sum hexdump cat zcat dd tar gzip \
ls basename find cp mv rm mkdir rmdir mknod touch chmod \ ls basename find cp mv rm mkdir rmdir mknod touch chmod \
'[' printf wc grep awk sed cut sort \ '[' printf wc grep awk sed cut sort tail \
mtd partx losetup mkfs.ext4 nandwrite flash_erase \ mtd partx losetup mkfs.ext4 nandwrite flash_erase \
ubiupdatevol ubiattach ubiblock ubiformat \ ubiupdatevol ubiattach ubiblock ubiformat \
ubidetach ubirsvol ubirmvol ubimkvol \ ubidetach ubirsvol ubirmvol ubimkvol \

2
package/boot/arm-trusted-firmware-mvebu/Makefile
View file

@ -125,6 +125,8 @@ TFA_MAKE_FLAGS += \
WTP=$(BUILD_DIR)/$(A3700_UTILS_NAME) \ WTP=$(BUILD_DIR)/$(A3700_UTILS_NAME) \
WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE)/wtmi_app.bin \ WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE)/wtmi_app.bin \
CRYPTOPP_PATH=$(BUILD_DIR)/$(CRYPTOPP_NAME) \ CRYPTOPP_PATH=$(BUILD_DIR)/$(CRYPTOPP_NAME) \
HOST_LDFLAGS="$(HOST_LDFLAGS)" \
HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \
USE_COHERENT_MEM=0 \ USE_COHERENT_MEM=0 \
FIP_ALIGN=0x100 \ FIP_ALIGN=0x100 \
DDR_TOPOLOGY=$(DDR_TOPOLOGY) \ DDR_TOPOLOGY=$(DDR_TOPOLOGY) \

13
package/boot/arm-trusted-firmware-mvebu/patches/002-cryptopp_ldflags.patch Normal file
View file

@ -0,0 +1,13 @@
Forward the host compiler flags to the compilation of the cryptopp library.
--- a/plat/marvell/armada/a3k/common/a3700_common.mk
+++ b/plat/marvell/armada/a3k/common/a3700_common.mk
@@ -149,7 +149,7 @@ $(TBB): FORCE
$(if $(wildcard $(CRYPTOPP_LIBDIR)/*),,$(error "Either 'CRYPTOPP_PATH' or 'CRYPTOPP_LIB' was set to '$(CRYPTOPP_LIBDIR)', but '$(CRYPTOPP_LIBDIR)' does not exist"))
$(if $(wildcard $(CRYPTOPP_INCDIR)/*),,$(error "Either 'CRYPTOPP_PATH' or 'CRYPTOPP_INCDIR' was set to '$(CRYPTOPP_INCDIR)', but '$(CRYPTOPP_INCDIR)' does not exist"))
ifdef CRYPTOPP_PATH
- $(Q)$(MAKE) --no-print-directory -C $(CRYPTOPP_PATH) -f GNUmakefile
+ $(Q)$(MAKE) --no-print-directory -C $(CRYPTOPP_PATH) -f GNUmakefile LDFLAGS="$(HOST_LDFLAGS)" CPPFLAGS="$(HOST_CPPFLAGS)"
endif
$(Q)$(MAKE) --no-print-directory -C $(WTP)/wtptp/src/TBB_Linux -f TBB_linux.mak LIBDIR=$(CRYPTOPP_LIBDIR) INCDIR=$(CRYPTOPP_INCDIR)

42
package/boot/arm-trusted-firmware-sunxi/Makefile
View file

@ -25,40 +25,28 @@ include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/trusted-firmware-a.mk include $(INCLUDE_DIR)/trusted-firmware-a.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Trusted-Firmware-A/Default
define Package/arm-trusted-firmware-sunxi/Default BUILD_TARGET:=sunxi
SECTION:=boot BUILD_SUBTARGET:=cortexa53
CATEGORY:=Boot Loaders
TITLE:=ARM Trusted Firmware for Allwinner
DEPENDS:=@TARGET_sunxi_cortexa53
endef endef
define Package/arm-trusted-firmware-sunxi-a64 define Trusted-Firmware-A/sunxi-a64
$(call Package/arm-trusted-firmware-sunxi/Default) NAME:=Allwinner A64
VARIANT:=sun50i_a64 PLAT:=sun50i_a64
endef endef
define Package/arm-trusted-firmware-sunxi-h6 define Trusted-Firmware-A/sunxi-h6
$(call Package/arm-trusted-firmware-sunxi/Default) NAME:=Allwinner H6
VARIANT:=sun50i_h6 PLAT:=sun50i_h6
endef endef
export GCC_HONOUR_COPTS=s TFA_TARGETS:= \
sunxi-a64 \
sunxi-h6
MAKE_VARS = \ define Package/trusted-firmware-a/install
CROSS_COMPILE="$(TARGET_CROSS)"
MAKE_FLAGS += \
PLAT=$(BUILD_VARIANT) \
bl31
define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(CP) $(PKG_BUILD_DIR)/build/$(BUILD_VARIANT)/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31_$(BUILD_VARIANT).bin $(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31_$(BUILD_VARIANT).bin
endef endef
define Package/arm-trusted-firmware-sunxi/install $(eval $(call BuildPackage/Trusted-Firmware-A))
endef
$(eval $(call BuildPackage,arm-trusted-firmware-sunxi-a64))
$(eval $(call BuildPackage,arm-trusted-firmware-sunxi-h6))

125
package/boot/tfa-layerscape/Makefile
View file

@ -18,6 +18,7 @@ PKG_MIRROR_HASH:=893f2d28a77dcc9d4413a619b4719ca5f1f4dc78dd824a8488e7d543e66bcf9
PKG_BUILD_DEPENDS:=tfa-layerscape/host PKG_BUILD_DEPENDS:=tfa-layerscape/host
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/trusted-firmware-a.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
HOST_CFLAGS += -Wall -Werror -pedantic -std=c99 HOST_CFLAGS += -Wall -Werror -pedantic -std=c99
@ -38,131 +39,97 @@ define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap
endef endef
define Package/tfa-generic define Trusted-Firmware-A/Default
SECTION:=boot BUILD_TARGET:=layerscape
CATEGORY:=Boot Loaders BUILD_SUBTARGET:=armv8_64b
DEPENDS:=@TARGET_layerscape_armv8_64b +layerscape-rcw +u-boot-fsl_$(subst tfa-,,$(1)) DEPENDS:=+layerscape-rcw +u-boot-fsl_$(1)
VARIANT:=$(subst tfa-,,$(1))
endef endef
define Package/tfa-ls1012a-frdm define Trusted-Firmware-A/ls1012a-frdm
$(Package/tfa-generic) NAME:=NXP LS1012AFRDM
TITLE:=NXP LS1012AFRDM Trusted Firmware
PLAT:=ls1012afrdm PLAT:=ls1012afrdm
BOOT_MODE:=qspi BOOT_MODE:=qspi
endef endef
define Package/tfa-ls1012a-rdb define Trusted-Firmware-A/ls1012a-rdb
$(Package/tfa-generic) NAME:=NXP LS1012ARDB
TITLE:=NXP LS1012ARDB Trusted Firmware
PLAT:=ls1012ardb PLAT:=ls1012ardb
BOOT_MODE:=qspi BOOT_MODE:=qspi
endef endef
define Package/tfa-ls1012a-frwy-sdboot define Trusted-Firmware-A/ls1012a-frwy-sdboot
$(Package/tfa-generic) NAME:=NXP LS1012AFRWY
TITLE:=NXP LS1012AFRWY Trusted Firmware
PLAT:=ls1012afrwy PLAT:=ls1012afrwy
BOOT_MODE:=qspi BOOT_MODE:=qspi
endef endef
define Package/tfa-ls1043a-rdb define Trusted-Firmware-A/ls1043a-rdb
$(Package/tfa-generic) NAME:=NXP LS1043ARDB
TITLE:=NXP LS1043ARDB Trusted Firmware
PLAT:=ls1043ardb PLAT:=ls1043ardb
BOOT_MODE:=nor BOOT_MODE:=nor
endef endef
define Package/tfa-ls1043a-rdb-sdboot define Trusted-Firmware-A/ls1043a-rdb-sdboot
$(Package/tfa-generic) NAME:=NXP LS1043ARDB SD Boot
TITLE:=NXP LS1043ARDB SD Boot Trusted Firmware
PLAT:=ls1043ardb PLAT:=ls1043ardb
BOOT_MODE:=sd BOOT_MODE:=sd
endef endef
define Package/tfa-ls1046a-frwy define Trusted-Firmware-A/ls1046a-frwy
$(Package/tfa-generic) NAME:=NXP LS1046AFRWY
TITLE:=NXP LS1046AFRWY Trusted Firmware
PLAT:=ls1046afrwy PLAT:=ls1046afrwy
BOOT_MODE:=qspi BOOT_MODE:=qspi
endef endef
define Package/tfa-ls1046a-frwy-sdboot define Trusted-Firmware-A/ls1046a-frwy-sdboot
$(Package/tfa-generic) NAME:=NXP LS1046AFRWY SD Boot
TITLE:=NXP LS1046AFRWY SD Boot Trusted Firmware
PLAT:=ls1046afrwy PLAT:=ls1046afrwy
BOOT_MODE:=sd BOOT_MODE:=sd
endef endef
define Package/tfa-ls1046a-rdb define Trusted-Firmware-A/ls1046a-rdb
$(Package/tfa-generic) NAME:=NXP LS1046ARDB
TITLE:=NXP LS1046ARDB Trusted Firmware
PLAT:=ls1046ardb PLAT:=ls1046ardb
BOOT_MODE:=qspi BOOT_MODE:=qspi
endef endef
define Package/tfa-ls1046a-rdb-sdboot define Trusted-Firmware-A/ls1046a-rdb-sdboot
$(Package/tfa-generic) NAME:=NXP LS1046ARDB SD Boot
TITLE:=NXP LS1046ARDB SD Boot Trusted Firmware
PLAT:=ls1046ardb PLAT:=ls1046ardb
BOOT_MODE:=sd BOOT_MODE:=sd
endef endef
define Package/tfa-ls1088a-rdb define Trusted-Firmware-A/ls1088a-rdb
$(Package/tfa-generic) NAME:=NXP LS1088ARDB
TITLE:=NXP LS1088ARDB Trusted Firmware
PLAT:=ls1088ardb PLAT:=ls1088ardb
BOOT_MODE:=qspi BOOT_MODE:=qspi
endef endef
define Package/tfa-ls1088a-rdb-sdboot define Trusted-Firmware-A/ls1088a-rdb-sdboot
$(Package/tfa-generic) NAME:=NXP LS1088ARDB SD Boot
TITLE:=NXP LS1088ARDB SD Boot Trusted Firmware
PLAT:=ls1088ardb PLAT:=ls1088ardb
BOOT_MODE:=sd BOOT_MODE:=sd
endef endef
define Package/tfa-ls2088a-rdb define Trusted-Firmware-A/ls2088a-rdb
$(Package/tfa-generic) NAME:=NXP LS2088ARDB
TITLE:=NXP LS2088ARDB Trusted Firmware
PLAT:=ls2088ardb PLAT:=ls2088ardb
BOOT_MODE:=nor BOOT_MODE:=nor
endef endef
define Package/tfa-lx2160a-rdb define Trusted-Firmware-A/lx2160a-rdb
$(Package/tfa-generic) NAME:=NXP LX2160ARDB
TITLE:=NXP LX2160ARDB Trusted Firmware
PLAT:=lx2160ardb PLAT:=lx2160ardb
BOOT_MODE:=flexspi_nor BOOT_MODE:=flexspi_nor
endef endef
define Package/tfa-lx2160a-rdb-sdboot define Trusted-Firmware-A/lx2160a-rdb-sdboot
$(Package/tfa-generic) NAME:=NXP LX2160ARDB SD Boot
TITLE:=NXP LX2160ARDB SD Boot Trusted Firmware
PLAT:=lx2160ardb PLAT:=lx2160ardb
BOOT_MODE:=sd BOOT_MODE:=sd
endef endef
define Build/InstallDev TFA_TARGETS := \
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl2_$(BOOT_MODE).pbl \
$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-bl2.pbl
$(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/fip.bin \
$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-fip.bin
endef
define Build/Compile
$(eval $(Package/tfa-$(BUILD_VARIANT))) \
$(MAKE) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS) \
fip pbl PLAT=$(PLAT) BOOT_MODE=$(BOOT_MODE) \
RCW=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-rcw.bin \
BL33=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-uboot.bin \
FIPTOOL=$(STAGING_DIR_HOST)/bin/fiptool-layerscape \
CREATE_PBL=$(STAGING_DIR_HOST)/bin/tfa-create-pbl \
BYTE_SWAP=$(STAGING_DIR_HOST)/bin/tfa-byte-swap
endef
TFAS := \
ls1012a-frdm \ ls1012a-frdm \
ls1012a-rdb \ ls1012a-rdb \
ls1012a-frwy-sdboot \ ls1012a-frwy-sdboot \
@ -178,7 +145,25 @@ TFAS := \
lx2160a-rdb \ lx2160a-rdb \
lx2160a-rdb-sdboot lx2160a-rdb-sdboot
TFA_MAKE_FLAGS += \
fip pbl \
BOOT_MODE=$(BOOT_MODE) \
RCW=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-rcw.bin \
BL33=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-uboot.bin \
FIPTOOL=$(STAGING_DIR_HOST)/bin/fiptool-layerscape \
CREATE_PBL=$(STAGING_DIR_HOST)/bin/tfa-create-pbl \
BYTE_SWAP=$(STAGING_DIR_HOST)/bin/tfa-byte-swap
define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl2_$(BOOT_MODE).pbl \
$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-bl2.pbl
$(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/fip.bin \
$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-fip.bin
endef
define Package/trusted-firmware-a/install/default
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))
$(foreach tfa,$(TFAS), \ $(eval $(call BuildPackage/Trusted-Firmware-A))
$(eval $(call BuildPackage,tfa-$(tfa))) \
)

2
package/boot/uboot-envtools/files/ipq40xx
View file

@ -63,7 +63,7 @@ linksys,ea8300|\
linksys,mr8300) linksys,mr8300)
ubootenv_add_uci_config "/dev/mtd7" "0x0" "0x40000" "0x20000" ubootenv_add_uci_config "/dev/mtd7" "0x0" "0x40000" "0x20000"
;; ;;
linksys,whw01-v1) linksys,whw01)
ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x40000" "0x10000" ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x40000" "0x10000"
;; ;;
zyxel,nbg6617) zyxel,nbg6617)

24
package/boot/uboot-sunxi/Makefile
View file

@ -29,7 +29,7 @@ define U-Boot/a64-olinuxino
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=Olimex A64-OLinuXino NAME:=Olimex A64-OLinuXino
BUILD_DEVICES:=olimex_a64-olinuxino BUILD_DEVICES:=olimex_a64-olinuxino
DEPENDS:=+PACKAGE_u-boot-olimex_a64-olinuxino:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-olimex_a64-olinuxino:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -38,7 +38,7 @@ define U-Boot/a64-olinuxino-emmc
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=Olimex A64-OLinuXino eMMC NAME:=Olimex A64-OLinuXino eMMC
BUILD_DEVICES:=olimex_a64-olinuxino-emmc BUILD_DEVICES:=olimex_a64-olinuxino-emmc
DEPENDS:=+PACKAGE_u-boot-olimex_a64-olinuxino-emmc:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-olimex_a64-olinuxino-emmc:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -207,7 +207,7 @@ endef
define U-Boot/orangepi_one_plus define U-Boot/orangepi_one_plus
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=Orange Pi One Plus (H6) NAME:=Orange Pi One Plus (H6)
DEPENDS:=+PACKAGE_u-boot-orangepi_one_plus:arm-trusted-firmware-sunxi-h6 DEPENDS:=+PACKAGE_u-boot-orangepi_one_plus:trusted-firmware-a-sunxi-h6
BUILD_DEVICES:=xunlong_orangepi-one-plus BUILD_DEVICES:=xunlong_orangepi-one-plus
UENV:=h6 UENV:=h6
ATF:=h6 ATF:=h6
@ -247,7 +247,7 @@ define U-Boot/libretech_all_h3_cc_h5
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=Libre Computer ALL-H3-CC H5 NAME:=Libre Computer ALL-H3-CC H5
BUILD_DEVICES:=libretech_all-h3-cc-h5 BUILD_DEVICES:=libretech_all-h3-cc-h5
DEPENDS:=+PACKAGE_u-boot-libretech_all_h3_cc_h5:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-libretech_all_h3_cc_h5:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -256,7 +256,7 @@ define U-Boot/nanopi_neo_plus2
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=NanoPi NEO Plus2 (H5) NAME:=NanoPi NEO Plus2 (H5)
BUILD_DEVICES:=friendlyarm_nanopi-neo-plus2 BUILD_DEVICES:=friendlyarm_nanopi-neo-plus2
DEPENDS:=+PACKAGE_u-boot-nanopi_neo_plus2:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-nanopi_neo_plus2:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -265,7 +265,7 @@ define U-Boot/nanopi_neo2
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=NanoPi NEO2 (H5) NAME:=NanoPi NEO2 (H5)
BUILD_DEVICES:=friendlyarm_nanopi-neo2 BUILD_DEVICES:=friendlyarm_nanopi-neo2
DEPENDS:=+PACKAGE_u-boot-nanopi_neo2:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-nanopi_neo2:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -274,7 +274,7 @@ define U-Boot/nanopi_r1s_h5
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=NanoPi R1S (H5) NAME:=NanoPi R1S (H5)
BUILD_DEVICES:=friendlyarm_nanopi-r1s-h5 BUILD_DEVICES:=friendlyarm_nanopi-r1s-h5
DEPENDS:=+PACKAGE_u-boot-nanopi_r1s_h5:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-nanopi_r1s_h5:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -283,7 +283,7 @@ define U-Boot/pine64_plus
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=Pine64 Plus A64 NAME:=Pine64 Plus A64
BUILD_DEVICES:=pine64_pine64-plus BUILD_DEVICES:=pine64_pine64-plus
DEPENDS:=+PACKAGE_u-boot-pine64_plus:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-pine64_plus:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -298,7 +298,7 @@ define U-Boot/sopine_baseboard
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=Sopine Baseboard NAME:=Sopine Baseboard
BUILD_DEVICES:=pine64_sopine-baseboard BUILD_DEVICES:=pine64_sopine-baseboard
DEPENDS:=+PACKAGE_u-boot-sopine_baseboard:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-sopine_baseboard:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -308,7 +308,7 @@ define U-Boot/orangepi_zero_plus
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=Xunlong Orange Pi Zero Plus NAME:=Xunlong Orange Pi Zero Plus
BUILD_DEVICES:=xunlong_orangepi-zero-plus BUILD_DEVICES:=xunlong_orangepi-zero-plus
DEPENDS:=+PACKAGE_u-boot-orangepi_zero_plus:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-orangepi_zero_plus:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -317,7 +317,7 @@ define U-Boot/orangepi_pc2
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
NAME:=Xunlong Orange Pi PC2 NAME:=Xunlong Orange Pi PC2
BUILD_DEVICES:=xunlong_orangepi-pc2 BUILD_DEVICES:=xunlong_orangepi-pc2
DEPENDS:=+PACKAGE_u-boot-orangepi_pc2:arm-trusted-firmware-sunxi-a64 DEPENDS:=+PACKAGE_u-boot-orangepi_pc2:trusted-firmware-a-sunxi-a64
UENV:=a64 UENV:=a64
ATF:=a64 ATF:=a64
endef endef
@ -385,7 +385,7 @@ UBOOT_TARGETS := \
UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
UBOOT_MAKE_FLAGS += \ UBOOT_MAKE_FLAGS += \
BL31=$(STAGING_DIR_IMAGE)/bl31_sun50i_$(ATF).bin BL31=$(STAGING_DIR_IMAGE)/bl31_sunxi-$(ATF).bin
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(INSTALL_DIR) $(STAGING_DIR_IMAGE)

31
package/kernel/mt76/Makefile
View file

@ -171,7 +171,7 @@ endef
define KernelPackage/mt7615-firmware define KernelPackage/mt7615-firmware
$(KernelPackage/mt76-default) $(KernelPackage/mt76-default)
TITLE:=MediaTek MT7615e firmware TITLE:=MediaTek MT7615e firmware
DEFAULT:=PACKAGE_kmod-mt7615e DEPENDS+=+kmod-mt7615e
endef endef
define KernelPackage/mt7615e define KernelPackage/mt7615e
@ -182,6 +182,12 @@ define KernelPackage/mt7615e
AUTOLOAD:=$(call AutoProbe,mt7615e) AUTOLOAD:=$(call AutoProbe,mt7615e)
endef endef
define KernelPackage/mt7622-firmware
$(KernelPackage/mt76-default)
TITLE:=MediaTek MT7622 firmware
DEPENDS+=+kmod-mt7615e
endef
define KernelPackage/mt7663-firmware-ap define KernelPackage/mt7663-firmware-ap
$(KernelPackage/mt76-default) $(KernelPackage/mt76-default)
TITLE:=MediaTek MT7663e firmware (optimized for AP) TITLE:=MediaTek MT7663e firmware (optimized for AP)
@ -218,10 +224,16 @@ define KernelPackage/mt7663u
AUTOLOAD:=$(call AutoProbe,mt7663u) AUTOLOAD:=$(call AutoProbe,mt7663u)
endef endef
define KernelPackage/mt7915-firmware
$(KernelPackage/mt76-default)
TITLE:=MediaTek MT7915 firmware
DEPENDS+=+kmod-mt7915e
endef
define KernelPackage/mt7915e define KernelPackage/mt7915e
$(KernelPackage/mt76-default) $(KernelPackage/mt76-default)
TITLE:=MediaTek MT7915e wireless driver TITLE:=MediaTek MT7915e wireless driver
DEPENDS+=@PCI_SUPPORT +kmod-mt7615-common +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
AUTOLOAD:=$(call AutoProbe,mt7915e) AUTOLOAD:=$(call AutoProbe,mt7915e)
endef endef
@ -439,9 +451,14 @@ define KernelPackage/mt7615-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7615_cr4.bin \ $(PKG_BUILD_DIR)/firmware/mt7615_cr4.bin \
$(PKG_BUILD_DIR)/firmware/mt7615_n9.bin \ $(PKG_BUILD_DIR)/firmware/mt7615_n9.bin \
$(PKG_BUILD_DIR)/firmware/mt7615_rom_patch.bin \ $(PKG_BUILD_DIR)/firmware/mt7615_rom_patch.bin \
$(if $(CONFIG_TARGET_mediatek_mt7622), \ $(1)/lib/firmware/mediatek
$(PKG_BUILD_DIR)/firmware/mt7622_n9.bin \ endef
$(PKG_BUILD_DIR)/firmware/mt7622_rom_patch.bin) \
define KernelPackage/mt7622-firmware/install
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
cp \
$(PKG_BUILD_DIR)/firmware/mt7622_n9.bin \
$(PKG_BUILD_DIR)/firmware/mt7622_rom_patch.bin \
$(1)/lib/firmware/mediatek $(1)/lib/firmware/mediatek
endef endef
@ -461,7 +478,7 @@ define KernelPackage/mt7663-firmware-sta/install
$(1)/lib/firmware/mediatek $(1)/lib/firmware/mediatek
endef endef
define KernelPackage/mt7915e/install define KernelPackage/mt7915-firmware/install
$(INSTALL_DIR) $(1)/lib/firmware/mediatek $(INSTALL_DIR) $(1)/lib/firmware/mediatek
cp \ cp \
$(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \ $(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \
@ -520,12 +537,14 @@ $(eval $(call KernelPackage,mt76-connac))
$(eval $(call KernelPackage,mt76-sdio)) $(eval $(call KernelPackage,mt76-sdio))
$(eval $(call KernelPackage,mt7615-common)) $(eval $(call KernelPackage,mt7615-common))
$(eval $(call KernelPackage,mt7615-firmware)) $(eval $(call KernelPackage,mt7615-firmware))
$(eval $(call KernelPackage,mt7622-firmware))
$(eval $(call KernelPackage,mt7615e)) $(eval $(call KernelPackage,mt7615e))
$(eval $(call KernelPackage,mt7663-firmware-ap)) $(eval $(call KernelPackage,mt7663-firmware-ap))
$(eval $(call KernelPackage,mt7663-firmware-sta)) $(eval $(call KernelPackage,mt7663-firmware-sta))
$(eval $(call KernelPackage,mt7663-usb-sdio)) $(eval $(call KernelPackage,mt7663-usb-sdio))
$(eval $(call KernelPackage,mt7663u)) $(eval $(call KernelPackage,mt7663u))
$(eval $(call KernelPackage,mt7663s)) $(eval $(call KernelPackage,mt7663s))
$(eval $(call KernelPackage,mt7915-firmware))
$(eval $(call KernelPackage,mt7915e)) $(eval $(call KernelPackage,mt7915e))
$(eval $(call KernelPackage,mt7916-firmware)) $(eval $(call KernelPackage,mt7916-firmware))
$(eval $(call KernelPackage,mt7986-firmware)) $(eval $(call KernelPackage,mt7986-firmware))

6
package/libs/libpcap/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libpcap PKG_NAME:=libpcap
PKG_VERSION:=1.10.1 PKG_VERSION:=1.10.2
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.tcpdump.org/release/ PKG_SOURCE_URL:=https://www.tcpdump.org/release/
PKG_HASH:=ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 PKG_HASH:=db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause

2
package/libs/libpcap/patches/100-no-openssl.patch
View file

@ -1,6 +1,6 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1042,7 +1042,6 @@ endif() @@ -1325,7 +1325,6 @@ endif()
# #
# OpenSSL/libressl. # OpenSSL/libressl.
# #

2
package/libs/libpcap/patches/102-skip-manpages.patch
View file

@ -9,7 +9,7 @@ Subject: [PATCH] skip manpages
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -2732,57 +2732,6 @@ if(NOT MSVC) @@ -3325,57 +3325,6 @@ if(NOT MSVC)
if(MINGW) if(MINGW)
find_program(LINK_EXECUTABLE ln) find_program(LINK_EXECUTABLE ln)
endif(MINGW) endif(MINGW)

26
package/libs/libpcap/patches/201-space_optimization.patch
View file

@ -1,26 +0,0 @@
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -1662,14 +1662,23 @@ swap_pseudo_headers(int linktype, struct
break;
case DLT_USB_LINUX:
+#ifndef PCAP_SUPPORT_USB
+ return;
+#endif
swap_linux_usb_header(hdr, data, 0);
break;
case DLT_USB_LINUX_MMAPPED:
+#ifndef PCAP_SUPPORT_USB
+ return;
+#endif
swap_linux_usb_header(hdr, data, 1);
break;
case DLT_NFLOG:
+#ifndef PCAP_SUPPORT_NETFILTER
+ return;
+#endif
swap_nflog_header(hdr, data);
break;
}

30
package/libs/libpcap/patches/300-Add-support-for-B.A.T.M.A.N.-Advanced.patch
View file

@ -1,4 +1,4 @@
From b86b960fbd5c215c9c0f43544935b9a25d9445c5 Mon Sep 17 00:00:00 2001 From 3d8d268320d2381021a409ff8d03533698dd6242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue> From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
Date: Mon, 23 Nov 2020 00:38:22 +0100 Date: Mon, 23 Nov 2020 00:38:22 +0100
Subject: [PATCH] Add support for B.A.T.M.A.N. Advanced Subject: [PATCH] Add support for B.A.T.M.A.N. Advanced
@ -220,16 +220,16 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
#endif #endif
--- a/gencode.c --- a/gencode.c
+++ b/gencode.c +++ b/gencode.c
@@ -74,6 +74,8 @@ @@ -60,6 +60,8 @@
#include "atmuni31.h"
#include "sunatmpos.h" #include "sunatmpos.h"
#include "pflog.h"
#include "ppp.h" #include "ppp.h"
+#include "batadv_packet.h" +#include "batadv_packet.h"
+#include "batadv_legacy_packet.h" +#include "batadv_legacy_packet.h"
#include "pcap/sll.h" #include "pcap/sll.h"
#include "pcap/ipnet.h" #include "pcap/ipnet.h"
#include "arcnet.h" #include "arcnet.h"
@@ -9501,6 +9503,168 @@ gen_geneve(compiler_state_t *cstate, bpf @@ -9436,6 +9438,168 @@ gen_geneve(compiler_state_t *cstate, bpf
return b1; return b1;
} }
@ -400,7 +400,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
static struct block * static struct block *
--- a/gencode.h --- a/gencode.h
+++ b/gencode.h +++ b/gencode.h
@@ -346,6 +346,9 @@ struct block *gen_pppoes(compiler_state_ @@ -358,6 +358,9 @@ struct block *gen_pppoes(compiler_state_
struct block *gen_geneve(compiler_state_t *, bpf_u_int32, int); struct block *gen_geneve(compiler_state_t *, bpf_u_int32, int);
@ -412,7 +412,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
struct block *gen_atmtype_abbrev(compiler_state_t *, int); struct block *gen_atmtype_abbrev(compiler_state_t *, int);
--- a/grammar.y.in --- a/grammar.y.in
+++ b/grammar.y.in +++ b/grammar.y.in
@@ -347,6 +347,7 @@ DIAG_OFF_BISON_BYACC @@ -375,6 +375,7 @@ DIAG_OFF_BISON_BYACC
%type <i> mtp2type %type <i> mtp2type
%type <blk> mtp3field %type <blk> mtp3field
%type <blk> mtp3fieldvalue mtp3value mtp3listvalue %type <blk> mtp3fieldvalue mtp3value mtp3listvalue
@ -420,7 +420,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
%token DST SRC HOST GATEWAY %token DST SRC HOST GATEWAY
@@ -365,7 +366,7 @@ DIAG_OFF_BISON_BYACC @@ -393,7 +394,7 @@ DIAG_OFF_BISON_BYACC
%token LEN %token LEN
%token IPV6 ICMPV6 AH ESP %token IPV6 ICMPV6 AH ESP
%token VLAN MPLS %token VLAN MPLS
@ -429,7 +429,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
%token ISO ESIS CLNP ISIS L1 L2 IIH LSP SNP CSNP PSNP %token ISO ESIS CLNP ISIS L1 L2 IIH LSP SNP CSNP PSNP
%token STP %token STP
%token IPX %token IPX
@@ -592,11 +593,40 @@ other: pqual TK_BROADCAST { CHECK_PTR_ @@ -620,11 +621,40 @@ other: pqual TK_BROADCAST { CHECK_PTR_
| PPPOES { CHECK_PTR_VAL(($$ = gen_pppoes(cstate, 0, 0))); } | PPPOES { CHECK_PTR_VAL(($$ = gen_pppoes(cstate, 0, 0))); }
| GENEVE pnum { CHECK_PTR_VAL(($$ = gen_geneve(cstate, $2, 1))); } | GENEVE pnum { CHECK_PTR_VAL(($$ = gen_geneve(cstate, $2, 1))); }
| GENEVE { CHECK_PTR_VAL(($$ = gen_geneve(cstate, 0, 0))); } | GENEVE { CHECK_PTR_VAL(($$ = gen_geneve(cstate, 0, 0))); }
@ -556,15 +556,15 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
} }
--- a/pcap-filter.manmisc.in --- a/pcap-filter.manmisc.in
+++ b/pcap-filter.manmisc.in +++ b/pcap-filter.manmisc.in
@@ -98,6 +98,7 @@ protos are: @@ -98,6 +98,7 @@ protocols are:
.BR arp , .BR arp ,
.BR rarp , .BR rarp ,
.BR decnet , .BR decnet ,
+.BR batadv , +.BR batadv ,
.BR sctp ,
.B tcp .B tcp
and and
.BR udp . @@ -400,7 +401,7 @@ True if the packet is an IPv6 multicast
@@ -361,7 +362,7 @@ True if the packet is an IPv6 multicast
.IP "\fBether proto \fIprotocol\fR" .IP "\fBether proto \fIprotocol\fR"
True if the packet is of ether type \fIprotocol\fR. True if the packet is of ether type \fIprotocol\fR.
\fIProtocol\fP can be a number or one of the names \fIProtocol\fP can be a number or one of the names
@ -573,7 +573,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
\fBipx\fP, \fBiso\fP, \fBlat\fP, \fBloopback\fP, \fBmopdl\fP, \fBmoprc\fP, \fBnetbeui\fP, \fBipx\fP, \fBiso\fP, \fBlat\fP, \fBloopback\fP, \fBmopdl\fP, \fBmoprc\fP, \fBnetbeui\fP,
\fBrarp\fP, \fBsca\fP or \fBstp\fP. \fBrarp\fP, \fBsca\fP or \fBstp\fP.
Note these identifiers (except \fBloopback\fP) are also keywords Note these identifiers (except \fBloopback\fP) are also keywords
@@ -415,7 +416,7 @@ the filter checks for the IPX etype in a @@ -454,7 +455,7 @@ the filter checks for the IPX etype in a
DSAP in the LLC header, the 802.3-with-no-LLC-header encapsulation of DSAP in the LLC header, the 802.3-with-no-LLC-header encapsulation of
IPX, and the IPX etype in a SNAP frame. IPX, and the IPX etype in a SNAP frame.
.RE .RE
@ -582,7 +582,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Abbreviations for: Abbreviations for:
.in +.5i .in +.5i
.nf .nf
@@ -752,6 +753,36 @@ For example: @@ -792,6 +793,36 @@ For example:
filters IPv4 protocol encapsulated in Geneve with VNI 0xb. This will filters IPv4 protocol encapsulated in Geneve with VNI 0xb. This will
match both IPv4 directly encapsulated in Geneve as well as IPv4 contained match both IPv4 directly encapsulated in Geneve as well as IPv4 contained
inside an Ethernet frame. inside an Ethernet frame.
@ -621,7 +621,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
\fIProtocol\fP can be a number or one of the names \fIProtocol\fP can be a number or one of the names
--- a/pcap/namedb.h --- a/pcap/namedb.h
+++ b/pcap/namedb.h +++ b/pcap/namedb.h
@@ -69,6 +69,8 @@ PCAP_API int pcap_nametoportrange(const @@ -70,6 +70,8 @@ PCAP_API int pcap_nametoportrange(const
PCAP_API int pcap_nametoproto(const char *); PCAP_API int pcap_nametoproto(const char *);
PCAP_API int pcap_nametoeproto(const char *); PCAP_API int pcap_nametoeproto(const char *);
PCAP_API int pcap_nametollc(const char *); PCAP_API int pcap_nametollc(const char *);
@ -632,7 +632,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
* Also, pcap_nametoport() returns the protocol along with the port number. * Also, pcap_nametoport() returns the protocol along with the port number.
--- a/scanner.l --- a/scanner.l
+++ b/scanner.l +++ b/scanner.l
@@ -344,6 +344,7 @@ mpls return MPLS; @@ -347,6 +347,7 @@ mpls return MPLS;
pppoed return PPPOED; pppoed return PPPOED;
pppoes return PPPOES; pppoes return PPPOES;
geneve return GENEVE; geneve return GENEVE;

6
package/libs/ncurses/Makefile
View file

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses PKG_NAME:=ncurses
PKG_CPE_ID:=cpe:/a:gnu:ncurses PKG_CPE_ID:=cpe:/a:gnu:ncurses
PKG_VERSION:=6.3 PKG_VERSION:=6.4
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_HASH:=97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 PKG_HASH:=6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=README PKG_LICENSE_FILES:=README

2
package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
View file

@ -1,6 +1,6 @@
--- a/misc/terminfo.src --- a/misc/terminfo.src
+++ b/misc/terminfo.src +++ b/misc/terminfo.src
@@ -6616,6 +6616,172 @@ rxvt-cygwin-native|rxvt terminal emulato @@ -6886,6 +6886,172 @@ rxvt-cygwin-native|rxvt terminal emulato
rxvt-16color|rxvt with 16 colors like aixterm, rxvt-16color|rxvt with 16 colors like aixterm,
ncv#32, use=ibm+16color, use=rxvt, ncv#32, use=ibm+16color, use=rxvt,

26
package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
View file

@ -1,14 +1,14 @@
--- a/misc/terminfo.src --- a/misc/terminfo.src
+++ b/misc/terminfo.src +++ b/misc/terminfo.src
@@ -4815,6 +4815,7 @@ xterm+nofkeys|building block for xterm f @@ -4984,6 +4984,7 @@ xterm-xfree86|xterm terminal emulator (X
# This version reflects the current xterm features.
xterm-new|modern xterm terminal emulator, xterm+nofkeys|building block for xterm fkey-variants,
npc, npc,
+ kbs=\177, + kbs=\177,
kcbt=\E[Z, kent=\EOM, nel=\EE, use=ecma+index, kcbt=\E[Z, kent=\EOM, nel=\EE, use=ecma+index,
use=ansi+rep, use=ecma+strikeout, use=xterm+pcfkeys, use=ansi+rep, use=ecma+strikeout, use=vt420+lrmm,
use=xterm+nofkeys, use=xterm+sm+1006, use=xterm+tmux, use=ecma+italics,
@@ -6416,6 +6417,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 @@ -6689,6 +6690,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
rxvt-basic|rxvt terminal base (X Window System), rxvt-basic|rxvt terminal base (X Window System),
OTbs, am, bce, eo, mir, msgr, xenl, xon, XT, OTbs, am, bce, eo, mir, msgr, xenl, xon, XT,
cols#80, it#8, lines#24, cols#80, it#8, lines#24,
@ -16,24 +16,24 @@
acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
@@ -6425,7 +6427,7 @@ rxvt-basic|rxvt terminal base (X Window @@ -6698,7 +6700,7 @@ rxvt-basic|rxvt terminal base (X Window
enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
ind=\n, is1=\E[?47l\E=\E[?1l, ind=\n, is1=\E[?47l\E=\E[?1l,
- is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, - is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
+ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, + is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
@@ -8060,6 +8062,7 @@ dumb-emacs-ansi|Emacs dumb terminal with @@ -8347,6 +8349,7 @@ dumb-emacs-ansi|Emacs dumb terminal with
screen|VT 100/ANSI X3.64 virtual terminal, screen-base|VT 100/ANSI X3.64 virtual terminal (base),
OTbs, OTpt, am, km, mir, msgr, xenl, G0, OTbs, OTpt, am, km, mir, msgr, xenl, G0,
colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1, colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
+ kbs=\177, + kbs=\177,
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
yzz{{||}}~~, yzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
@@ -8071,7 +8074,7 @@ screen|VT 100/ANSI X3.64 virtual termina @@ -8358,7 +8361,7 @@ screen-base|VT 100/ANSI X3.64 virtual te
dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
@ -42,7 +42,7 @@
kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
@@ -8199,6 +8202,7 @@ screen.xterm-r6|screen customized for X1 @@ -8500,6 +8503,7 @@ screen.xterm-r6|screen customized for X1
# on Solaris because Sun's curses implementation gets confused. # on Solaris because Sun's curses implementation gets confused.
screen.teraterm|disable ncv in teraterm, screen.teraterm|disable ncv in teraterm,
ncv#127, ncv#127,

2
package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
View file

@ -15,7 +15,7 @@ Subject: [PATCH] ncurses 5.9 - patch 20141206
--- a/ncurses/base/MKlib_gen.sh --- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh +++ b/ncurses/base/MKlib_gen.sh
@@ -511,11 +511,22 @@ sed -n -f $ED1 \ @@ -512,11 +512,22 @@ sed -n -f $ED1 \
-e 's/gen_$//' \ -e 's/gen_$//' \
-e 's/ / /g' >>$TMP -e 's/ / /g' >>$TMP

4
package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
View file

@ -1,6 +1,6 @@
--- a/aclocal.m4 --- a/aclocal.m4
+++ b/aclocal.m4 +++ b/aclocal.m4
@@ -505,7 +505,7 @@ AC_CACHE_CHECK(for options to update arc @@ -523,7 +523,7 @@ AC_CACHE_CHECK(for options to update arc
;; ;;
(*) (*)
cf_cv_ar_flags=unknown cf_cv_ar_flags=unknown
@ -11,7 +11,7 @@
# check if $ARFLAGS already contains this choice # check if $ARFLAGS already contains this choice
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -5072,7 +5072,7 @@ else @@ -5110,7 +5110,7 @@ else
;; ;;
(*) (*)
cf_cv_ar_flags=unknown cf_cv_ar_flags=unknown

2
package/libs/ncurses/patches/900-terminfo.patch
View file

@ -1,6 +1,6 @@
--- a/misc/terminfo.src --- a/misc/terminfo.src
+++ b/misc/terminfo.src +++ b/misc/terminfo.src
@@ -6240,12 +6240,11 @@ konsole-xf3x|KDE console window with key @@ -6514,12 +6514,11 @@ konsole-xf3x|KDE console window with key
# The value for kbs (see konsole-vt100) reflects local customization rather # The value for kbs (see konsole-vt100) reflects local customization rather
# than the settings used for XFree86 xterm. # than the settings used for XFree86 xterm.
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,

2
package/libs/ustream-ssl/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ustream-ssl PKG_NAME:=ustream-ssl
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git

4
package/libs/wolfssl/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=wolfssl PKG_NAME:=wolfssl
PKG_VERSION:=5.5.3-stable PKG_VERSION:=5.5.4-stable
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION)
PKG_HASH:=fd3135b8657d09fb96a8aad16585da850b96ea420ae8ce5ac4d5fdfc614c2683 PKG_HASH:=b7ee150e49def77c765bc02aac92ddeb0bebefd4cb12aa263d8f95e405221fb8
PKG_FIXUP:=libtool libtool-abiver PKG_FIXUP:=libtool libtool-abiver
PKG_INSTALL:=1 PKG_INSTALL:=1

33
package/libs/wolfssl/patches/001-Fix-enable-devcrypto-build-error.patch
View file

@ -1,33 +0,0 @@
From dc9f46a3be00b5e82684a158605189d1278e324c Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Wed, 12 Oct 2022 16:05:17 -0500
Subject: [PATCH] Fix --enable-devcrypto build error for sys without u_int8_t
type
---
wolfcrypt/src/port/devcrypto/README.md | 2 +-
wolfcrypt/src/port/devcrypto/wc_devcrypto.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/wolfcrypt/src/port/devcrypto/README.md
+++ b/wolfcrypt/src/port/devcrypto/README.md
@@ -22,7 +22,7 @@ modprobe cryptodev
For default build with all supported features use:
```
-./configure --enable-cryptodev
+./configure --enable-devcrypto
```
Or for more control over features used:
--- a/wolfcrypt/src/port/devcrypto/wc_devcrypto.c
+++ b/wolfcrypt/src/port/devcrypto/wc_devcrypto.c
@@ -122,7 +122,7 @@ int wc_DevCryptoCreate(WC_CRYPTODEV* ctx
case CRYPTO_SHA2_512_HMAC:
ctx->sess.cipher = 0;
ctx->sess.mac = type;
- ctx->sess.mackey = (u_int8_t*)key;
+ ctx->sess.mackey = (byte*)key;
ctx->sess.mackeylen = keySz;
break;

2
package/libs/wolfssl/patches/100-disable-hardening-check.patch
View file

@ -1,6 +1,6 @@
--- a/wolfssl/wolfcrypt/settings.h --- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h
@@ -2455,7 +2455,7 @@ extern void uITRON4_free(void *p) ; @@ -2496,7 +2496,7 @@ extern void uITRON4_free(void *p) ;
#endif #endif
/* warning for not using harden build options (default with ./configure) */ /* warning for not using harden build options (default with ./configure) */

6
package/network/services/bridger/Makefile
View file

@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bridger PKG_NAME:=bridger
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/nbd168/bridger PKG_SOURCE_URL=https://github.com/nbd168/bridger
PKG_SOURCE_DATE:=2022-04-06 PKG_SOURCE_DATE:=2023-01-03
PKG_SOURCE_VERSION:=e8f6814a85b4ea951657e7018c5d77597400f44a PKG_SOURCE_VERSION:=978c1f9eed07504cc0b84f72ee7384aab722386a
PKG_MIRROR_HASH:=f917e099a9ab2a55745a7254239efabe695a722d5c448342198cdc847a4a24ac PKG_MIRROR_HASH:=2a019b188d8de2fdc95453529d1820b0a7a5576adf161bd19e182c9c1c2b2c85
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

2
package/network/services/hostapd/Makefile
View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd PKG_NAME:=hostapd
PKG_RELEASE:=$(AUTORELEASE).1 PKG_RELEASE:=$(AUTORELEASE).2
PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

8
package/network/utils/nftables/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=nftables PKG_NAME:=nftables
PKG_VERSION:=1.0.5 PKG_VERSION:=1.0.6
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
PKG_HASH:=8d1b4b18393af43698d10baa25d2b9b6397969beecac7816c35dd0714e4de50a PKG_HASH:=2407430ddd82987670e48dc2fda9e280baa8307abec04ab18d609df3db005e4c
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

23
package/network/utils/nftables/patches/0001-fix-nft.patch
View file

@ -1,23 +0,0 @@
'rule inet dscpclassify dscp_match meta l4proto { udp } th dport { 3478 } th sport { 3478-3497, 16384-16387 } goto ct_set_ef'
works with 'nft add', but not 'nft insert', the latter yields: "BUG: unhandled op 4".
Fixes: 81e36530fcac ("src: replace interval segment tree overlap and automerge")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/evaluate.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/evaluate.c b/src/evaluate.c
index d9c9ca28a53a..edebd7bcd8ab 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1520,6 +1520,7 @@ static int interval_set_eval(struct eval_ctx *ctx, struct set *set,
switch (ctx->cmd->op) {
case CMD_CREATE:
case CMD_ADD:
+ case CMD_INSERT:
if (set->automerge) {
ret = set_automerge(ctx->msgs, ctx->cmd, set, init,
ctx->nft->debug_mask);
--
2.35.1

4
package/network/utils/tcpdump/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=tcpdump PKG_NAME:=tcpdump
PKG_VERSION:=4.99.1 PKG_VERSION:=4.99.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.tcpdump.org/release/ PKG_SOURCE_URL:=https://www.tcpdump.org/release/
PKG_HASH:=79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe PKG_HASH:=f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause

2
package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch
View file

@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -6230,97 +6230,6 @@ fi @@ -6568,97 +6568,6 @@ fi

67
package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
View file

@ -1,6 +1,6 @@
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -73,6 +73,85 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ @@ -73,6 +73,86 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
CSRC = fptype.c tcpdump.c CSRC = fptype.c tcpdump.c
@ -77,6 +77,7 @@
+ print-tftp.c \ + print-tftp.c \
+ print-udp.c \ + print-udp.c \
+ print-unsupported.c \ + print-unsupported.c \
+ print-whois.c \
+ signature.c \ + signature.c \
+ strtoaddr.c \ + strtoaddr.c \
+ util-print.c + util-print.c
@ -86,7 +87,7 @@
LIBNETDISSECT_SRC=\ LIBNETDISSECT_SRC=\
addrtoname.c \ addrtoname.c \
addrtostr.c \ addrtostr.c \
@@ -252,6 +331,8 @@ LIBNETDISSECT_SRC=\ @@ -254,6 +334,8 @@ LIBNETDISSECT_SRC=\
strtoaddr.c \ strtoaddr.c \
util-print.c util-print.c
@ -97,7 +98,7 @@
--- a/addrtoname.c --- a/addrtoname.c
+++ b/addrtoname.c +++ b/addrtoname.c
@@ -683,8 +683,10 @@ linkaddr_string(netdissect_options *ndo, @@ -680,8 +680,10 @@ linkaddr_string(netdissect_options *ndo,
if (type == LINKADDR_ETHER && len == MAC_ADDR_LEN) if (type == LINKADDR_ETHER && len == MAC_ADDR_LEN)
return (etheraddr_string(ndo, ep)); return (etheraddr_string(ndo, ep));
@ -108,7 +109,7 @@
tp = lookup_bytestring(ndo, ep, len); tp = lookup_bytestring(ndo, ep, len);
if (tp->bs_name) if (tp->bs_name)
@@ -1263,6 +1265,7 @@ init_addrtoname(netdissect_options *ndo, @@ -1260,6 +1262,7 @@ init_addrtoname(netdissect_options *ndo,
init_ipxsaparray(ndo); init_ipxsaparray(ndo);
} }
@ -116,7 +117,7 @@
const char * const char *
dnaddr_string(netdissect_options *ndo, u_short dnaddr) dnaddr_string(netdissect_options *ndo, u_short dnaddr)
{ {
@@ -1279,6 +1282,7 @@ dnaddr_string(netdissect_options *ndo, u @@ -1276,6 +1279,7 @@ dnaddr_string(netdissect_options *ndo, u
return(tp->name); return(tp->name);
} }
@ -126,7 +127,7 @@
struct hnamemem * struct hnamemem *
--- a/print-ether.c --- a/print-ether.c
+++ b/print-ether.c +++ b/print-ether.c
@@ -539,6 +539,7 @@ ethertype_print(netdissect_options *ndo, @@ -545,6 +545,7 @@ ethertype_print(netdissect_options *ndo,
arp_print(ndo, p, length, caplen); arp_print(ndo, p, length, caplen);
return (1); return (1);
@ -134,7 +135,7 @@
case ETHERTYPE_DN: case ETHERTYPE_DN:
decnet_print(ndo, p, length, caplen); decnet_print(ndo, p, length, caplen);
return (1); return (1);
@@ -569,6 +570,7 @@ ethertype_print(netdissect_options *ndo, @@ -575,6 +576,7 @@ ethertype_print(netdissect_options *ndo,
ND_TCHECK_LEN(p, 1); ND_TCHECK_LEN(p, 1);
isoclns_print(ndo, p + 1, length - 1); isoclns_print(ndo, p + 1, length - 1);
return(1); return(1);
@ -142,19 +143,19 @@
case ETHERTYPE_PPPOED: case ETHERTYPE_PPPOED:
case ETHERTYPE_PPPOES: case ETHERTYPE_PPPOES:
@@ -581,9 +583,11 @@ ethertype_print(netdissect_options *ndo, @@ -587,9 +589,11 @@ ethertype_print(netdissect_options *ndo,
eapol_print(ndo, p); eapol_print(ndo, p);
return (1); return (1);
+#ifndef TCPDUMP_MINI +#ifndef TCPDUMP_MINI
case ETHERTYPE_RRCP: case ETHERTYPE_REALTEK:
rrcp_print(ndo, p, length, src, dst); rtl_print(ndo, p, length, src, dst);
return (1); return (1);
+#endif +#endif
case ETHERTYPE_PPP: case ETHERTYPE_PPP:
if (length) { if (length) {
@@ -592,6 +596,7 @@ ethertype_print(netdissect_options *ndo, @@ -598,6 +602,7 @@ ethertype_print(netdissect_options *ndo,
} }
return (1); return (1);
@ -162,7 +163,7 @@
case ETHERTYPE_MPCP: case ETHERTYPE_MPCP:
mpcp_print(ndo, p, length); mpcp_print(ndo, p, length);
return (1); return (1);
@@ -604,19 +609,23 @@ ethertype_print(netdissect_options *ndo, @@ -610,19 +615,23 @@ ethertype_print(netdissect_options *ndo,
case ETHERTYPE_CFM_OLD: case ETHERTYPE_CFM_OLD:
cfm_print(ndo, p, length); cfm_print(ndo, p, length);
return (1); return (1);
@ -186,7 +187,7 @@
case ETHERTYPE_MPLS: case ETHERTYPE_MPLS:
case ETHERTYPE_MPLS_MULTI: case ETHERTYPE_MPLS_MULTI:
mpls_print(ndo, p, length); mpls_print(ndo, p, length);
@@ -646,6 +655,7 @@ ethertype_print(netdissect_options *ndo, @@ -652,6 +661,7 @@ ethertype_print(netdissect_options *ndo,
case ETHERTYPE_PTP: case ETHERTYPE_PTP:
ptp_print(ndo, p, length); ptp_print(ndo, p, length);
return (1); return (1);
@ -214,7 +215,7 @@
break; break;
--- a/print-icmp6.c --- a/print-icmp6.c
+++ b/print-icmp6.c +++ b/print-icmp6.c
@@ -1384,7 +1384,7 @@ get_upperlayer(netdissect_options *ndo, @@ -1371,7 +1371,7 @@ get_upperlayer(netdissect_options *ndo,
nh = GET_U_1(fragh->ip6f_nxt); nh = GET_U_1(fragh->ip6f_nxt);
hlen = sizeof(struct ip6_frag); hlen = sizeof(struct ip6_frag);
break; break;
@ -223,7 +224,7 @@
case IPPROTO_AH: case IPPROTO_AH:
ah = (const struct ah *)bp; ah = (const struct ah *)bp;
if (!ND_TTEST_1(ah->ah_len)) if (!ND_TTEST_1(ah->ah_len))
@@ -1392,7 +1392,7 @@ get_upperlayer(netdissect_options *ndo, @@ -1379,7 +1379,7 @@ get_upperlayer(netdissect_options *ndo,
nh = GET_U_1(ah->ah_nxt); nh = GET_U_1(ah->ah_nxt);
hlen = (GET_U_1(ah->ah_len) + 2) << 2; hlen = (GET_U_1(ah->ah_len) + 2) << 2;
break; break;
@ -336,7 +337,7 @@
default: default:
/* /*
* AH and ESP are, in the RFCs that describe them, * AH and ESP are, in the RFCs that describe them,
@@ -357,6 +358,7 @@ ip6_print(netdissect_options *ndo, const @@ -375,6 +376,7 @@ ip6_print(netdissect_options *ndo, const
nh = GET_U_1(cp); nh = GET_U_1(cp);
break; break;
@ -344,7 +345,7 @@
case IPPROTO_FRAGMENT: case IPPROTO_FRAGMENT:
advance = frag6_print(ndo, cp, (const u_char *)ip6); advance = frag6_print(ndo, cp, (const u_char *)ip6);
if (advance < 0 || ndo->ndo_snapend <= cp + advance) { if (advance < 0 || ndo->ndo_snapend <= cp + advance) {
@@ -387,7 +389,7 @@ ip6_print(netdissect_options *ndo, const @@ -405,7 +407,7 @@ ip6_print(netdissect_options *ndo, const
nh = GET_U_1(cp); nh = GET_U_1(cp);
nd_pop_packet_info(ndo); nd_pop_packet_info(ndo);
return; return;
@ -462,7 +463,7 @@
static void static void
ppp_hdlc(netdissect_options *ndo, ppp_hdlc(netdissect_options *ndo,
const u_char *p, u_int length) const u_char *p, u_int length)
@@ -1440,17 +1441,19 @@ trunc: @@ -1451,17 +1452,19 @@ trunc:
ndo->ndo_snapend = se; ndo->ndo_snapend = se;
nd_print_trunc(ndo); nd_print_trunc(ndo);
} }
@ -483,7 +484,7 @@
switch (proto) { switch (proto) {
case PPP_LCP: /* fall through */ case PPP_LCP: /* fall through */
@@ -1483,6 +1486,7 @@ handle_ppp(netdissect_options *ndo, @@ -1494,6 +1497,7 @@ handle_ppp(netdissect_options *ndo,
case PPP_IPV6: case PPP_IPV6:
ip6_print(ndo, p, length); ip6_print(ndo, p, length);
break; break;
@ -491,7 +492,7 @@
case ETHERTYPE_IPX: /*XXX*/ case ETHERTYPE_IPX: /*XXX*/
case PPP_IPX: case PPP_IPX:
ipx_print(ndo, p, length); ipx_print(ndo, p, length);
@@ -1494,6 +1498,7 @@ handle_ppp(netdissect_options *ndo, @@ -1505,6 +1509,7 @@ handle_ppp(netdissect_options *ndo,
case PPP_MPLS_MCAST: case PPP_MPLS_MCAST:
mpls_print(ndo, p, length); mpls_print(ndo, p, length);
break; break;
@ -499,7 +500,7 @@
case PPP_COMP: case PPP_COMP:
ND_PRINT("compressed PPP data"); ND_PRINT("compressed PPP data");
break; break;
@@ -1634,6 +1639,7 @@ ppp_if_print(netdissect_options *ndo, @@ -1652,6 +1657,7 @@ ppp_if_print(netdissect_options *ndo,
ppp_print(ndo, p, length); ppp_print(ndo, p, length);
} }
@ -507,14 +508,14 @@
/* /*
* PPP I/F printer to use if we know that RFC 1662-style PPP in HDLC-like * PPP I/F printer to use if we know that RFC 1662-style PPP in HDLC-like
* framing, or Cisco PPP with HDLC framing as per section 4.3.1 of RFC 1547, * framing, or Cisco PPP with HDLC framing as per section 4.3.1 of RFC 1547,
@@ -1877,3 +1883,4 @@ printx: @@ -1895,3 +1901,4 @@ printx:
#endif /* __bsdi__ */ #endif /* __bsdi__ */
ndo->ndo_ll_hdr_len += hdrlength; ndo->ndo_ll_hdr_len += hdrlength;
} }
+#endif +#endif
--- a/print-sll.c --- a/print-sll.c
+++ b/print-sll.c +++ b/print-sll.c
@@ -460,12 +460,14 @@ recurse: @@ -465,12 +465,14 @@ recurse:
*/ */
switch (ether_type) { switch (ether_type) {
@ -531,7 +532,7 @@
/* /*
--- a/print-tcp.c --- a/print-tcp.c
+++ b/print-tcp.c +++ b/print-tcp.c
@@ -612,6 +612,7 @@ tcp_print(netdissect_options *ndo, @@ -614,6 +614,7 @@ tcp_print(netdissect_options *ndo,
ND_PRINT(" %u", utoval); ND_PRINT(" %u", utoval);
break; break;
@ -539,7 +540,7 @@
case TCPOPT_MPTCP: case TCPOPT_MPTCP:
{ {
const u_char *snapend_save; const u_char *snapend_save;
@@ -635,7 +636,7 @@ tcp_print(netdissect_options *ndo, @@ -637,7 +638,7 @@ tcp_print(netdissect_options *ndo,
goto bad; goto bad;
break; break;
} }
@ -548,7 +549,7 @@
case TCPOPT_FASTOPEN: case TCPOPT_FASTOPEN:
datalen = len - 2; datalen = len - 2;
LENCHECK(datalen); LENCHECK(datalen);
@@ -720,6 +721,7 @@ tcp_print(netdissect_options *ndo, @@ -722,6 +723,7 @@ tcp_print(netdissect_options *ndo,
return; return;
} }
@ -556,7 +557,7 @@
if (ndo->ndo_packettype) { if (ndo->ndo_packettype) {
switch (ndo->ndo_packettype) { switch (ndo->ndo_packettype) {
case PT_ZMTP1: case PT_ZMTP1:
@@ -735,6 +737,7 @@ tcp_print(netdissect_options *ndo, @@ -737,6 +739,7 @@ tcp_print(netdissect_options *ndo,
} }
return; return;
} }
@ -564,12 +565,12 @@
if (IS_SRC_OR_DST_PORT(TELNET_PORT)) { if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
telnet_print(ndo, bp, length); telnet_print(ndo, bp, length);
@@ -745,24 +748,31 @@ tcp_print(netdissect_options *ndo, @@ -746,24 +749,31 @@ tcp_print(netdissect_options *ndo,
} else if (IS_SRC_OR_DST_PORT(WHOIS_PORT)) {
ND_PRINT(": "); ND_PRINT(": ");
ndo->ndo_protocol = "whois"; /* needed by txtproto_print() */ whois_print(ndo, bp, length);
txtproto_print(ndo, bp, length, NULL, 0); /* RFC 3912 */
- } else if (IS_SRC_OR_DST_PORT(BGP_PORT)) - } else if (IS_SRC_OR_DST_PORT(BGP_PORT))
+ } + }
+#ifndef TCPDUMP_MINI +#ifndef TCPDUMP_MINI
+ else if (IS_SRC_OR_DST_PORT(BGP_PORT)) + else if (IS_SRC_OR_DST_PORT(BGP_PORT))
bgp_print(ndo, bp, length); bgp_print(ndo, bp, length);
@ -597,7 +598,7 @@
else if (IS_SRC_OR_DST_PORT(FTP_PORT)) { else if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
ND_PRINT(": "); ND_PRINT(": ");
ftp_print(ndo, bp, length); ftp_print(ndo, bp, length);
@@ -775,12 +785,14 @@ tcp_print(netdissect_options *ndo, @@ -776,12 +786,14 @@ tcp_print(netdissect_options *ndo,
} else if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT)) { } else if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT)) {
/* over_tcp: TRUE, is_mdns: FALSE */ /* over_tcp: TRUE, is_mdns: FALSE */
domain_print(ndo, bp, length, TRUE, FALSE); domain_print(ndo, bp, length, TRUE, FALSE);
@ -831,7 +832,7 @@
{ null_if_print, DLT_LOOP }, { null_if_print, DLT_LOOP },
#endif #endif
+#ifndef TCPDUMP_MINI +#ifndef TCPDUMP_MINI
#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H) #ifdef DLT_PFLOG
{ pflog_if_print, DLT_PFLOG }, { pflog_if_print, DLT_PFLOG },
#endif #endif
@@ -200,6 +211,7 @@ static const struct printer printers[] = @@ -200,6 +211,7 @@ static const struct printer printers[] =

33
package/utils/busybox/Config-defaults.in
View file

@ -208,6 +208,15 @@ config BUSYBOX_DEFAULT_PASSWORD_MINLEN
config BUSYBOX_DEFAULT_MD5_SMALL config BUSYBOX_DEFAULT_MD5_SMALL
int int
default 1 default 1
config BUSYBOX_DEFAULT_SHA1_SMALL
int
default 3
config BUSYBOX_DEFAULT_SHA1_HWACCEL
bool
default y
config BUSYBOX_DEFAULT_SHA256_HWACCEL
bool
default y
config BUSYBOX_DEFAULT_SHA3_SMALL config BUSYBOX_DEFAULT_SHA3_SMALL
int int
default 1 default 1
@ -298,6 +307,15 @@ config BUSYBOX_DEFAULT_UNICODE_NEUTRAL_TABLE
config BUSYBOX_DEFAULT_UNICODE_PRESERVE_BROKEN config BUSYBOX_DEFAULT_UNICODE_PRESERVE_BROKEN
bool bool
default n default n
config BUSYBOX_DEFAULT_LOOP_CONFIGURE
bool
default n
config BUSYBOX_DEFAULT_NO_LOOP_CONFIGURE
bool
default n
config BUSYBOX_DEFAULT_TRY_LOOP_CONFIGURE
bool
default y
config BUSYBOX_DEFAULT_FEATURE_SEAMLESS_XZ config BUSYBOX_DEFAULT_FEATURE_SEAMLESS_XZ
bool bool
default n default n
@ -860,6 +878,9 @@ config BUSYBOX_DEFAULT_TRUNCATE
bool bool
default y if TARGET_bcm53xx default y if TARGET_bcm53xx
default n default n
config BUSYBOX_DEFAULT_TSORT
bool
default n
config BUSYBOX_DEFAULT_TTY config BUSYBOX_DEFAULT_TTY
bool bool
default n default n
@ -2162,6 +2183,9 @@ config BUSYBOX_DEFAULT_RUNLEVEL
config BUSYBOX_DEFAULT_RX config BUSYBOX_DEFAULT_RX
bool bool
default n default n
config BUSYBOX_DEFAULT_SEEDRNG
bool
default n
config BUSYBOX_DEFAULT_SETFATTR config BUSYBOX_DEFAULT_SETFATTR
bool bool
default n default n
@ -2174,6 +2198,9 @@ config BUSYBOX_DEFAULT_STRINGS
config BUSYBOX_DEFAULT_TIME config BUSYBOX_DEFAULT_TIME
bool bool
default y default y
config BUSYBOX_DEFAULT_TREE
bool
default n
config BUSYBOX_DEFAULT_TS config BUSYBOX_DEFAULT_TS
bool bool
default n default n
@ -2682,6 +2709,9 @@ config BUSYBOX_DEFAULT_FEATURE_UDHCPC_SANITIZEOPT
config BUSYBOX_DEFAULT_UDHCPC_DEFAULT_SCRIPT config BUSYBOX_DEFAULT_UDHCPC_DEFAULT_SCRIPT
string string
default "/usr/share/udhcpc/default.script" default "/usr/share/udhcpc/default.script"
config BUSYBOX_DEFAULT_UDHCPC6_DEFAULT_SCRIPT
string
default ""
config BUSYBOX_DEFAULT_UDHCPC6 config BUSYBOX_DEFAULT_UDHCPC6
bool bool
default n default n
@ -3012,6 +3042,9 @@ config BUSYBOX_DEFAULT_ASH_PRINTF
config BUSYBOX_DEFAULT_ASH_TEST config BUSYBOX_DEFAULT_ASH_TEST
bool bool
default y default y
config BUSYBOX_DEFAULT_ASH_SLEEP
bool
default n
config BUSYBOX_DEFAULT_ASH_HELP config BUSYBOX_DEFAULT_ASH_HELP
bool bool
default n default n

6
package/utils/busybox/Makefile
View file

@ -5,14 +5,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=busybox PKG_NAME:=busybox
PKG_VERSION:=1.35.0 PKG_VERSION:=1.36.0
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=1
PKG_FLAGS:=essential PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.busybox.net/downloads \ PKG_SOURCE_URL:=https://www.busybox.net/downloads \
http://sources.buildroot.net http://sources.buildroot.net
PKG_HASH:=faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 PKG_HASH:=542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5
PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

7
package/utils/busybox/config/coreutils/Config.in
View file

@ -653,7 +653,7 @@ config BUSYBOX_CONFIG_SORT
sort is used to sort lines of text in specified files. sort is used to sort lines of text in specified files.
config BUSYBOX_CONFIG_FEATURE_SORT_BIG config BUSYBOX_CONFIG_FEATURE_SORT_BIG
bool "Full SuSv3 compliant sort (support -ktcbdfiogM)" bool "Full SuSv3 compliant sort (support -ktcbdfioghM)"
default BUSYBOX_DEFAULT_FEATURE_SORT_BIG default BUSYBOX_DEFAULT_FEATURE_SORT_BIG
depends on BUSYBOX_CONFIG_SORT depends on BUSYBOX_CONFIG_SORT
help help
@ -851,6 +851,11 @@ config BUSYBOX_CONFIG_TRUNCATE
help help
truncate truncates files to a given size. If a file does truncate truncates files to a given size. If a file does
not exist, it is created unless told otherwise. not exist, it is created unless told otherwise.
config BUSYBOX_CONFIG_TSORT
bool "tsort (0.7 kb)"
default BUSYBOX_DEFAULT_TSORT
help
tsort performs a topological sort.
config BUSYBOX_CONFIG_TTY config BUSYBOX_CONFIG_TTY
bool "tty (3.6 kb)" bool "tty (3.6 kb)"
default BUSYBOX_DEFAULT_TTY default BUSYBOX_DEFAULT_TTY

62
package/utils/busybox/config/libbb/Config.in
View file

@ -98,21 +98,47 @@ config BUSYBOX_CONFIG_MD5_SMALL
default BUSYBOX_DEFAULT_MD5_SMALL # all "fast or small" options default to small default BUSYBOX_DEFAULT_MD5_SMALL # all "fast or small" options default to small
range 0 3 range 0 3
help help
Trade binary size versus speed for the md5sum algorithm. Trade binary size versus speed for the md5 algorithm.
Approximate values running uClibc and hashing Approximate values running uClibc and hashing
linux-2.4.4.tar.bz2 were: linux-2.4.4.tar.bz2 were:
value user times (sec) text size (386) value user times (sec) text size (386)
0 (fastest) 1.1 6144 0 (fastest) 1.1 6144
1 1.4 5392 1 1.4 5392
2 3.0 5088 2 3.0 5088
3 (smallest) 5.1 4912 3 (smallest) 5.1 4912
config BUSYBOX_CONFIG_SHA1_SMALL
int "SHA1: Trade bytes for speed (0:fast, 3:slow)"
default BUSYBOX_DEFAULT_SHA1_SMALL # all "fast or small" options default to small
range 0 3
help
Trade binary size versus speed for the sha1 algorithm.
With FEATURE_COPYBUF_KB=64:
throughput MB/s size of sha1_process_block64
value 486 x86-64 486 x86-64
0 440 485 3481 3502
1 265 265 641 696
2,3 220 210 342 364
config BUSYBOX_CONFIG_SHA1_HWACCEL
bool "SHA1: Use hardware accelerated instructions if possible"
default BUSYBOX_DEFAULT_SHA1_HWACCEL
help
On x86, this adds ~590 bytes of code. Throughput
is about twice as fast as fully-unrolled generic code.
config BUSYBOX_CONFIG_SHA256_HWACCEL
bool "SHA256: Use hardware accelerated instructions if possible"
default BUSYBOX_DEFAULT_SHA256_HWACCEL
help
On x86, this adds ~1k bytes of code.
config BUSYBOX_CONFIG_SHA3_SMALL config BUSYBOX_CONFIG_SHA3_SMALL
int "SHA3: Trade bytes for speed (0:fast, 1:slow)" int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
default BUSYBOX_DEFAULT_SHA3_SMALL # all "fast or small" options default to small default BUSYBOX_DEFAULT_SHA3_SMALL # all "fast or small" options default to small
range 0 1 range 0 1
help help
Trade binary size versus speed for the sha3sum algorithm. Trade binary size versus speed for the sha3 algorithm.
SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate): SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
64-bit x86: +270 bytes of code, 45% faster 64-bit x86: +270 bytes of code, 45% faster
32-bit x86: +450 bytes of code, 75% faster 32-bit x86: +450 bytes of code, 75% faster
@ -399,3 +425,25 @@ config BUSYBOX_CONFIG_UNICODE_PRESERVE_BROKEN
For example, this means that entering 'l', 's', ' ', 0xff, [Enter] For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
at shell prompt will list file named 0xff (single char name at shell prompt will list file named 0xff (single char name
with char value 255), not file named '?'. with char value 255), not file named '?'.
choice
prompt "Use LOOP_CONFIGURE for losetup and loop mounts"
default BUSYBOX_CONFIG_TRY_LOOP_CONFIGURE
help
LOOP_CONFIGURE is added to Linux 5.8
https://lwn.net/Articles/820408/
This allows userspace to completely setup a loop device with a single
ioctl, removing the in-between state where the device can be partially
configured - eg the loop device has a backing file associated with it,
but is reading from the wrong offset.
config BUSYBOX_CONFIG_LOOP_CONFIGURE
bool "use LOOP_CONFIGURE, needs kernel >= 5.8"
config BUSYBOX_CONFIG_NO_LOOP_CONFIGURE
bool "use LOOP_SET_FD + LOOP_SET_STATUS"
config BUSYBOX_CONFIG_TRY_LOOP_CONFIGURE
bool "try LOOP_CONFIGURE, fall back to LOOP_SET_FD + LOOP_SET_STATUS"
endchoice

12
package/utils/busybox/config/miscutils/Config.in
View file

@ -704,6 +704,13 @@ config BUSYBOX_CONFIG_RX
default BUSYBOX_DEFAULT_RX default BUSYBOX_DEFAULT_RX
help help
Receive files using the Xmodem protocol. Receive files using the Xmodem protocol.
config BUSYBOX_CONFIG_SEEDRNG
bool "seedrng (1.3 kb)"
default BUSYBOX_DEFAULT_SEEDRNG
help
Seed the kernel RNG from seed files, meant to be called
once during startup, once during shutdown, and optionally
at some periodic interval in between.
config BUSYBOX_CONFIG_SETFATTR config BUSYBOX_CONFIG_SETFATTR
bool "setfattr (3.7 kb)" bool "setfattr (3.7 kb)"
default BUSYBOX_DEFAULT_SETFATTR default BUSYBOX_DEFAULT_SETFATTR
@ -727,6 +734,11 @@ config BUSYBOX_CONFIG_TIME
The time command runs the specified program with the given arguments. The time command runs the specified program with the given arguments.
When the command finishes, time writes a message to standard output When the command finishes, time writes a message to standard output
giving timing statistics about this program run. giving timing statistics about this program run.
config BUSYBOX_CONFIG_TREE
bool "tree (0.6 kb)"
default BUSYBOX_DEFAULT_TREE
help
List files and directories in a tree structure.
config BUSYBOX_CONFIG_TS config BUSYBOX_CONFIG_TS
bool "ts (450 bytes)" bool "ts (450 bytes)"
default BUSYBOX_DEFAULT_TS default BUSYBOX_DEFAULT_TS

7
package/utils/busybox/config/networking/udhcp/Config.in
View file

@ -93,12 +93,17 @@ config BUSYBOX_CONFIG_FEATURE_UDHCPC_SANITIZEOPT
config BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT config BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT
string "Absolute path to config script" string "Absolute path to config script"
default BUSYBOX_DEFAULT_UDHCPC_DEFAULT_SCRIPT default BUSYBOX_DEFAULT_UDHCPC_DEFAULT_SCRIPT
depends on BUSYBOX_CONFIG_UDHCPC || BUSYBOX_CONFIG_UDHCPC6 depends on BUSYBOX_CONFIG_UDHCPC
help help
This script is called after udhcpc receives an answer. See This script is called after udhcpc receives an answer. See
examples/udhcp for a working example. Normally it is safe examples/udhcp for a working example. Normally it is safe
to leave this untouched. to leave this untouched.
config BUSYBOX_CONFIG_UDHCPC6_DEFAULT_SCRIPT
string "Absolute path to config script for IPv6"
default BUSYBOX_DEFAULT_UDHCPC6_DEFAULT_SCRIPT
depends on BUSYBOX_CONFIG_UDHCPC6
# udhcpc6 config is inserted here: # udhcpc6 config is inserted here:
config BUSYBOX_CONFIG_UDHCPC6 config BUSYBOX_CONFIG_UDHCPC6
bool "udhcpc6 (21 kb)" bool "udhcpc6 (21 kb)"

5
package/utils/busybox/config/shell/Config.in
View file

@ -201,6 +201,11 @@ config BUSYBOX_CONFIG_ASH_TEST
default BUSYBOX_DEFAULT_ASH_TEST default BUSYBOX_DEFAULT_ASH_TEST
depends on BUSYBOX_CONFIG_SHELL_ASH depends on BUSYBOX_CONFIG_SHELL_ASH
config BUSYBOX_CONFIG_ASH_SLEEP
bool "sleep builtin"
default BUSYBOX_DEFAULT_ASH_SLEEP
depends on BUSYBOX_CONFIG_SHELL_ASH
config BUSYBOX_CONFIG_ASH_HELP config BUSYBOX_CONFIG_ASH_HELP
bool "help builtin" bool "help builtin"
default BUSYBOX_DEFAULT_ASH_HELP default BUSYBOX_DEFAULT_ASH_HELP

42
package/utils/busybox/patches/001-CVE-2022-30065-awk-fix-use-after-free.patch
View file

@ -1,42 +0,0 @@
From e63d7cdfdac78c6fd27e9e63150335767592b85e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 17 Jun 2022 17:45:34 +0200
Subject: awk: fix use after free (CVE-2022-30065)
fixes https://bugs.busybox.net/show_bug.cgi?id=14781
function old new delta
evaluate 3343 3357 +14
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
editors/awk.c | 3 +++
testsuite/awk.tests | 6 ++++++
2 files changed, 9 insertions(+)
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -3114,6 +3114,9 @@ static var *evaluate(node *op, var *res)
case XC( OC_MOVE ):
debug_printf_eval("MOVE\n");
+ /* make sure that we never return a temp var */
+ if (L.v == TMPVAR0)
+ L.v = res;
/* if source is a temporary string, jusk relink it to dest */
if (R.v == TMPVAR1
&& !(R.v->type & VF_NUMBER)
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -469,4 +469,10 @@ testing 'awk printf %% prints one %' \
"%\n" \
'' ''
+testing 'awk assign while test' \
+ "awk '\$1==\$1=\"foo\" {print \$1}'" \
+ "foo\n" \
+ "" \
+ "foo"
+
exit $FAILCOUNT

2
package/utils/px5g-wolfssl/Makefile
View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=px5g-wolfssl PKG_NAME:=px5g-wolfssl
PKG_RELEASE:=$(COMMITCOUNT).1 PKG_RELEASE:=$(COMMITCOUNT).2
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0

2
package/utils/uencrypt/Makefile
View file

@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uencrypt PKG_NAME:=uencrypt
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_FLAGS:=nonshared PKG_FLAGS:=nonshared
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later

6
package/utils/util-linux/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux PKG_NAME:=util-linux
PKG_VERSION:=2.38 PKG_VERSION:=2.38.1
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.38 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.38
PKG_HASH:=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64 PKG_HASH:=60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_CPE_ID:=cpe:/a:kernel:util-linux
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only

20
package/utils/util-linux/patches/010-meson-typo.patch
View file

@ -1,20 +0,0 @@
From c387d4fe7a1435a762a5b7d8b75feb13ad613315 Mon Sep 17 00:00:00 2001
From: Anatoly Pugachev <matorola@gmail.com>
Date: Fri, 8 Apr 2022 15:34:16 +0300
Subject: [PATCH] libfdisk: meson.build fix typo
---
libfdisk/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/libfdisk/meson.build
+++ b/libfdisk/meson.build
@@ -11,7 +11,7 @@ libfdisk_h = configure_file(
output : 'libfdisk.h',
configuration : defs,
install : build_libfdisk,
- install_dir : join_paths(get_option('includedir'), 'libfisk'),
+ install_dir : join_paths(get_option('includedir'), 'libfdisk'),
)
lib_fdisk_sources = '''

22
package/utils/util-linux/patches/020-meson-fix-compilation-without-systemd.patch
View file

@ -1,22 +0,0 @@
From 38b15ca2dc4ca32bbe4a2449e1c7b645e4577840 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 29 Apr 2022 16:53:43 -0700
Subject: [PATCH 1/7] meson: fix compilation without systemd
systemdsystemunitdir is used elsewhere.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
meson.build | 1 +
1 file changed, 1 insertion(+)
--- a/meson.build
+++ b/meson.build
@@ -720,6 +720,7 @@ if fs_search_path_extra != ''
endif
conf.set_quoted('FS_SEARCH_PATH', fs_search_path)
+systemdsystemunitdir = ''
if systemd.found()
systemdsystemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
endif

21
package/utils/util-linux/patches/110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch
View file

@ -1,21 +0,0 @@
From e51565b653cf09985df57cb7254b16d5af5df223 Mon Sep 17 00:00:00 2001
From: Nicolas Caramelli <caramelli.devel@gmail.com>
Date: Fri, 29 Apr 2022 18:16:36 +0200
Subject: [PATCH] meson: fix when HAVE_CLOCK_GETTIME is set
Signed-off-by: Nicolas Caramelli <caramelli.devel@gmail.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/meson.build
+++ b/meson.build
@@ -602,7 +602,7 @@ if not have
have = cc.has_function('clock_gettime',
dependencies : realtime_libs)
endif
-conf.set('HAVE_CLOCK_GETTIME', have_dirfd ? 1 : false)
+conf.set('HAVE_CLOCK_GETTIME', have ? 1 : false)
thread_libs = dependency('threads')

4
package/utils/zyxel-bootconfig/files/95_apply_bootconfig
View file

@ -1,12 +1,10 @@
apply_bootconfig() { apply_bootconfig() {
. /lib/functions.sh . /lib/functions.sh
local part
case $(board_name) in case $(board_name) in
zyxel,nwa50ax|\ zyxel,nwa50ax|\
zyxel,nwa55axe) zyxel,nwa55axe)
mtd_idx=$(find_mtd_index "bootconfig") mtd_idx=$(find_mtd_index "bootconfig")
zyxel-bootconfig "/dev/mtd$mtd_idx" set-image-status 0 valid zyxel-bootconfig "/dev/mtd$mtd_idx" set-image-status 0 valid
zyxel-bootconfig "/dev/mtd$mtd_idx" set-active-image 0 zyxel-bootconfig "/dev/mtd$mtd_idx" set-active-image 0
;; ;;

1
scripts/download.pl
View file

@ -255,6 +255,7 @@ foreach my $mirror (@ARGV) {
push @mirrors, "https://mirrors.tuna.tsinghua.edu.cn/debian/$1"; push @mirrors, "https://mirrors.tuna.tsinghua.edu.cn/debian/$1";
push @mirrors, "https://mirrors.ustc.edu.cn/debian/$1" push @mirrors, "https://mirrors.ustc.edu.cn/debian/$1"
} elsif ($mirror =~ /^\@APACHE\/(.+)$/) { } elsif ($mirror =~ /^\@APACHE\/(.+)$/) {
push @mirrors, "https://dlcdn.apache.org/$1";
push @mirrors, "https://mirror.netcologne.de/apache.org/$1"; push @mirrors, "https://mirror.netcologne.de/apache.org/$1";
push @mirrors, "https://mirror.aarnet.edu.au/pub/apache/$1"; push @mirrors, "https://mirror.aarnet.edu.au/pub/apache/$1";
push @mirrors, "https://mirror.csclub.uwaterloo.ca/apache/$1"; push @mirrors, "https://mirror.csclub.uwaterloo.ca/apache/$1";

33
target/imagebuilder/files/Makefile
View file

@ -35,8 +35,11 @@ Available Commands:
info: Show a list of available target profiles info: Show a list of available target profiles
clean: Remove images and temporary build files clean: Remove images and temporary build files
image: Build an image (see below for more information). image: Build an image (see below for more information).
manifest: Show all package that will be installed into the image
package_whatdepends: Show which packages have a dependency on this
package_depends: Show installation dependency of the package
Building images: image:
By default 'make image' will create an image with the default By default 'make image' will create an image with the default
target profile and package set. You can use the following parameters target profile and package set. You can use the following parameters
to change that: to change that:
@ -49,7 +52,7 @@ Building images:
make image DISABLED_SERVICES="<svc1> [<svc2> [<svc3> ..]]" # Which services in /etc/init.d/ should be disabled make image DISABLED_SERVICES="<svc1> [<svc2> [<svc3> ..]]" # Which services in /etc/init.d/ should be disabled
make image ADD_LOCAL_KEY=1 # store locally generated signing key in built images make image ADD_LOCAL_KEY=1 # store locally generated signing key in built images
Print manifest: manifest:
List "all" packages which get installed into the image. List "all" packages which get installed into the image.
You can use the following parameters: You can use the following parameters:
@ -57,6 +60,19 @@ Print manifest:
make manifest PACKAGES="<pkg1> [<pkg2> [<pkg3> ...]]" # include extra packages make manifest PACKAGES="<pkg1> [<pkg2> [<pkg3> ...]]" # include extra packages
make manifest STRIP_ABI=1 # remove ABI version from printed package names make manifest STRIP_ABI=1 # remove ABI version from printed package names
package_whatdepends:
List "all" packages that have a dependency on this package
You can use the following parameters:
make package_whatdepends PACKAGE="<pkg>"
package_depends:
List "all" packages dependency of the package
You can use the following parameters:
make package_depends PACKAGE="<pkg>"
endef endef
$(eval $(call shexport,Helptext)) $(eval $(call shexport,Helptext))
@ -255,7 +271,7 @@ manifest: FORCE
$(if $(PROFILE),USER_PROFILE="$(PROFILE_FILTER)") \ $(if $(PROFILE),USER_PROFILE="$(PROFILE_FILTER)") \
$(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)")) $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)"))
whatdepends: FORCE package_whatdepends: FORCE
ifeq ($(PACKAGE),) ifeq ($(PACKAGE),)
@echo 'Variable `PACKAGE` is not set but required by `whatdepends`' @echo 'Variable `PACKAGE` is not set but required by `whatdepends`'
@exit 1 @exit 1
@ -263,4 +279,13 @@ endif
@$(MAKE) -s package_reload @$(MAKE) -s package_reload
@$(OPKG) whatdepends -A $(PACKAGE) @$(OPKG) whatdepends -A $(PACKAGE)
.SILENT: help info image manifest whatdepends package_depends: FORCE
ifeq ($(PACKAGE),)
@echo 'Variable `PACKAGE` is not set but required by `package_depends`'
@exit 1
endif
@$(MAKE) -s package_reload
@$(OPKG) depends -A $(PACKAGE)
.SILENT: help info image manifest package_whatdepends package_depends

1
target/linux/at91/sam9x/config-5.10
View file

@ -197,6 +197,7 @@ CONFIG_NEED_KUSER_HELPERS=y
CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_KM=y
CONFIG_NLS=y CONFIG_NLS=y
CONFIG_NVMEM=y CONFIG_NVMEM=y
# CONFIG_NVMEM_MICROCHIP_OTPC is not set
CONFIG_NVMEM_SYSFS=y CONFIG_NVMEM_SYSFS=y
CONFIG_OF=y CONFIG_OF=y
CONFIG_OF_ADDRESS=y CONFIG_OF_ADDRESS=y

1
target/linux/at91/sama5/config-5.10
View file

@ -303,6 +303,7 @@ CONFIG_NLS_UTF8=y
CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_COMMON=y
CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ_IDLE=y
CONFIG_NVMEM=y CONFIG_NVMEM=y
# CONFIG_NVMEM_MICROCHIP_OTPC is not set
CONFIG_NVMEM_SYSFS=y CONFIG_NVMEM_SYSFS=y
CONFIG_OF=y CONFIG_OF=y
CONFIG_OF_ADDRESS=y CONFIG_OF_ADDRESS=y

1
target/linux/at91/sama7/config-5.10
View file

@ -265,6 +265,7 @@ CONFIG_NLS_UTF8=y
CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_COMMON=y
CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ_IDLE=y
CONFIG_NVMEM=y CONFIG_NVMEM=y
# CONFIG_NVMEM_MICROCHIP_OTPC is not set
CONFIG_NVMEM_SYSFS=y CONFIG_NVMEM_SYSFS=y
CONFIG_OF=y CONFIG_OF=y
CONFIG_OF_ADDRESS=y CONFIG_OF_ADDRESS=y

55
target/linux/ath79/dts/ar7161_netgear_wndap360.dts
View file

@ -107,10 +107,34 @@
read-only; read-only;
}; };
art: partition@7f0000 { partition@7f0000 {
label = "art"; label = "art";
reg = <0x7f0000 0x010000>; reg = <0x7f0000 0x010000>;
read-only; read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_120c: macaddr@120c {
reg = <0x120c 0x6>;
};
macaddr_art_520c: macaddr@520c {
reg = <0x520c 0x6>;
};
calibration_art_1000: calibration@1000 {
reg = <0x1000 0xeb8>;
};
calibration_art_5000: calibration@5000 {
reg = <0x5000 0xeb8>;
};
}; };
}; };
}; };
@ -122,9 +146,8 @@
ath9k0: wifi@0,11 { ath9k0: wifi@0,11 {
compatible = "pci168c,0029"; compatible = "pci168c,0029";
reg = <0x8800 0 0 0 0>; reg = <0x8800 0 0 0 0>;
qca,no-eeprom; nvmem-cells = <&macaddr_art_120c>, <&calibration_art_1000>;
nvmem-cells = <&macaddr_art_120c>; nvmem-cell-names = "mac-address", "calibration";
nvmem-cell-names = "mac-address";
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };
@ -132,30 +155,10 @@
ath9k1: wifi@0,12 { ath9k1: wifi@0,12 {
compatible = "pci168c,0029"; compatible = "pci168c,0029";
reg = <0x9000 0 0 0 0>; reg = <0x9000 0 0 0 0>;
qca,no-eeprom; nvmem-cells = <&macaddr_art_520c>, <&calibration_art_5000>;
nvmem-cells = <&macaddr_art_520c>; nvmem-cell-names = "mac-address", "calibration";
nvmem-cell-names = "mac-address";
mac-address-increment = <1>; mac-address-increment = <1>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };
}; };
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_120c: macaddr@120c {
reg = <0x120c 0x6>;
};
macaddr_art_520c: macaddr@520c {
reg = <0x520c 0x6>;
};
};

38
target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts
View file

@ -58,10 +58,26 @@
read-only; read-only;
}; };
art: partition@ff0000 { partition@ff0000 {
label = "art"; label = "art";
reg = <0xff0000 0x010000>; reg = <0xff0000 0x010000>;
read-only; read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
calibration_art_1000: calibration@1000 {
reg = <0x1000 0x440>;
};
calibration_art_5000: calibration@5000 {
reg = <0x5000 0x844>;
};
}; };
}; };
}; };
@ -73,6 +89,13 @@
&pcie { &pcie {
status = "okay"; status = "okay";
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x0 0 0 0 0>;
nvmem-cells = <&calibration_art_5000>;
nvmem-cell-names = "calibration";
};
}; };
&mdio0 { &mdio0 {
@ -109,15 +132,6 @@
&wmac { &wmac {
status = "okay"; status = "okay";
mtd-cal-data = <&art 0x1000>; nvmem-cells = <&calibration_art_1000>;
}; nvmem-cell-names = "calibration";
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
}; };

67
target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi Normal file
View file

@ -0,0 +1,67 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9344.dtsi"
#include "ar934x_fortinet_loader.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ {
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};
chosen {
bootargs = "console=ttyS0,9600";
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
linux,code = <KEY_RESTART>;
};
};
};
&ref {
clock-frequency = <25000000>;
};
&mdio0 {
status = "okay";
phy0: ethernet-phy@0 {
reg = <0>;
eee-broken-100tx;
eee-broken-1000t;
};
};
&eth0 {
status = "okay";
phy-handle = <&phy0>;
phy-mode = "rgmii-txid";
pll-data = <0x02000000 0x00000101 0x00001313>;
};
&pcie {
status = "okay";
ath9k: wifi@0,0,0 {
compatible = "pci168c,0030";
reg = <0x0 0 0 0 0>;
};
};
&wmac {
status = "okay";
};

75
target/linux/ath79/dts/ar9344_fortinet_fap-221-b.dts Normal file
View file

@ -0,0 +1,75 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9344_fortinet_ap-dual.dtsi"
/ {
compatible = "fortinet,fap-221-b", "qca,ar9344";
model = "Fortinet FAP-221-B";
leds {
compatible = "gpio-leds";
led_power: power_green {
label = "green:power";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
default-state = "on";
};
power_amber {
label = "amber:power";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
};
eth_green {
label = "green:eth";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};
eth_amber {
label = "amber:eth";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
};
wifi5g {
label = "green:wifi5g";
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
wifi2g {
label = "amber:wifi2g";
gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1tpt";
};
};
virtual_flash {
devices = <&fwconcat0 &fwconcat1 &fwconcat2>;
};
};
&ath9k {
ieee80211-freq-limit = <2402000 2482000>;
nvmem-cells = <&calibration_pcie>;
nvmem-cell-names = "calibration";
};
&wmac {
ieee80211-freq-limit = <2402000 2482000 4900000 5990000>;
nvmem-cells = <&calibration_wmac>;
nvmem-cell-names = "calibration";
};
&art {
compatible = "nvmem-cells";
calibration_wmac: calibration@1000 {
reg = <0x1000 0x440>;
};
calibration_pcie: calibration@5000 {
reg = <0x5000 0x440>;
};
};

9
target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
View file

@ -91,15 +91,10 @@
}; };
partition@50000 { partition@50000 {
/* Dual-Flash layout combined */
compatible = "denx,uimage"; compatible = "denx,uimage";
label = "firmware"; label = "firmware";
reg = <0x050000 0x740000>; reg = <0x050000 0xe80000>;
};
partition@790000 {
label = "vendor";
reg = <0x790000 0x740000>;
read-only;
}; };
partition@ed0000 { partition@ed0000 {

72
target/linux/ath79/dts/ar934x_fortinet_loader.dtsi Normal file
View file

@ -0,0 +1,72 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include <dt-bindings/mtd/partitions/uimage.h>
/ {
virtual_flash {
compatible = "mtd-concat";
devices = <&fwconcat0 &fwconcat1>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
compatible = "openwrt,uimage", "denx,uimage";
openwrt,ih-magic = <0x73714f4b>;
label = "firmware";
reg = <0x0 0x0>;
};
};
};
};
&spi {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <40000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x000000 0x040000>;
read-only;
};
fwconcat0: partition@40000 {
label = "fwconcat0";
reg = <0x040000 0x900000>;
};
partition@940000 {
label = "loader";
reg = <0x940000 0x010000>;
};
fwconcat1: partition@950000 {
label = "fwconcat1";
reg = <0x950000 0x1a0000>;
};
fwconcat2: partition@af0000 {
label = "reserved";
reg = <0xaf0000 0x500000>;
};
art: partition@ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
};
};
};
};

9
target/linux/ath79/dts/qca9558_ocedo_koala.dts
View file

@ -84,15 +84,10 @@
}; };
partition@50000 { partition@50000 {
/* Dual-Flash layout combined */
compatible = "denx,uimage"; compatible = "denx,uimage";
label = "firmware"; label = "firmware";
reg = <0x050000 0x740000>; reg = <0x050000 0xe80000>;
};
partition@790000 {
label = "vendor";
reg = <0x790000 0x740000>;
read-only;
}; };
partition@ed0000 { partition@ed0000 {

9
target/linux/ath79/dts/qca9558_ocedo_ursus.dts
View file

@ -55,15 +55,10 @@
}; };
partition@50000 { partition@50000 {
/* Dual-Flash layout combined */
compatible = "denx,uimage"; compatible = "denx,uimage";
label = "firmware"; label = "firmware";
reg = <0x050000 0x740000>; reg = <0x050000 0xe80000>;
};
partition@790000 {
label = "vendor";
reg = <0x790000 0x740000>;
read-only;
}; };
partition@ed0000 { partition@ed0000 {

9
target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
View file

@ -69,17 +69,12 @@
}; };
partition@70000 { partition@70000 {
/* Combine kernel0 & kernel1 */
label = "firmware"; label = "firmware";
reg = <0x070000 0x790000>; reg = <0x070000 0xf20000>;
compatible = "denx,uimage"; compatible = "denx,uimage";
}; };
partition@800000 {
label = "kernel1";
reg = <0x800000 0x790000>;
read-only;
};
partition@f90000 { partition@f90000 {
label = "bs"; label = "bs";
reg = <0xf90000 0x020000>; reg = <0xf90000 0x020000>;

5
target/linux/ath79/generic/base-files/etc/board.d/02_network
View file

@ -45,6 +45,7 @@ ath79_setup_interfaces()
engenius,ecb600|\ engenius,ecb600|\
enterasys,ws-ap3705i|\ enterasys,ws-ap3705i|\
extreme-networks,ws-ap3805i|\ extreme-networks,ws-ap3805i|\
fortinet,fap-221-b|\
glinet,gl-ar300m-lite|\ glinet,gl-ar300m-lite|\
glinet,gl-usb150|\ glinet,gl-usb150|\
hak5,wifi-pineapple-nano|\ hak5,wifi-pineapple-nano|\
@ -674,6 +675,10 @@ ath79_setup_macs()
enterasys,ws-ap3705i) enterasys,ws-ap3705i)
label_mac=$(mtd_get_mac_ascii u-boot-env0 ethaddr) label_mac=$(mtd_get_mac_ascii u-boot-env0 ethaddr)
;; ;;
fortinet,fap-221-b)
lan_mac=$(mtd_get_mac_text u-boot 0x3ff80 12)
label_mac=$lan_mac
;;
hak5,lan-turtle|\ hak5,lan-turtle|\
hak5,packet-squirrel) hak5,packet-squirrel)
label_mac=$(mtd_get_mac_binary u-boot 0x1fc00) label_mac=$(mtd_get_mac_binary u-boot 0x1fc00)

6
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View file

@ -124,8 +124,7 @@ case "$FIRMWARE" in
"ath9k-eeprom-pci-0000:00:11.0.bin") "ath9k-eeprom-pci-0000:00:11.0.bin")
case $board in case $board in
buffalo,wzr-600dhp|\ buffalo,wzr-600dhp|\
buffalo,wzr-hp-ag300h|\ buffalo,wzr-hp-ag300h)
netgear,wndap360)
caldata_extract "art" 0x1000 0xeb8 caldata_extract "art" 0x1000 0xeb8
;; ;;
dlink,dir-825-b1|\ dlink,dir-825-b1|\
@ -144,8 +143,7 @@ case "$FIRMWARE" in
"ath9k-eeprom-pci-0000:00:12.0.bin") "ath9k-eeprom-pci-0000:00:12.0.bin")
case $board in case $board in
buffalo,wzr-600dhp|\ buffalo,wzr-600dhp|\
buffalo,wzr-hp-ag300h|\ buffalo,wzr-hp-ag300h)
netgear,wndap360)
caldata_extract "art" 0x5000 0xeb8 caldata_extract "art" 0x5000 0xeb8
;; ;;
dlink,dir-825-b1|\ dlink,dir-825-b1|\

1
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file

@ -35,7 +35,6 @@ case "$FIRMWARE" in
sophos,ap55c|\ sophos,ap55c|\
sophos,ap100|\ sophos,ap100|\
sophos,ap100c|\ sophos,ap100c|\
ubnt,aircube-ac|\
ubnt,bullet-ac|\ ubnt,bullet-ac|\
ubnt,unifiac-lite|\ ubnt,unifiac-lite|\
ubnt,unifiac-lr|\ ubnt,unifiac-lr|\

3
target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
View file

@ -35,6 +35,9 @@ case "$board" in
[ "$PHYNBR" -eq 1 ] && \ [ "$PHYNBR" -eq 1 ] && \
mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
;; ;;
fortinet,fap-221-b)
macaddr_add "$(mtd_get_mac_text u-boot 0x3ff80 12)" $((PHYNBR*7+1)) > /sys${DEVPATH}/macaddress
;;
iodata,wn-ac1600dgr) iodata,wn-ac1600dgr)
# There is no eeprom data for 5 GHz wlan in "art" partition # There is no eeprom data for 5 GHz wlan in "art" partition
# which would allow to patch the macaddress # which would allow to patch the macaddress

3
target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh
View file

@ -19,6 +19,9 @@ preinit_set_mac_address() {
siemens,ws-ap3610) siemens,ws-ap3610)
ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr) ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)
;; ;;
fortinet,fap-221-b)
ip link set dev eth0 address $(mtd_get_mac_text u-boot 0x3ff80 12)
;;
tplink,deco-s4-v2) tplink,deco-s4-v2)
base_mac=$(mtd_get_mac_encrypted_deco $(find_mtd_part config)) base_mac=$(mtd_get_mac_encrypted_deco $(find_mtd_part config))
ip link set dev eth0 address $base_mac ip link set dev eth0 address $base_mac

28
target/linux/ath79/generic/base-files/lib/upgrade/failsafe_datachk.sh
View file

@ -8,8 +8,6 @@
# So the kernel check is for the loader, the rootfs check is for kernel + rootfs # So the kernel check is for the loader, the rootfs check is for kernel + rootfs
platform_do_upgrade_failsafe_datachk() { platform_do_upgrade_failsafe_datachk() {
local setenv_script="/tmp/fw_env_upgrade"
local flash_base=0x9f000000 local flash_base=0x9f000000
local kernel_mtd=$(find_mtd_index ${KERNEL_PART:-kernel}) local kernel_mtd=$(find_mtd_index ${KERNEL_PART:-kernel})
@ -34,31 +32,33 @@ platform_do_upgrade_failsafe_datachk() {
local rootfs_md5=$($IMAGE_CMD $ROOTFS_FILE | dd bs=4k count=$rootfs_blocks iflag=fullblock | md5sum | cut -d ' ' -f1) local rootfs_md5=$($IMAGE_CMD $ROOTFS_FILE | dd bs=4k count=$rootfs_blocks iflag=fullblock | md5sum | cut -d ' ' -f1)
# prepare new u-boot-env vars # prepare new u-boot-env vars
printf "vmlinux_start_addr 0x%08x\n" $((flash_base + kernel_offset)) >> $setenv_script printf "vmlinux_start_addr 0x%08x\n" $((flash_base + kernel_offset)) >> $ENV_SCRIPT
printf "vmlinux_size 0x%08x\n" ${kernel_size} >> $setenv_script printf "vmlinux_size 0x%08x\n" ${kernel_size} >> $ENV_SCRIPT
printf "vmlinux_checksum %s\n" ${kernel_md5} >> $setenv_script printf "vmlinux_checksum %s\n" ${kernel_md5} >> $ENV_SCRIPT
printf "rootfs_start_addr 0x%08x\n" $((flash_base + rootfs_offset)) >> $setenv_script printf "rootfs_start_addr 0x%08x\n" $((flash_base + rootfs_offset)) >> $ENV_SCRIPT
printf "rootfs_size 0x%08x\n" ${rootfs_size} >> $setenv_script printf "rootfs_size 0x%08x\n" ${rootfs_size} >> $ENV_SCRIPT
printf "rootfs_checksum %s\n" ${rootfs_md5} >> $setenv_script printf "rootfs_checksum %s\n" ${rootfs_md5} >> $ENV_SCRIPT
# store u-boot-env # store u-boot-env
mkdir -p /var/lock mkdir -p /var/lock
fw_setenv -s $setenv_script || { [ -n "$SKIP_HASH" ] || fw_setenv -s $ENV_SCRIPT || {
echo 'failed to update U-Boot environment' echo 'failed to update U-Boot environment'
exit 1 exit 1
} }
# sysupgrade # sysupgrade
sleep 2 sleep 2 && sync && echo 3 > /proc/sys/vm/drop_caches
sync
echo 3 > /proc/sys/vm/drop_caches
$IMAGE_CMD $KERNEL_FILE | mtd $MTD_ARGS write - ${KERNEL_PART:-kernel} $IMAGE_CMD $KERNEL_FILE | mtd $MTD_ARGS write - ${KERNEL_PART:-kernel}
sleep 2
sync sleep 2 && sync && echo 3 > /proc/sys/vm/drop_caches
if [ -n "$UPGRADE_BACKUP" ]; then if [ -n "$UPGRADE_BACKUP" ]; then
$IMAGE_CMD $ROOTFS_FILE | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j $UPGRADE_BACKUP write - ${ROOTFS_PART:-rootfs} $IMAGE_CMD $ROOTFS_FILE | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j $UPGRADE_BACKUP write - ${ROOTFS_PART:-rootfs}
else else
$IMAGE_CMD $ROOTFS_FILE | mtd $MTD_ARGS write - ${ROOTFS_PART:-rootfs} $IMAGE_CMD $ROOTFS_FILE | mtd $MTD_ARGS write - ${ROOTFS_PART:-rootfs}
fi fi
sync
} }

12
target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
View file

@ -45,6 +45,18 @@ platform_do_upgrade() {
watchguard,ap100|\ watchguard,ap100|\
watchguard,ap200|\ watchguard,ap200|\
watchguard,ap300) watchguard,ap300)
ENV_SCRIPT="/tmp/fw_env"
IMAGE_LIST="tar tzf $1"
IMAGE_CMD="tar xzOf $1"
KERNEL_PART="loader"
ROOTFS_PART="fwconcat0"
KERNEL_FILE="uImage-lzma.bin"
ROOTFS_FILE="root.squashfs"
platform_do_upgrade_failsafe_datachk "$1"
;;
fortinet,fap-221-b)
SKIP_HASH="1"
ENV_SCRIPT="/dev/null"
IMAGE_LIST="tar tzf $1" IMAGE_LIST="tar tzf $1"
IMAGE_CMD="tar xzOf $1" IMAGE_CMD="tar xzOf $1"
KERNEL_PART="loader" KERNEL_PART="loader"

1
target/linux/ath79/image/common-senao.mk
View file

@ -37,6 +37,7 @@ endef
define Device/senao_loader_okli define Device/senao_loader_okli
$(Device/loader-okli-uimage) $(Device/loader-okli-uimage)
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x73714f4b KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x73714f4b
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-kernel | uImage none
LOADER_KERNEL_MAGIC := 0x73714f4b LOADER_KERNEL_MAGIC := 0x73714f4b
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \ IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \

2
target/linux/ath79/image/generic-ubnt.mk
View file

@ -229,7 +229,7 @@ TARGET_DEVICES += ubnt_unifi-ap-lr
define Device/ubnt_unifiac define Device/ubnt_unifiac
DEVICE_VENDOR := Ubiquiti DEVICE_VENDOR := Ubiquiti
SOC := qca9563 SOC := qca9563
IMAGE_SIZE := 7744k IMAGE_SIZE := 15488k
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
endef endef

24
target/linux/ath79/image/generic.mk
View file

@ -1324,6 +1324,22 @@ define Device/extreme-networks_ws-ap3805i
endef endef
TARGET_DEVICES += extreme-networks_ws-ap3805i TARGET_DEVICES += extreme-networks_ws-ap3805i
define Device/fortinet_fap-221-b
$(Device/senao_loader_okli)
SOC := ar9344
DEVICE_VENDOR := Fortinet
DEVICE_MODEL := FAP-221-B
FACTORY_IMG_NAME := FP221B-9.99-AP-build999-999999-patch99
IMAGE_SIZE := 9216k
LOADER_FLASH_OFFS := 0x040000
IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
append-rootfs | pad-rootfs | \
check-size | pad-to $$$$(IMAGE_SIZE) | \
append-loader-okli-uimage $(1) | pad-to 10944k | \
gzip-filename $$$$(FACTORY_IMG_NAME)
endef
TARGET_DEVICES += fortinet_fap-221-b
define Device/glinet_6408 define Device/glinet_6408
$(Device/tplink-8mlzma) $(Device/tplink-8mlzma)
SOC := ar9331 SOC := ar9331
@ -1763,7 +1779,7 @@ define Device/netgear_wndap360
$(Device/netgear_generic) $(Device/netgear_generic)
SOC := ar7161 SOC := ar7161
DEVICE_MODEL := WNDAP360 DEVICE_MODEL := WNDAP360
DEVICE_PACKAGES := kmod-leds-reset kmod-owl-loader DEVICE_PACKAGES := kmod-leds-reset
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
BLOCKSIZE := 256k BLOCKSIZE := 256k
KERNEL := kernel-bin | append-dtb | gzip | uImage gzip KERNEL := kernel-bin | append-dtb | gzip | uImage gzip
@ -1891,7 +1907,7 @@ define Device/ocedo_koala
DEVICE_MODEL := Koala DEVICE_MODEL := Koala
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
SUPPORTED_DEVICES += koala SUPPORTED_DEVICES += koala
IMAGE_SIZE := 7424k IMAGE_SIZE := 14848k
endef endef
TARGET_DEVICES += ocedo_koala TARGET_DEVICES += ocedo_koala
@ -1899,7 +1915,7 @@ define Device/ocedo_raccoon
SOC := ar9344 SOC := ar9344
DEVICE_VENDOR := Ocedo DEVICE_VENDOR := Ocedo
DEVICE_MODEL := Raccoon DEVICE_MODEL := Raccoon
IMAGE_SIZE := 7424k IMAGE_SIZE := 14848k
endef endef
TARGET_DEVICES += ocedo_raccoon TARGET_DEVICES += ocedo_raccoon
@ -1908,7 +1924,7 @@ define Device/ocedo_ursus
DEVICE_VENDOR := Ocedo DEVICE_VENDOR := Ocedo
DEVICE_MODEL := Ursus DEVICE_MODEL := Ursus
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
IMAGE_SIZE := 7424k IMAGE_SIZE := 14848k
endef endef
TARGET_DEVICES += ocedo_ursus TARGET_DEVICES += ocedo_ursus

1
target/linux/ath79/image/tiny-tp-link.mk
View file

@ -234,6 +234,7 @@ define Device/tplink_tl-wpa8630p-v2
so the JFFS2 settings partition MUST be reformatted to avoid data corruption. \ so the JFFS2 settings partition MUST be reformatted to avoid data corruption. \
Backup your settings before upgrading, then during sysupgrade, \ Backup your settings before upgrading, then during sysupgrade, \
de-select "Keep settings" and select "Force" to continue (equivilant to "sysupgrade -n -F"). de-select "Keep settings" and select "Force" to continue (equivilant to "sysupgrade -n -F").
DEFAULT := n
endef endef
define Device/tplink_tl-wpa8630p-v2-int define Device/tplink_tl-wpa8630p-v2-int

2
target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
View file

@ -326,7 +326,7 @@ SVN-Revision: 35130
#endif /* _LINUX_TYPES_H */ #endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c --- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c
@@ -1470,8 +1470,8 @@ struct sk_buff *inet_gro_receive(struct @@ -1469,8 +1469,8 @@ struct sk_buff *inet_gro_receive(struct
if (unlikely(ip_fast_csum((u8 *)iph, 5))) if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock; goto out_unlock;

6
target/linux/ath79/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
View file

@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
--- a/drivers/mtd/spi-nor/core.c --- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c
@@ -3095,6 +3095,7 @@ int spi_nor_scan(struct spi_nor *nor, co @@ -3096,6 +3096,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev; struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd; struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor); struct device_node *np = spi_nor_get_flash_node(nor);
@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret; int ret;
int i; int i;
@@ -3149,7 +3150,12 @@ int spi_nor_scan(struct spi_nor *nor, co @@ -3150,7 +3151,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret) if (ret)
return ret; return ret;
@ -34,7 +34,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
mtd->type = MTD_NORFLASH; mtd->type = MTD_NORFLASH;
--- a/drivers/mtd/mtdcore.c --- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c
@@ -845,6 +845,17 @@ out_error: @@ -847,6 +847,17 @@ out_error:
*/ */
static void mtd_set_dev_defaults(struct mtd_info *mtd) static void mtd_set_dev_defaults(struct mtd_info *mtd)
{ {

2
target/linux/ath79/patches-5.15/920-mikrotik-rb4xx.patch
View file

@ -45,7 +45,7 @@ Submitted-by: Christopher Hill <ch6574@gmail.com>
--- a/drivers/mfd/Kconfig --- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig
@@ -2174,6 +2174,14 @@ config RAVE_SP_CORE @@ -2175,6 +2175,14 @@ config RAVE_SP_CORE
Select this to get support for the Supervisory Processor Select this to get support for the Supervisory Processor
device found on several devices in RAVE line of hardware. device found on several devices in RAVE line of hardware.

28
target/linux/ath79/tiny/base-files/lib/upgrade/failsafe_datachk.sh
View file

@ -8,8 +8,6 @@
# So the kernel check is for the loader, the rootfs check is for kernel + rootfs # So the kernel check is for the loader, the rootfs check is for kernel + rootfs
platform_do_upgrade_failsafe_datachk() { platform_do_upgrade_failsafe_datachk() {
local setenv_script="/tmp/fw_env_upgrade"
local flash_base=0x9f000000 local flash_base=0x9f000000
local kernel_mtd=$(find_mtd_index ${KERNEL_PART:-kernel}) local kernel_mtd=$(find_mtd_index ${KERNEL_PART:-kernel})
@ -34,31 +32,33 @@ platform_do_upgrade_failsafe_datachk() {
local rootfs_md5=$($IMAGE_CMD $ROOTFS_FILE | dd bs=4k count=$rootfs_blocks iflag=fullblock | md5sum | cut -d ' ' -f1) local rootfs_md5=$($IMAGE_CMD $ROOTFS_FILE | dd bs=4k count=$rootfs_blocks iflag=fullblock | md5sum | cut -d ' ' -f1)
# prepare new u-boot-env vars # prepare new u-boot-env vars
printf "vmlinux_start_addr 0x%08x\n" $((flash_base + kernel_offset)) >> $setenv_script printf "vmlinux_start_addr 0x%08x\n" $((flash_base + kernel_offset)) >> $ENV_SCRIPT
printf "vmlinux_size 0x%08x\n" ${kernel_size} >> $setenv_script printf "vmlinux_size 0x%08x\n" ${kernel_size} >> $ENV_SCRIPT
printf "vmlinux_checksum %s\n" ${kernel_md5} >> $setenv_script printf "vmlinux_checksum %s\n" ${kernel_md5} >> $ENV_SCRIPT
printf "rootfs_start_addr 0x%08x\n" $((flash_base + rootfs_offset)) >> $setenv_script printf "rootfs_start_addr 0x%08x\n" $((flash_base + rootfs_offset)) >> $ENV_SCRIPT
printf "rootfs_size 0x%08x\n" ${rootfs_size} >> $setenv_script printf "rootfs_size 0x%08x\n" ${rootfs_size} >> $ENV_SCRIPT
printf "rootfs_checksum %s\n" ${rootfs_md5} >> $setenv_script printf "rootfs_checksum %s\n" ${rootfs_md5} >> $ENV_SCRIPT
# store u-boot-env # store u-boot-env
mkdir -p /var/lock mkdir -p /var/lock
fw_setenv -s $setenv_script || { [ -n "$SKIP_HASH" ] || fw_setenv -s $ENV_SCRIPT || {
echo 'failed to update U-Boot environment' echo 'failed to update U-Boot environment'
exit 1 exit 1
} }
# sysupgrade # sysupgrade
sleep 2 sleep 2 && sync && echo 3 > /proc/sys/vm/drop_caches
sync
echo 3 > /proc/sys/vm/drop_caches
$IMAGE_CMD $KERNEL_FILE | mtd $MTD_ARGS write - ${KERNEL_PART:-kernel} $IMAGE_CMD $KERNEL_FILE | mtd $MTD_ARGS write - ${KERNEL_PART:-kernel}
sleep 2
sync sleep 2 && sync && echo 3 > /proc/sys/vm/drop_caches
if [ -n "$UPGRADE_BACKUP" ]; then if [ -n "$UPGRADE_BACKUP" ]; then
$IMAGE_CMD $ROOTFS_FILE | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j $UPGRADE_BACKUP write - ${ROOTFS_PART:-rootfs} $IMAGE_CMD $ROOTFS_FILE | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j $UPGRADE_BACKUP write - ${ROOTFS_PART:-rootfs}
else else
$IMAGE_CMD $ROOTFS_FILE | mtd $MTD_ARGS write - ${ROOTFS_PART:-rootfs} $IMAGE_CMD $ROOTFS_FILE | mtd $MTD_ARGS write - ${ROOTFS_PART:-rootfs}
fi fi
sync
} }

1
target/linux/ath79/tiny/base-files/lib/upgrade/platform.sh
View file

@ -19,6 +19,7 @@ platform_do_upgrade() {
engenius,eap350-v1|\ engenius,eap350-v1|\
engenius,ecb350-v1|\ engenius,ecb350-v1|\
engenius,enh202-v1) engenius,enh202-v1)
ENV_SCRIPT="/tmp/fw_env"
IMAGE_LIST="tar tzf $1" IMAGE_LIST="tar tzf $1"
IMAGE_CMD="tar xzOf $1" IMAGE_CMD="tar xzOf $1"
KERNEL_PART="loader" KERNEL_PART="loader"

4
target/linux/bcm27xx/patches-5.15/950-0028-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
View file

@ -11,7 +11,7 @@ This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28.
--- a/drivers/spi/spidev.c --- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c
@@ -402,7 +402,6 @@ spidev_ioctl(struct file *filp, unsigned @@ -413,7 +413,6 @@ spidev_ioctl(struct file *filp, unsigned
else else
retval = get_user(tmp, (u32 __user *)arg); retval = get_user(tmp, (u32 __user *)arg);
if (retval == 0) { if (retval == 0) {
@ -19,7 +19,7 @@ This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28.
u32 save = spi->mode; u32 save = spi->mode;
if (tmp & ~SPI_MODE_MASK) { if (tmp & ~SPI_MODE_MASK) {
@@ -410,10 +409,6 @@ spidev_ioctl(struct file *filp, unsigned @@ -421,10 +420,6 @@ spidev_ioctl(struct file *filp, unsigned
break; break;
} }

2
target/linux/bcm27xx/patches-5.15/950-0040-spi-spidev-Completely-disable-the-spidev-warning.patch
View file

@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/spi/spidev.c --- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c
@@ -747,7 +747,7 @@ static int spidev_probe(struct spi_devic @@ -761,7 +761,7 @@ static int spidev_probe(struct spi_devic
* compatible string, it is a Linux implementation thing * compatible string, it is a Linux implementation thing
* rather than a description of the hardware. * rather than a description of the hardware.
*/ */

2
target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
View file

@ -14,7 +14,7 @@ use the same logic.
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -2744,7 +2744,12 @@ static int pl011_setup_port(struct devic @@ -2756,7 +2756,12 @@ static int pl011_setup_port(struct devic
if (IS_ERR(base)) if (IS_ERR(base))
return PTR_ERR(base); return PTR_ERR(base);

10
target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch
View file

@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -1727,6 +1727,23 @@ static void pl011_put_poll_char(struct u @@ -1730,6 +1730,23 @@ static void pl011_put_poll_char(struct u
#endif /* CONFIG_CONSOLE_POLL */ #endif /* CONFIG_CONSOLE_POLL */
@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int pl011_hwinit(struct uart_port *port) static int pl011_hwinit(struct uart_port *port)
{ {
struct uart_amba_port *uap = struct uart_amba_port *uap =
@@ -1743,7 +1760,7 @@ static int pl011_hwinit(struct uart_port @@ -1746,7 +1763,7 @@ static int pl011_hwinit(struct uart_port
if (retval) if (retval)
return retval; return retval;
@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Clear pending error and receive interrupts */ /* Clear pending error and receive interrupts */
pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS | pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
@@ -2440,7 +2457,7 @@ static int pl011_console_setup(struct co @@ -2452,7 +2469,7 @@ static int pl011_console_setup(struct co
plat->init(); plat->init();
} }
@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if (uap->vendor->fixed_options) { if (uap->vendor->fixed_options) {
baud = uap->fixed_baud; baud = uap->fixed_baud;
@@ -2657,6 +2674,7 @@ static struct uart_driver amba_reg = { @@ -2669,6 +2686,7 @@ static struct uart_driver amba_reg = {
.cons = AMBA_CONSOLE, .cons = AMBA_CONSOLE,
}; };
@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int pl011_probe_dt_alias(int index, struct device *dev) static int pl011_probe_dt_alias(int index, struct device *dev)
{ {
struct device_node *np; struct device_node *np;
@@ -2688,6 +2706,7 @@ static int pl011_probe_dt_alias(int inde @@ -2700,6 +2718,7 @@ static int pl011_probe_dt_alias(int inde
return ret; return ret;
} }

2
target/linux/bcm27xx/patches-5.15/950-0058-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
View file

@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -1432,6 +1432,7 @@ static bool pl011_tx_char(struct uart_am @@ -1435,6 +1435,7 @@ static bool pl011_tx_char(struct uart_am
return false; /* unable to transmit character */ return false; /* unable to transmit character */
pl011_write(c, uap, REG_DR); pl011_write(c, uap, REG_DR);

2
target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch
View file

@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
- reg - reg
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -2835,6 +2835,11 @@ static int pl011_probe(struct amba_devic @@ -2847,6 +2847,11 @@ static int pl011_probe(struct amba_devic
if (IS_ERR(uap->clk)) if (IS_ERR(uap->clk))
return PTR_ERR(uap->clk); return PTR_ERR(uap->clk);

2
target/linux/bcm27xx/patches-5.15/950-0061-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
View file

@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -1493,6 +1493,10 @@ static bool pl011_tx_chars(struct uart_a @@ -1496,6 +1496,10 @@ static bool pl011_tx_chars(struct uart_a
if (likely(from_irq) && count-- == 0) if (likely(from_irq) && count-- == 0)
break; break;

6
target/linux/bcm27xx/patches-5.15/950-0077-firmware-bcm2835-Support-ARCH_BCM270x.patch
View file

@ -36,7 +36,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
static DEFINE_MUTEX(transaction_lock); static DEFINE_MUTEX(transaction_lock);
static void response_callback(struct mbox_client *cl, void *msg) static void response_callback(struct mbox_client *cl, void *msg)
@@ -279,6 +281,7 @@ static int rpi_firmware_probe(struct pla @@ -280,6 +282,7 @@ static int rpi_firmware_probe(struct pla
kref_init(&fw->consumers); kref_init(&fw->consumers);
platform_set_drvdata(pdev, fw); platform_set_drvdata(pdev, fw);
@ -44,7 +44,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
rpi_firmware_print_firmware_revision(fw); rpi_firmware_print_firmware_revision(fw);
rpi_register_hwmon_driver(dev, fw); rpi_register_hwmon_driver(dev, fw);
@@ -307,6 +310,7 @@ static int rpi_firmware_remove(struct pl @@ -308,6 +311,7 @@ static int rpi_firmware_remove(struct pl
rpi_clk = NULL; rpi_clk = NULL;
rpi_firmware_put(fw); rpi_firmware_put(fw);
@ -52,7 +52,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
return 0; return 0;
} }
@@ -381,7 +385,18 @@ static struct platform_driver rpi_firmwa @@ -382,7 +386,18 @@ static struct platform_driver rpi_firmwa
.shutdown = rpi_firmware_shutdown, .shutdown = rpi_firmware_shutdown,
.remove = rpi_firmware_remove, .remove = rpi_firmware_remove,
}; };

2
target/linux/bcm27xx/patches-5.15/950-0083-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
View file

@ -27,7 +27,7 @@ mfd: Add rpi_sense_core of compatible string
--- a/drivers/input/joystick/Kconfig --- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig
@@ -399,4 +399,12 @@ config JOYSTICK_N64 @@ -400,4 +400,12 @@ config JOYSTICK_N64
Say Y here if you want enable support for the four Say Y here if you want enable support for the four
built-in controller ports on the Nintendo 64 console. built-in controller ports on the Nintendo 64 console.

2
target/linux/bcm27xx/patches-5.15/950-0101-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
View file

@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static void static void
rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
{ {
@@ -386,15 +407,32 @@ static struct platform_driver rpi_firmwa @@ -387,15 +408,32 @@ static struct platform_driver rpi_firmwa
.remove = rpi_firmware_remove, .remove = rpi_firmware_remove,
}; };

2
target/linux/bcm27xx/patches-5.15/950-0113-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
View file

@ -80,7 +80,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
} }
static void static void
@@ -338,6 +375,7 @@ static int rpi_firmware_probe(struct pla @@ -339,6 +376,7 @@ static int rpi_firmware_probe(struct pla
g_pdev = pdev; g_pdev = pdev;
rpi_firmware_print_firmware_revision(fw); rpi_firmware_print_firmware_revision(fw);

2
target/linux/bcm27xx/patches-5.15/950-0190-Initialise-rpi-firmware-before-clk-bcm2835.patch
View file

@ -36,7 +36,7 @@ Co-authored-by: Phil Elwell <phil@raspberrypi.org>
MODULE_DESCRIPTION("BCM2835 clock driver"); MODULE_DESCRIPTION("BCM2835 clock driver");
--- a/drivers/firmware/raspberrypi.c --- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c
@@ -498,7 +498,7 @@ out2: @@ -499,7 +499,7 @@ out2:
out1: out1:
return ret; return ret;
} }

55
target/linux/bcm27xx/patches-5.15/950-0198-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch
View file

@ -1,55 +0,0 @@
From cf7d5f766e0a9eeb09271c36f546ac0a1fdc0444 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Fri, 24 Jan 2020 14:22:06 +0000
Subject: [PATCH] drm/fourcc: Add packed 10bit YUV 4:2:0 format
Adds a format that is 3 10bit YUV 4:2:0 samples packed into
a 32bit work (with 2 spare bits).
Supported on Broadcom BCM2711 chips.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
drivers/gpu/drm/drm_fourcc.c | 3 +++
include/uapi/drm/drm_fourcc.h | 11 +++++++++++
2 files changed, 14 insertions(+)
--- a/drivers/gpu/drm/drm_fourcc.c
+++ b/drivers/gpu/drm/drm_fourcc.c
@@ -266,6 +266,9 @@ const struct drm_format_info *__drm_form
.num_planes = 3, .char_per_block = { 2, 2, 2 },
.block_w = { 1, 1, 1 }, .block_h = { 1, 1, 1 }, .hsub = 0,
.vsub = 0, .is_yuv = true },
+ { .format = DRM_FORMAT_P030, .depth = 0, .num_planes = 2,
+ .char_per_block = { 4, 4, 0 }, .block_w = { 3, 0, 0 }, .block_h = { 1, 0, 0 },
+ .hsub = 2, .vsub = 2, .is_yuv = true},
};
unsigned int i;
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -325,6 +325,13 @@ extern "C" {
#define DRM_FORMAT_Q401 fourcc_code('Q', '4', '0', '1')
/*
+ * 2 plane YCbCr MSB aligned, 3 pixels packed into 4 bytes.
+ * index 0 = Y plane, [31:0] x:Y2:Y1:Y0 2:10:10:10 little endian
+ * index 1 = Cr:Cb plane, [63:0] x:Cr2:Cb2:Cr1:x:Cb1:Cr0:Cb0 [2:10:10:10:2:10:10:10] little endian
+ */
+#define DRM_FORMAT_P030 fourcc_code('P', '0', '3', '0') /* 2x2 subsampled Cr:Cb plane 10 bits per channel packed */
+
+/*
* 3 plane YCbCr
* index 0: Y plane, [7:0] Y
* index 1: Cb plane, [7:0] Cb
@@ -842,6 +849,10 @@ drm_fourcc_canonicalize_nvidia_format_mo
* and UV. Some SAND-using hardware stores UV in a separate tiled
* image from Y to reduce the column height, which is not supported
* with these modifiers.
+ *
+ * The DRM_FORMAT_MOD_BROADCOM_SAND128_COL_HEIGHT modifier is also
+ * supported for DRM_FORMAT_P030 where the columns remain as 128 bytes
+ * wide, but as this is a 10 bpp format that translates to 96 pixels.
*/
#define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \

4
target/linux/bcm27xx/patches-5.15/950-0238-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
View file

@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Device and char device-related information */ /* Device and char device-related information */
static DEFINE_IDA(gpio_ida); static DEFINE_IDA(gpio_ida);
static dev_t gpio_devt; static dev_t gpio_devt;
@@ -2392,8 +2394,8 @@ int gpiod_direction_output(struct gpio_d @@ -2395,8 +2397,8 @@ int gpiod_direction_output(struct gpio_d
value = !!value; value = !!value;
/* GPIOs used for enabled IRQs shall not be set as output */ /* GPIOs used for enabled IRQs shall not be set as output */
@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
gpiod_err(desc, gpiod_err(desc,
"%s: tried to set a GPIO tied to an IRQ as output\n", "%s: tried to set a GPIO tied to an IRQ as output\n",
__func__); __func__);
@@ -3211,8 +3213,8 @@ int gpiochip_lock_as_irq(struct gpio_chi @@ -3213,8 +3215,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
} }
/* To be valid for IRQ the line needs to be input or open drain */ /* To be valid for IRQ the line needs to be input or open drain */

2
target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
View file

@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -17521,6 +17521,14 @@ T: git git://linuxtv.org/media_tree.git @@ -17529,6 +17529,14 @@ T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
F: drivers/media/i2c/imx412.c F: drivers/media/i2c/imx412.c

2
target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch
View file

@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+... +...
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -17535,6 +17535,7 @@ M: Raspberry Pi Kernel Maintenance <kern @@ -17543,6 +17543,7 @@ M: Raspberry Pi Kernel Maintenance <kern
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
S: Maintained S: Maintained
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git

2
target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
View file

@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com>
+... +...
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -17539,6 +17539,14 @@ F: Documentation/devicetree/bindings/med @@ -17547,6 +17547,14 @@ F: Documentation/devicetree/bindings/med
F: Documentation/devicetree/bindings/media/i2c/imx477.yaml F: Documentation/devicetree/bindings/media/i2c/imx477.yaml
F: drivers/media/i2c/imx477.c F: drivers/media/i2c/imx477.c

2
target/linux/bcm27xx/patches-5.15/950-0578-spi-spidev-Restore-loading-from-Device-Tree.patch
View file

@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
--- a/drivers/spi/spidev.c --- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c
@@ -669,6 +669,7 @@ static const struct file_operations spid @@ -680,6 +680,7 @@ static const struct file_operations spid
static struct class *spidev_class; static struct class *spidev_class;
static const struct spi_device_id spidev_spi_ids[] = { static const struct spi_device_id spidev_spi_ids[] = {

Some files were not shown because too many files have changed in this diff Show more