Merge branch 'master' into master

OpenIPC · Dec 3, 2023 · f3f4b9c · f3f4b9c
2 parents 7904dbc + 627c66e
commit f3f4b9c
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 1,336 deletions.
diff --git a/br-ext-chip-ingenic/configs/t31_lite_defconfig b/br-ext-chip-ingenic/configs/t31_lite_defconfig
@@ -109,7 +109,7 @@ BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_WIREGUARD_TOOLS=y
 
 # EXPERIMENTAL
-BR2_PACKAGE_ONVIF_SIMPLE_SERVER=y
+# BR2_PACKAGE_ONVIF_SIMPLE_SERVER is not set
 
 # DEBUG
 BR2_PACKAGE_INGENIC_PWM=y

diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
@@ -108,9 +108,6 @@ BR2_PACKAGE_ATBM60XX=y
 BR2_PACKAGE_RTL8189FS_OPENIPC=y
 # BR2_PACKAGE_RTL8188EU is not set
 
-# Motors
-BR2_PACKAGE_INGENIC_MOTORS_T31=y
-
 # WIREGUARD
 BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_WIREGUARD_TOOLS=y

diff --git a/general/package/Config.in b/general/package/Config.in
@@ -37,7 +37,6 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/hisilicon-osdrv-serdes/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/hisilicon-osdrv1-sources/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/i2c-telemetry/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-libimp-control/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-motors-t31/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-opensdk/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t20/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t21/Config.in"

diff --git a/general/package/ingenic-libimp-control/ingenic-libimp-control.mk b/general/package/ingenic-libimp-control/ingenic-libimp-control.mk
@@ -4,10 +4,14 @@
 #
 ################################################################################
 
-INGENIC_LIBIMP_CONTROL_VERSION = master
-INGENIC_LIBIMP_CONTROL_SITE = $(call github,gtxaspec,libimp_control,$(INGENIC_LIBIMP_CONTROL_VERSION))
-INGENIC_LIBIMP_CONTROL_LICENSE = GPL-2.0
-INGENIC_LIBIMP_CONTROL_LICENSE_FILES = COPYING
+ifeq ($(LOCAL_DOWNLOAD),y)
+INGENIC_LIBIMP_CONTROL_SITE_METHOD = git
+INGENIC_LIBIMP_CONTROL_SITE = https://github.com/gtxaspec/libimp_control
+INGENIC_LIBIMP_CONTROL_VERSION = $(shell git ls-remote $(INGENIC_LIBIMP_CONTROL_SITE) HEAD | head -1 | cut -f1)
+else
+INGENIC_LIBIMP_CONTROL_SITE = https://github.com/gtxaspec/libimp_control/archive
+INGENIC_LIBIMP_CONTROL_SOURCE = master.tar.gz
+endif
 
 define INGENIC_LIBIMP_CONTROL_BUILD_CMDS
 	$(MAKE) CONFIG_SOC=$(OPENIPC_SOC_MODEL) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)

diff --git a/general/package/ingenic-motors-t31/Config.in b/general/package/ingenic-motors-t31/Config.in
diff --git a/general/package/ingenic-motors-t31/ingenic-motors-t31.mk b/general/package/ingenic-motors-t31/ingenic-motors-t31.mk
diff --git a/general/package/ingenic-motors-t31/src/Makefile b/general/package/ingenic-motors-t31/src/Makefile