diff --git a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config index 36484648..2be3065a 100644 --- a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config @@ -1687,7 +1687,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y # # also be needed; see USB_STORAGE Help for more info # -CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_REALTEK is not set # CONFIG_USB_STORAGE_DATAFAB is not set @@ -1773,7 +1773,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_PXA27X is not set # CONFIG_USB_MV_UDC is not set CONFIG_HIUSB_DEVICE2_0=y -CONFIG_USB_HISI_UDC=m +# CONFIG_USB_HISI_UDC is not set # CONFIG_USB_MV_U3D is not set # CONFIG_USB_M66592 is not set # CONFIG_USB_BDC_UDC is not set @@ -1781,14 +1781,14 @@ CONFIG_USB_HISI_UDC=m # CONFIG_USB_GADGET_XILINX is not set # CONFIG_USB_DUMMY_HCD is not set CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_MASS_STORAGE=m +# CONFIG_USB_F_MASS_STORAGE is not set # CONFIG_USB_CONFIGFS is not set # CONFIG_USB_ZERO is not set # CONFIG_USB_ETH is not set # CONFIG_USB_G_NCM is not set # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FUNCTIONFS is not set -CONFIG_USB_MASS_STORAGE=m +# CONFIG_USB_MASS_STORAGE is not set # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_CDC_COMPOSITE is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_mini_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_mini_defconfig index cd24e488..94527ace 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_mini_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_mini_defconfig @@ -98,6 +98,10 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL8188EU=y BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y +# MQTT +BR2_PACKAGE_MOSQUITTO=y +# BR2_PACKAGE_MOSQUITTO_BROKER is not set + # DEBUG BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_GDB=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig index b44b3462..c6f6a86a 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig @@ -99,6 +99,10 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL8188EU=y BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y +# MQTT +BR2_PACKAGE_MOSQUITTO=y +# BR2_PACKAGE_MOSQUITTO_BROKER is not set + # DEBUG BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_GDB=y diff --git a/building.sh b/building.sh index bd4bd7a2..2771720b 100755 --- a/building.sh +++ b/building.sh @@ -135,13 +135,13 @@ rename_initramfs() { } autoup_rootfs() { - echo_c 34 "\nDownloading u-boot-hi3518ev200-universal.bin" - curl --location --output ./output/images/u-boot-hi3518ev200-universal.bin \ - https://github.com/OpenIPC/firmware/releases/download/latest/u-boot-hi3518ev200-universal.bin + echo_c 34 "\nDownloading u-boot created by OpenIPC" + curl --location --output ./output/images/u-boot-${SOC}-universal.bin \ + https://github.com/OpenIPC/firmware/releases/download/latest/u-boot-${SOC}-universal.bin echo_c 34 "\nMaking autoupdate u-boot image" ./output/host/bin/mkimage -A arm -O linux -T firmware -n "$OPENIPC_VER" \ - -a 0x0 -e 0x50000 -d ./output/images/u-boot-hi3518ev200-universal.bin \ + -a 0x0 -e 0x50000 -d ./output/images/u-boot-${SOC}-universal.bin \ ./output/images/autoupdate-uboot.img echo_c 34 "\nMaking autoupdate kernel image" @@ -192,7 +192,7 @@ FUNCS=( hi3518ev100 hi3516cv200 - hi3518ev200 hi3518ev200_hs303v1 hi3518ev200_ultimate + hi3518ev200 hi3518ev200_ultimate hi3516cv300 hi3516cv300_ultimate hi3516ev100 @@ -259,8 +259,9 @@ uni_build() { set -e if [ "$(echo $BOARD | cut -sd '_' -f 2)" == "" ]; then BOARD="${BOARD}_openipc" - elif [ "$BOARD" == "hi3518ev200_hs303v1" ]; then - BOARD=hi3518ev200_openipc + fi + + if [ "$BOARD" == "hi3518ev200_openipc" ]; then NEED_AUTOUP=1 fi diff --git a/general/overlay/etc/modules b/general/overlay/etc/modules index 57809af7..b2c7411f 100644 --- a/general/overlay/etc/modules +++ b/general/overlay/etc/modules @@ -1,3 +1,2 @@ f2fs vfat -#usb-storage diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 82296dfc..b3fbff8a 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -83,7 +83,7 @@ download_firmware() { echo "Download from $url" [ -z "$HASERLVER" ] && progress="-#" || progress="-s" [ "$(curl -o /dev/null -s -w '%{http_code}\n' "$url")" = "000" ] && die "Check your network!" - curl --connect-timeout 30 -s -m 60 -L "$url" ${progress} -o - | gzip -d | tar xf - -C /tmp && echo_c 32 "Received and unpacked" || die "Cannot retrieve $url" + curl --connect-timeout 30 -s -m 120 -L "$url" ${progress} -o - | gzip -d | tar xf - -C /tmp && echo_c 32 "Received and unpacked" || die "Cannot retrieve $url" if [ "1" != "$skip_md5" ]; then (cd /tmp && md5sum -s -c *.md5sum) || die "Wrong checksum!" fi