Merge branch 'OpenIPC:master' into master

.github/workflows/build.yml

@@ -172,6 +172,7 @@ jobs:
 
       - name: Prepare firmware
         run: |
+          echo "nameserver 8.8.8.8" | sudo tee /etc/resolv.conf
           echo CACHE_DATE=$(date +%m) >> ${GITHUB_ENV}
           make BOARD=${{matrix.platform}}_${{matrix.release}} br-source
 

br-ext-chip-ingenic/board/t21/kernel/t21.generic.config

@@ -1140,8 +1140,8 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
-# CONFIG_MFD_JZ_SADC_V13 is not set
-# CONFIG_MFD_JZ_SADC_AUX is not set
+CONFIG_MFD_JZ_SADC_V13=y
+CONFIG_MFD_JZ_SADC_AUX=y
 CONFIG_MFD_JZ_TCU=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set

br-ext-chip-ingenic/board/t31/kernel/t31.generic.config

@@ -1170,8 +1170,8 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
-# CONFIG_MFD_JZ_SADC_V13 is not set
-# CONFIG_MFD_JZ_SADC_AUX is not set
+CONFIG_MFD_JZ_SADC_V13=y
+CONFIG_MFD_JZ_SADC_AUX=y
 CONFIG_MFD_JZ_TCU=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set

br-ext-chip-ingenic/board/t40/kernel/t40.generic.config

@@ -1267,8 +1267,8 @@ CONFIG_MFD_CORE=y
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_INTEL_SOC_PMIC is not set
-# CONFIG_MFD_INGENIC_SADC_V13 is not set
-# CONFIG_MFD_INGENIC_SADC_AUX is not set
+CONFIG_MFD_INGENIC_SADC_V13=y
+CONFIG_MFD_INGENIC_SADC_AUX=y
 CONFIG_MFD_INGENIC_TCU=y
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_88PM800 is not set

br-ext-chip-sigmastar/board/infinity6/kernel/infinity6-ssc009a.config

@@ -1853,7 +1853,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
+CONFIG_MS_FLASH_ISP_MXP_PARTS=y
 CONFIG_MS_PWM=y
 CONFIG_MS_SPINAND=y
 # CONFIG_NAND_SINGLE_READ is not set

br-ext-chip-sigmastar/board/infinity6/kernel/infinity6-ssc009b.config

@@ -1853,7 +1853,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
+CONFIG_MS_FLASH_ISP_MXP_PARTS=y
 CONFIG_MS_PWM=y
 CONFIG_MS_SPINAND=y
 # CONFIG_NAND_SINGLE_READ is not set

br-ext-chip-sigmastar/board/infinity6b0/kernel/infinity6b0-ssc009a.config

@@ -1877,7 +1877,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
+CONFIG_MS_FLASH_ISP_MXP_PARTS=y
 CONFIG_MS_PWM=y
 # CONFIG_PWM_NEW is not set
 CONFIG_MS_SPINAND=y

br-ext-chip-sigmastar/board/infinity6b0/kernel/infinity6b0-ssc009b.config

@@ -1877,7 +1877,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
+CONFIG_MS_FLASH_ISP_MXP_PARTS=y
 CONFIG_MS_PWM=y
 # CONFIG_PWM_NEW is not set
 CONFIG_MS_SPINAND=y

br-ext-chip-sigmastar/board/infinity6e/kernel/infinity6e-ssc012b.config

@@ -1887,7 +1887,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
+CONFIG_MS_FLASH_ISP_MXP_PARTS=y
 CONFIG_MS_PWM=y
 # CONFIG_PWM_NEW is not set
 CONFIG_MS_SPINAND=y

general/overlay/etc/wireless/usb

@@ -106,6 +106,13 @@ if [ "$1" = "rtl8188fu-hi3518ev300-unknown1" ]; then
 	exit 0
 fi
 
+# HI3518EV300 t5810hct-m02
+if [ "$1" = "rtl8188fu-hi3518ev300-t5810hct-m02" ]; then
+	set_gpio 40 1
+	modprobe 8188fu
+	exit 0
+fi
+
 # SSC325DE IMOU C22EP-S2
 if [ "$1" = "rtl8188fu-ssc325de-imou-c22ep-s2" ]; then
 	set_gpio 62 1

general/package/autonight/Config.in

@@ -1,4 +1,4 @@
 config BR2_PACKAGE_AUTONIGHT
 	bool "autonight"
 	help
-	  autonight - automatic switching of day/night modes depending on the readings of the IR Sensor
+	  Automatic day/night mode switcher for Ingenic devices.

general/package/autonight/autonight.mk

@@ -4,22 +4,18 @@
 #
 ################################################################################
 
+AUTONIGHT_SITE_METHOD = local
+AUTONIGHT_SITE = $(AUTONIGHT_PKGDIR)/src
+
 AUTONIGHT_LICENSE = MIT
 AUTONIGHT_LICENSE_FILES = LICENSE
 
-define AUTONIGHT_EXTRACT_CMDS
-	cp -avr $(AUTONIGHT_PKGDIR)/src/* $(@D)/
-endef
-
-AUTONIGHT_MAKE_OPTS = \
-	CC="$(TARGET_CC)"
-
 define AUTONIGHT_BUILD_CMDS
-	$(MAKE) $(AUTONIGHT_MAKE_OPTS) -C $(@D)
+	$(TARGET_CC) $(@D)/autonight.c -o $(@D)/autonight -s
 endef
 
 define AUTONIGHT_INSTALL_TARGET_CMDS
-	install -m 0755 -D $(@D)/autonight $(TARGET_DIR)/usr/bin/autonight
+	$(INSTALL) -m 0755 -t $(TARGET_DIR)/usr/bin $(@D)/autonight
 endef
 
 $(eval $(generic-package))

general/package/autonight/src/Makefile

@@ -1,9 +0,0 @@
-.PHONY: all clean
-
-all: autonight
-
-autonight: autonight.o
-	$(CC) -o $@ $^
-
-clean:
-	-rm -rf *.o

general/package/autonight/src/autonight.c

@@ -9,107 +9,104 @@
 #define BUF_SIZE 256
 
 const char *device = "/dev/jz_adc_aux_0";
-const char *nightModeCmd = "curl localhost/night/";
+const char *nightModeCmd = "curl localhost/night";
 int delayBetweenReads = 3;
-int thresholdOn = 900;
-int thresholdOff = 1000;
+int thresholdOn = 800;
+int thresholdOff = 1200;
 bool nightModeEnabled = false;
 
-void
-jzAuxRead(const char *device, int *value)
-{
+void jzAuxRead(const char *device, int *value) {
 	int fd, size, count;
 
 	fd = open(device, O_RDONLY);
-	if(fd < 0){
+	if (fd < 0) {
 		perror(device);
 		exit(EXIT_FAILURE);
 	}
+
 	size = sizeof(*value);
 	count = read(fd, (void *)value, size);
 	close(fd);
-	if(count != size){
+
+	if (count != size) {
 		perror("read()");
 		exit(EXIT_FAILURE);
 	}
 }
 
-void
-updateNightMode()
-{
+void updateNightMode() {
 	int ret;
 	char buf[BUF_SIZE];
 
-	printf("Night Mode %s\n", nightModeEnabled ? "Enabled" : "Disabled");
-	snprintf(buf, BUF_SIZE, "%s%s\n", nightModeCmd, nightModeEnabled ? "on" : "off");
+	printf("> Mode: %s\n", nightModeEnabled ? "Night" : "Day");
+	snprintf(buf, BUF_SIZE, "%s/%s\n", nightModeCmd, nightModeEnabled ? "on" : "off");
+
 	ret = system(buf);
-	if(ret != 0){
+	if (ret != 0) {
 		perror("system()");
 		exit(EXIT_FAILURE);
 	}
 }
 
-void
-usage(const char *argv0)
-{
-	fprintf(stderr, "\nusage: %s [options]\n\n"
-	                "options:\n"
-	                "	-D sets jz_adc_aux device (default: %s)\n"
-	                "	-c sets the command to call to set night mode (default: %s)\n"
-	                "	-d delay (in seconds) between ADC reads (default: %d)\n"
-	                "	-O turn on night mode when ADC value drops below this threshold (default: %d)\n"
-	                "	-F turn off night mode when ADC value goes above this threshold (default: %d)\n"
-	                "	-h print this usage statement and exit\n\n",  argv0, device, nightModeCmd, delayBetweenReads, thresholdOn, thresholdOff);
+void usage(const char *argv) {
+	fprintf(stderr, "Usage: %s [option]\n\n"
+		"Options:\n"
+		"    -D sets jz_adc_aux device (default: %s)\n"
+		"    -c sets the command to call to set night mode (default: %s)\n"
+		"    -d delay (in seconds) between ADC reads (default: %d)\n"
+		"    -O turn on night mode when ADC drops below threshold (default: %d)\n"
+		"    -F turn off night mode when ADC goes above threshold (default: %d)\n"
+		"    -h print this usage statement and exit\n\n",
+		argv, device, nightModeCmd, delayBetweenReads, thresholdOn, thresholdOff);
 }
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char **argv) {
 	int opt, value;
 
-	while((opt = getopt(argc, argv, "D:c:d:O:F:h:")) != -1){
-		switch(opt){
+	while ((opt = getopt(argc, argv, "D:c:d:O:F:h:")) != -1) {
+		switch (opt) {
 			case 'D':
 				device = optarg;
 				break;
+
 			case 'c':
 				nightModeCmd = optarg;
 				break;
+
 			case 'd':
 				delayBetweenReads = atoi(optarg);
 				break;
+
 			case 'O':
 				thresholdOn = atoi(optarg);
 				break;
+
 			case 'F':
 				thresholdOff = atoi(optarg);
 				break;
+
 			case 'h':
 				usage(argv[0]);
 				exit(EXIT_SUCCESS);
+
 			default:
 				usage(argv[0]);
 				exit(EXIT_FAILURE);
 		}
 	}
 
-	if(daemon(0, 0) < 0){
-		perror("daemon()");
-		exit(EXIT_FAILURE);
-	}
-
-	sleep(5);
-
-	while(true){
+	while (true) {
 		jzAuxRead(device, &value);
-		printf("Current value: %d\n", value);
-		if(!nightModeEnabled && value >= thresholdOn){
+		printf("> Value: %d\n", value);
+
+		if (!nightModeEnabled && value >= thresholdOn) {
 			nightModeEnabled = true;
 			updateNightMode();
-		} else if(nightModeEnabled && value < thresholdOff){
+		} else if (nightModeEnabled && value < thresholdOff) {
 			nightModeEnabled = false;
 			updateNightMode();
 		}
+
 		sleep(delayBetweenReads);
 	}
 

general/package/rtl8812au-openipc/rtl8812au-openipc.mk

@@ -5,7 +5,7 @@
 ################################################################################
 
 RTL8812AU_OPENIPC_SITE = $(call github,svpcom,rtl8812au,$(RTL8812AU_OPENIPC_VERSION))
-RTL8812AU_OPENIPC_VERSION = HEAD
+RTL8812AU_OPENIPC_VERSION = dc9993dd6e7de738de8437add043747a6bfc475c
 
 RTL8812AU_OPENIPC_LICENSE = GPL-2.0
 RTL8812AU_OPENIPC_LICENSE_FILES = COPYING