Merge branch 'master' into ak3918ev200_is_dead_2

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

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

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

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"
@@ -191,7 +191,7 @@ FUNCS=(
   hi3518ev100
 
   hi3516cv200
-  hi3518ev200  hi3518ev200_hs303v1  hi3518ev200_ultimate
+  hi3518ev200  hi3518ev200_ultimate
 
   hi3516cv300  hi3516cv300_ultimate
   hi3516ev100
@@ -258,8 +258,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
 

general/overlay/etc/modules

@@ -1,3 +1,2 @@
 f2fs
 vfat
-#usb-storage

general/overlay/usr/sbin/sysreset.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+show_help() {
+  echo "Usage: $0 [OPTIONS]
+  -m          Reset Majestic config.
+  -n          Reset network config.
+  -h          Show this help.
+"
+  exit 0
+}
+
+reset_majestic() {
+  cp -f /rom/etc/majestic.yaml /etc/majestic.yaml
+}
+
+reset_network() {
+  cp -f /rom/etc/network/interfaces /etc/network/interfaces
+}
+
+while getopts hmn flag; do
+  case ${flag} in
+  m) reset_majestic ;;
+  n) reset_network ;;
+  h) show_help ;;
+  esac
+done
+
+exit 0

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
@@ -94,7 +94,7 @@ free_resources() {
 	# killall majestic crond klogd ntpd rngd syslogd >/dev/null 2>&1 || true
 	# "load_$vendor" -r >/dev/null 2>&1 || true
 	#
-	echo_c 37 "\nStop services, sync and fresh memory"
+	echo_c 37 "\nStop services, sync files, free up memory"
 	for proc in majestic crond klogd ntpd rngd syslogd; do
 		echo -n "Killing $proc "
 		while [ -n "$(pidof $proc)" ]; do

general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk

@@ -38,7 +38,7 @@ define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iq $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/iq/imx307.ini
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iq $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/iq/imx335.ini
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iq $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/iq/sc2232.ini
-	ln -sf imx335.ini $(TARGET_DIR)/etc/sensors/iq/default.ini
+	ln -sf imx307.ini $(TARGET_DIR)/etc/sensors/iq/default.ini
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke
 	## $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/cipher_drv.ko

general/package/hisilicon-opensdk/hisilicon-opensdk.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HISILICON_OPENSDK_VERSION = 471e047340557995c6aebfdf48dd5628032a7265
+HISILICON_OPENSDK_VERSION = 347d018d23ee33c71e70db4f910a25b926aa070e
 HISILICON_OPENSDK_SITE = $(call github,openipc,openhisilicon,$(HISILICON_OPENSDK_VERSION))
 HISILICON_OPENSDK_LICENSE = GPL-3.0
 HISILICON_OPENSDK_LICENSE_FILES = LICENSE

general/package/hisilicon-osdrv-hi3516ev200/hisilicon-osdrv-hi3516ev200.mk

@@ -22,7 +22,7 @@ define HISILICON_OSDRV_HI3516EV200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/iq
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iq $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/sensor/iq/imx307.ini
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iq $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/sensor/iq/imx335.ini
-	ln -sf imx335.ini $(TARGET_DIR)/etc/sensors/iq/default.ini
+	ln -sf imx307.ini $(TARGET_DIR)/etc/sensors/iq/default.ini
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/hisilicon
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/kmod/camhi-motor.ko