From 211d6a8637edb36056331dc192d673f76ba029d5 Mon Sep 17 00:00:00 2001 From: whoim2 Date: Mon, 3 Apr 2023 09:02:09 +0300 Subject: [PATCH] hi3536dv100_fpv as FPV ground station, stage 1 --- .../kernel/hi3536dv100.generic.config | 12 ++- .../configs/hi3536dv100_fpv_defconfig | 43 +++++++--- .../remove_fallthrough.patch | 84 ------------------- 3 files changed, 39 insertions(+), 100 deletions(-) delete mode 100644 general/package/all-patches/wireguard-linux-compat/remove_fallthrough.patch diff --git a/br-ext-chip-hisilicon/board/hi3536dv100/kernel/hi3536dv100.generic.config b/br-ext-chip-hisilicon/board/hi3536dv100/kernel/hi3536dv100.generic.config index 160cbc56..be143c55 100644 --- a/br-ext-chip-hisilicon/board/hi3536dv100/kernel/hi3536dv100.generic.config +++ b/br-ext-chip-hisilicon/board/hi3536dv100/kernel/hi3536dv100.generic.config @@ -1183,7 +1183,10 @@ CONFIG_PPP_MPPE=m # CONFIG_PPP_SYNC_TTY is not set # CONFIG_SLIP is not set CONFIG_SLHC=m -# CONFIG_USB_NET_DRIVERS is not set +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_RNDIS_HOST=m CONFIG_WLAN=y # CONFIG_WLAN_VENDOR_ADMTEK is not set # CONFIG_WLAN_VENDOR_ATH is not set @@ -1227,7 +1230,8 @@ CONFIG_RTL8XXXU=m # CONFIG_WLAN_VENDOR_TI is not set # CONFIG_WLAN_VENDOR_ZYDAS is not set # CONFIG_MAC80211_HWSIM is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set + +CONFIG_USB_NET_RNDIS_WLAN=y # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -1252,7 +1256,7 @@ CONFIG_INPUT_MOUSEDEV=m CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_JOYDEV=y CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set @@ -1305,7 +1309,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y # CONFIG_MOUSE_GPIO is not set # CONFIG_MOUSE_SYNAPTICS_I2C is not set # CONFIG_MOUSE_SYNAPTICS_USB is not set -# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_JOYSTICK=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig index ccfc41e5..e5275bbc 100644 --- a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig @@ -42,7 +42,7 @@ BR2_LINUX_KERNEL_EXT_HISI_PATCHER_LIST="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3 # Filesystem # BR2_TARGET_TZ_INFO is not set -# BR2_TARGET_ROOTFS_CPIO is not set +BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay" @@ -60,11 +60,11 @@ BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config" BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_FDK_AAC_OPENIPC is not set BR2_PACKAGE_FWPRINTENV_OPENIPC=y -BR2_PACKAGE_HASERL=y +#BR2_PACKAGE_HASERL=y # BR2_PACKAGE_HISI_GPIO is not set BR2_PACKAGE_IPCTOOL=y # BR2_PACKAGE_JSON_C is not set -BR2_PACKAGE_JSONFILTER=y +#BR2_PACKAGE_JSONFILTER=y # BR2_PACKAGE_LAME_OPENIPC is not set BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y @@ -72,35 +72,54 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set -BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +#BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y # BR2_PACKAGE_LIBEVENT_OPENIPC is not set # BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT is not set # BR2_PACKAGE_LIBOGG_OPENIPC is not set # BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC is not set -BR2_PACKAGE_LIBYAML=y +#BR2_PACKAGE_LIBYAML=y # BR2_PACKAGE_MAJESTIC_FONTS is not set -BR2_PACKAGE_MBEDTLS_OPENIPC=y +#BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MICROBE_WEB=y +#BR2_PACKAGE_MICROBE_WEB=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_OPUS_OPENIPC is not set # BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT is not set # BR2_PACKAGE_SSHPASS is not set # BR2_PACKAGE_UACME_OPENIPC is not set BR2_PACKAGE_VTUND_OPENIPC=y -BR2_PACKAGE_YAML_CLI=y -BR2_PACKAGE_XMDP=y +#BR2_PACKAGE_YAML_CLI=y +#BR2_PACKAGE_XMDP=y # WiFi BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +#BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y -BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y -# BR2_PACKAGE_RTL8188EU is not set +#BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y +#BR2_PACKAGE_RTL8188EU=y +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271=y +BR2_PACKAGE_RTL8812AU_OPENIPC=y + +# FPV +BR2_PACKAGE_DATALINK=y +BR2_PACKAGE_WIFIBROADCAST=y +#BR2_PACKAGE_WFBOPENHD=y +BR2_PACKAGE_MAVLINK_ROUTER=y +#BR2_PACKAGE_MAVFWD=y + +#FFMPEG +BR2_PACKAGE_FFMPEG_OPENIPC=y + + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE=y + +# IPTABLES +#BR2_PACKAGE_IPTABLES=y # WIREGUARD # BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set diff --git a/general/package/all-patches/wireguard-linux-compat/remove_fallthrough.patch b/general/package/all-patches/wireguard-linux-compat/remove_fallthrough.patch deleted file mode 100644 index 4a1c8a78..00000000 --- a/general/package/all-patches/wireguard-linux-compat/remove_fallthrough.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- a/src/compat/siphash/siphash.c 2022-10-13 13:32:56.761640510 +0300 -+++ b/src/compat/siphash/siphash.c 2022-10-13 13:33:41.061624482 +0300 -@@ -77,11 +77,11 @@ - bytemask_from_count(left))); - #else - switch (left) { -- case 7: b |= ((u64)end[6]) << 48; fallthrough; -- case 6: b |= ((u64)end[5]) << 40; fallthrough; -- case 5: b |= ((u64)end[4]) << 32; fallthrough; -+ case 7: b |= ((u64)end[6]) << 48; -+ case 6: b |= ((u64)end[5]) << 40; -+ case 5: b |= ((u64)end[4]) << 32; - case 4: b |= le32_to_cpup(data); break; -- case 3: b |= ((u64)end[2]) << 16; fallthrough; -+ case 3: b |= ((u64)end[2]) << 16; - case 2: b |= le16_to_cpup(data); break; - case 1: b |= end[0]; - } -@@ -109,11 +109,11 @@ - bytemask_from_count(left))); - #else - switch (left) { -- case 7: b |= ((u64)end[6]) << 48; fallthrough; -- case 6: b |= ((u64)end[5]) << 40; fallthrough; -- case 5: b |= ((u64)end[4]) << 32; fallthrough; -+ case 7: b |= ((u64)end[6]) << 48; -+ case 6: b |= ((u64)end[5]) << 40; -+ case 5: b |= ((u64)end[4]) << 32; - case 4: b |= get_unaligned_le32(end); break; -- case 3: b |= ((u64)end[2]) << 16; fallthrough; -+ case 3: b |= ((u64)end[2]) << 16; - case 2: b |= get_unaligned_le16(end); break; - case 1: b |= end[0]; - } -@@ -269,11 +269,11 @@ - bytemask_from_count(left))); - #else - switch (left) { -- case 7: b |= ((u64)end[6]) << 48; fallthrough; -- case 6: b |= ((u64)end[5]) << 40; fallthrough; -- case 5: b |= ((u64)end[4]) << 32; fallthrough; -+ case 7: b |= ((u64)end[6]) << 48; -+ case 6: b |= ((u64)end[5]) << 40; -+ case 5: b |= ((u64)end[4]) << 32; - case 4: b |= le32_to_cpup(data); break; -- case 3: b |= ((u64)end[2]) << 16; fallthrough; -+ case 3: b |= ((u64)end[2]) << 16; - case 2: b |= le16_to_cpup(data); break; - case 1: b |= end[0]; - } -@@ -301,11 +301,11 @@ - bytemask_from_count(left))); - #else - switch (left) { -- case 7: b |= ((u64)end[6]) << 48; fallthrough; -- case 6: b |= ((u64)end[5]) << 40; fallthrough; -- case 5: b |= ((u64)end[4]) << 32; fallthrough; -+ case 7: b |= ((u64)end[6]) << 48; -+ case 6: b |= ((u64)end[5]) << 40; -+ case 5: b |= ((u64)end[4]) << 32; - case 4: b |= get_unaligned_le32(end); break; -- case 3: b |= ((u64)end[2]) << 16; fallthrough; -+ case 3: b |= ((u64)end[2]) << 16; - case 2: b |= get_unaligned_le16(end); break; - case 1: b |= end[0]; - } -@@ -426,7 +426,7 @@ - v0 ^= m; - } - switch (left) { -- case 3: b |= ((u32)end[2]) << 16; fallthrough; -+ case 3: b |= ((u32)end[2]) << 16; - case 2: b |= le16_to_cpup(data); break; - case 1: b |= end[0]; - } -@@ -448,7 +448,7 @@ - v0 ^= m; - } - switch (left) { -- case 3: b |= ((u32)end[2]) << 16; fallthrough; -+ case 3: b |= ((u32)end[2]) << 16; - case 2: b |= get_unaligned_le16(end); break; - case 1: b |= end[0]; - }