Merge branch 'OpenIPC:master' into master

br-ext-chip-ingenic/board/t31/kernel/patches/0009-optional-disable-jz-gmac.patch

@@ -0,0 +1,71 @@
+--- a/arch/mips/xburst/soc-t31/common/gpio.c
++++ b/arch/mips/xburst/soc-t31/common/gpio.c
+@@ -85,6 +85,7 @@
+ #endif
+ extern int __init gpio_customized_init(void);
+ extern void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume);
++extern int disable_gmac;
+ 
+ struct jzgpio_state {
+ 	unsigned int pxint;
+@@ -972,6 +973,15 @@
+ 			break;
+ 		}
+ 
++		if (!strcmp(g->name,"gmac_pb") && disable_gmac){
++			pr_info("Skipping GMAC GPIO setup\n");
++			continue;
++		}
++		if (!strcmp(g->name,"msc1-pB") && !disable_gmac){
++			pr_info("Skipping MSC1_PB GPIO setup\n");
++			continue;
++		}
++
+ 		jz = &jz_gpio_chips[g->port];
+ 		if (GPIO_AS_FUNC(g->func)) {
+ 			if(jz->dev_map[0] & g->pins) {
+--- a/arch/mips/xburst/soc-t31/common/platform.c
++++ b/arch/mips/xburst/soc-t31/common/platform.c
+@@ -1032,6 +1032,16 @@
+ 	*size = ispmem_size;
+ }
+ 
++int disable_gmac = 0;
++EXPORT_SYMBOL(disable_gmac);
++
++static int __init extras_parse(char *str)
++{
++	disable_gmac = 1;
++	return 0;
++}
++__setup("nogmac", extras_parse);
++
+ #ifndef CONFIG_PROC_FS
+ #error NOT config procfs
+ #endif
+--- a/drivers/net/ethernet/ingenic/jz_mac_v13.c
++++ b/drivers/net/ethernet/ingenic/jz_mac_v13.c
+@@ -2392,8 +2392,11 @@
+ 
+ #define JZ_GMAC_BASE 0xb34b0000
+ 
++extern int disable_gmac;
++
+ static int __init jz_mac_init(void)
+ {
++if (!disable_gmac){
+ #ifndef CONFIG_MDIO_GPIO
+ 	int ret;
+ #endif
+@@ -2420,6 +2423,11 @@
+ 
+ #endif
+ }
++else{
++	pr_info("JZ GMAC disabled\n");
++	return -ENODEV;
++}
++}
+ 
+ module_init(jz_mac_init);
+ 

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

@@ -1436,12 +1436,12 @@ CONFIG_JZMMC_V12_MMC0=y
 # CONFIG_JZMMC_V12_MMC0_PA_4BIT is not set
 # CONFIG_JZMMC_V12_MMC0_PA_8BIT is not set
 CONFIG_JZMMC_V12_MMC0_PB_4BIT=y
-CONFIG_MMC0_MAX_FREQ=24000000
+CONFIG_MMC0_MAX_FREQ=48000000
 # CONFIG_MMC0_PIO_MODE is not set
 CONFIG_JZMMC_V12_MMC1=y
 # CONFIG_JZMMC_V12_MMC1_PD_4BIT is not set
-# CONFIG_JZMMC_V12_MMC1_PB_4BIT is not set
+CONFIG_JZMMC_V12_MMC1_PB_4BIT=y
-CONFIG_JZMMC_V12_MMC1_PC_4BIT=y
+# CONFIG_JZMMC_V12_MMC1_PC_4BIT is not set
 CONFIG_MMC1_MAX_FREQ=24000000
 # CONFIG_MMC1_PIO_MODE is not set
 # CONFIG_JZMMC_V12_MMC2 is not set

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

@@ -34,6 +34,9 @@ define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/WDR
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/WDR $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/config/WDR/*.ini
 
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/60fps
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/60fps $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/config/60fps/*.ini
+
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/iq
 	$(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

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

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HISILICON_OPENSDK_VERSION = 347d018d23ee33c71e70db4f910a25b926aa070e
+HISILICON_OPENSDK_VERSION = c033009fa4551650480604dababcb5a852983593
 HISILICON_OPENSDK_SITE = $(call github,openipc,openhisilicon,$(HISILICON_OPENSDK_VERSION))
 HISILICON_OPENSDK_LICENSE = GPL-3.0
 HISILICON_OPENSDK_LICENSE_FILES = LICENSE
@@ -21,7 +21,20 @@ HISILICON_OPENSDK_MODULE_MAKE_OPTS = \
 
 ifeq ($(FAMILY),hi3516ev200)
 	HISILICON_OPENSDK_MODULE_MAKE_OPTS += DISABLE_ISP=1
+	SDK_CODE=0x3516E200
+else ifeq ($(FAMILY),gk7205v200)
+	SDK_CODE=0x7205200
 endif
 
+# for userspace libraries
+define HISILICON_OPENSDK_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) CHIPARCH=$(FAMILY) SDK_CODE=$(SDK_CODE) -C $(@D)/libraries all
+endef
+
+define HISILICON_OPENSDK_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors
+	$(INSTALL) -D -m 0755 $(@D)/libraries/sensor/$(FAMILY)/sony_imx335/libsns_imx335.so $(TARGET_DIR)/usr/lib/sensors
+endef
+
 $(eval $(kernel-module))
 $(eval $(generic-package))

general/package/majestic/Config.in

@@ -6,103 +6,3 @@ config BR2_PACKAGE_MAJESTIC
 	  (non-commercial version for personal use only)
 
 	  https://openipc.org
-
-config BR2_PACKAGE_AMBARELLA_OSDRV_S3L
-	bool
-	default n
-
-config BR2_PACKAGE_ANYKA_OSDRV_AK3918EV200
-	bool
-	default n
-
-config BR2_PACKAGE_ANYKA_OSDRV_AK3918EV300
-	bool
-	default n
-
-config BR2_PACKAGE_FULLHAN_OSDRV_FH8852V100
-	bool
-	default n
-
-config BR2_PACKAGE_FULLHAN_OSDRV_FH8852V200
-	bool
-	default n
-
-config BR2_PACKAGE_GOKE_OSDRV_GK710X
-	bool
-	default n
-
-config BR2_PACKAGE_GOKE_OSDRV_GK7205V200
-	bool
-	default n
-
-config BR2_PACKAGE_GRAINMEDIA_OSDRV_GM8136
-	bool
-	default n
-
-config BR2_PACKAGE_HISILICON_OSDRV_HI3516AV100
-	bool
-	default n
-
-config BR2_PACKAGE_HISILICON_OSDRV_HI3519V101
-	bool
-	default n
-
-config BR2_PACKAGE_HISILICON_OSDRV_HI3516CV100
-	bool
-	default n
-
-config BR2_PACKAGE_HISILICON_OSDRV_HI3516CV200
-	bool
-	default n
-
-config BR2_PACKAGE_HISILICON_OSDRV_HI3516CV300
-	bool
-	default n
-
-config BR2_PACKAGE_HISILICON_OSDRV_HI3516CV500
-	bool
-	default n
-
-config BR2_PACKAGE_HISILICON_OSDRV_HI3516EV200
-	bool
-	default n
-
-config BR2_PACKAGE_INGENIC_OSDRV_T20
-	bool
-	default n
-
-config BR2_PACKAGE_INGENIC_OSDRV_T21
-	bool
-	default n
-
-config BR2_PACKAGE_INGENIC_OSDRV_T30
-	bool
-	default n
-
-config BR2_PACKAGE_INGENIC_OSDRV_T31
-	bool
-	default n
-
-config BR2_PACKAGE_NOVATEK_OSDRV_NT9856X
-	bool
-	default n
-
-config BR2_PACKAGE_ROCKCHIP_OSDRV_RV11xx
-	bool
-	default n
-
-config BR2_PACKAGE_SIGMASTAR_OSDRV_MSC313E
-	bool
-	default n
-
-config BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335
-	bool
-	default n
-
-config BR2_PACKAGE_XIONGMAI_OSDRV_XM510
-	bool
-	default n
-
-config BR2_PACKAGE_XIONGMAI_OSDRV_XM530
-	bool
-	default n

general/package/wifibroadcast/files/S98wfb

@@ -16,7 +16,7 @@ detect_wifi_card() {
   for card in ${devices}
 	do
 	  case "${card}" in
-	  "0bda:8812" | "0bda:881a")
+	  "0bda:8812" | "0bda:881a" | "0b05:17d2")
 		driver="realtek"
 		modprobe 88XXau rtw_tx_pwr_idx_override=${driver_txpower_override}
 	  ;;