Merge branch 'OpenIPC:master' into master

br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config

@@ -733,7 +733,7 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=n
+CONFIG_CFG80211_WEXT=y
 # CONFIG_LIB80211 is not set
 CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y

br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig

@@ -104,6 +104,11 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL8188EU=y
 # BR2_PACKAGE_RTL8188EU is not set
 BR2_PACKAGE_RTL8188FU_OPENIPC=y
 
+# WiFi AP
+# BR2_PACKAGE_WIRELESS_CONFIGURATION is not set
+# BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT is not set
+# BR2_PACKAGE_MT7601U_AP_OPENIPC is not set
+
 # WIREGUARD
 BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_WIREGUARD_TOOLS=y

br-ext-chip-sigmastar/linux/linux-ext-sigmastar_initramfs.mk

@@ -6,41 +6,10 @@
 
 ifeq ($(BR2_LINUX_KERNEL_EXT_SIGMASTAR_INITRAMFS),y)
 LINUX_EXTENSIONS += sigmastar-initramfs
+LINUX_DEPENDENCIES += sigmastar-initramfs
 endif
 
-SIGMASTAR_INITRAMFS_BUSYBOX_VERSION = 1.36.0
-SIGMASTAR_INITRAMFS_BUSYBOX_SOURCE = busybox-$(SIGMASTAR_INITRAMFS_BUSYBOX_VERSION).tar.bz2
-SIGMASTAR_INITRAMFS_BUSYBOX_SITE = https://www.busybox.net/downloads
-
-SIGMASTAR_INITRAMFS_DOSFSTOOLS_VERSION = 4.2
-SIGMASTAR_INITRAMFS_DOSFSTOOLS_SOURCE = dosfstools-$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_VERSION).tar.gz
-SIGMASTAR_INITRAMFS_DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_VERSION)
-
-SIGMASTAR_INITRAMFS_TOOLCHAIN_SOURCE = arm-linux-musleabihf-cross.tgz
-SIGMASTAR_INITRAMFS_TOOLCHAIN_SITE = https://more.musl.cc/10/x86_64-linux-musl
-
-SIGMASTAR_INITRAMFS_BUSYBOX_PATH = $(HOST_DIR)/source/busybox-$(SIGMASTAR_INITRAMFS_BUSYBOX_VERSION)
-SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH = $(HOST_DIR)/source/dosfstools-$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_VERSION)
-SIGMASTAR_INITRAMFS_TOOLCHAIN_PATH = $(HOST_DIR)/source/arm-linux-musleabihf-cross/bin
-
 define SIGMASTAR_INITRAMFS_PREPARE_KERNEL
-	mkdir -p $(LINUX_DIR)/initramfs
+	cp -rf $(SIGMASTAR_INITRAMFS_PKGDIR)/files/initramfs $(@D)
-	cp -f $(SIGMASTAR_INITRAMFS_PKGDIR)/files/* $(LINUX_DIR)/initramfs
+	$(SIGMASTAR_INITRAMFS_PKGDIR)/sigmastar-initramfs.sh "$(@D)" "$(MAKE)"
-
-	wget -c $(SIGMASTAR_INITRAMFS_BUSYBOX_SITE)/$(SIGMASTAR_INITRAMFS_BUSYBOX_SOURCE) -P $(HOST_DIR)/source
-	tar -xf $(HOST_DIR)/source/$(SIGMASTAR_INITRAMFS_BUSYBOX_SOURCE) -C $(HOST_DIR)/source
-
-	wget -c $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_SITE)/$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_SOURCE) -P $(HOST_DIR)/source
-	tar -xf $(HOST_DIR)/source/$(SIGMASTAR_INITRAMFS_DOSFSTOOLS_SOURCE) -C $(HOST_DIR)/source
-
-	wget -c $(SIGMASTAR_INITRAMFS_TOOLCHAIN_SITE)/$(SIGMASTAR_INITRAMFS_TOOLCHAIN_SOURCE) -P $(HOST_DIR)/source
-	tar -xf $(HOST_DIR)/source/$(SIGMASTAR_INITRAMFS_TOOLCHAIN_SOURCE) -C $(HOST_DIR)/source
-
-	cp -f $(SIGMASTAR_INITRAMFS_PKGDIR)/files/initramfs_defconfig $(SIGMASTAR_INITRAMFS_BUSYBOX_PATH)/.config
-	$(MAKE) CROSS_COMPILE=$(SIGMASTAR_INITRAMFS_TOOLCHAIN_PATH)/arm-linux-musleabihf- -C $(SIGMASTAR_INITRAMFS_BUSYBOX_PATH)
-	cp -f $(SIGMASTAR_INITRAMFS_BUSYBOX_PATH)/busybox $(LINUX_DIR)/initramfs
-
-	cd $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH) && ./autogen.sh && ./configure
-	$(MAKE) CFLAGS="-static -s" CC=$(SIGMASTAR_INITRAMFS_TOOLCHAIN_PATH)/arm-linux-musleabihf-gcc -C $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH)
-	cp -f $(SIGMASTAR_INITRAMFS_DOSFSTOOLS_PATH)/src/fsck.fat $(LINUX_DIR)/initramfs
 endef

general/package/ingenic-opensdk/src/kernel/sensor_info/sample_sinfo.c

@@ -113,7 +113,6 @@ SENSOR_INFO_T g_sinfo[] =
 	{"sc500ai"},
 	{"jxq03"},
 	{"jxq03p"},
-	{"sc3338"},
 
 };
 int main(int argc,char **argv)

general/package/ingenic-opensdk/src/kernel/sensor_info/sensor_info.c

@@ -173,7 +173,7 @@ SENSOR_INFO_T g_sinfo[] =
 	{"sc500ai", 0x30,  "cgu_cim", 24000000, {0xce, 0x1f}, 1, {0x3107, 0x3108}, 2, 2, NULL},
 	{"jxq03",  0x40,  "cgu_cim", 24000000, {0x05, 0x07}, 1, {0xa, 0xb}, 1, 2, NULL},
 	{"jxq03p",  0x40,  "cgu_cim", 24000000, {0x08, 0x43}, 1, {0xa, 0xb}, 1, 2, NULL},
-	{"sc3338", 0x30,  "cgu_cim", 24000000, {0xcc, 0x41}, 1, {0x3107, 0x3108}, 2, 2, NULL},
+
 };
 
 static int8_t g_sensor_id = -1;

general/package/ingenic-osdrv-t31/files/sensor/sc3338.yaml

@@ -1,6 +0,0 @@
-sensor:
-  name: sc3338
-  address: 0x30
-  width: 2304
-  height: 1296
-  bus: i2c

general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk

@@ -50,7 +50,6 @@ define INGENIC_OSDRV_T31_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_swan_1.0__/ingenic $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/kmod/sensor_sc200ai_t31.ko
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_swan_1.0__/ingenic $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/kmod/sensor_sc2232h_t31.ko
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_swan_1.0__/ingenic $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/kmod/sensor_sc2335_t31.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_swan_1.0__/ingenic $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/kmod/sensor_sc3338_t31.ko
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_swan_1.0__/ingenic $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/kmod/sensor_sc5235_t31.ko
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin

general/package/mt7601u-ap-openipc/0001-optimization.patch

@@ -1,20 +0,0 @@
---- a/etc/Wireless/RT2870AP/RT2870AP.dat	2018-03-24 12:12:30.000000000 +0300
-+++ b/etc/Wireless/RT2870AP/RT2870AP.dat	2021-12-16 00:57:15.692019329 +0300
-@@ -4,7 +4,7 @@
- CountryRegionABand=7
- CountryCode=TW
- BssidNum=1
--SSID=HD_MESH_1
-+SSID=OpenIPC
- WirelessMode=9
- TxRate=0
- Channel=11
-@@ -60,7 +60,7 @@
- RekeyInterval=0
- RekeyMethod=DISABLE
- PMKCachePeriod=10
--WPAPSK=1234567890
-+WPAPSK=openipc2021
- DefaultKeyID=1
- Key1Type=0
- Key1Str=

general/package/mt7601u-ap-openipc/Config.in

@@ -4,7 +4,5 @@ config BR2_PACKAGE_MT7601U_AP_OPENIPC
 	help
 	  Wireless driver mt7601u with AP mode.
 
-	  https://github.com/muratdemirtas/MT7601u
-
 comment "MT7601U_AP_OPENIPC needs a Linux kernel to be built"
 	depends on !BR2_LINUX_KERNEL

general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk

@@ -4,35 +4,12 @@
 #
 ################################################################################
 
-MT7601U_AP_OPENIPC_VERSION = fd4a47e55af879f8a1affb89cfc1e91b8aa45306
+MT7601U_AP_OPENIPC_VERSION = 1e3e907a87c8c79f567b7349c058327744424dce
-MT7601U_AP_OPENIPC_SITE = $(call github,muratdemirtas,MT7601u,$(MT7601U_AP_OPENIPC_VERSION))
+MT7601U_AP_OPENIPC_SITE = $(call github,openipc,mt7601u,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = 188146b4147e1d86c916ffc33451bafda211cebb
-# MT7601U_AP_OPENIPC_SITE = $(call github,terence-deng,mt7601u,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = cb1b0f3324b6dbf8f6a10276f5cb12382dc098e8
-# MT7601U_AP_OPENIPC_SITE = $(call github,eywalink,mt7601u,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = f43c4893264f11065534e26d20d62d956e93c115
-# MT7601U_AP_OPENIPC_SITE = $(call github,THLIVSQAZ,MT7601U,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = 4b57b1d6075634966eb55324ed53aa2b1c4f4912
-# MT7601U_AP_OPENIPC_SITE = $(call github,PolyVection,mt7601u-ap,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = 624307427149e53b75937ccbe7cb235ec3ef2f58
-# MT7601U_AP_OPENIPC_SITE = $(call github,Anthony96922,mt7601u-ap,$(MT7601U_AP_OPENIPC_VERSION))
-
 MT7601U_AP_OPENIPC_LICENSE = GPL-2.0
 
 MT7601U_AP_OPENIPC_MODULE_MAKE_OPTS = \
-	KVER=$(LINUX_VERSION_PROBED) \
 	KSRC=$(LINUX_DIR)
 
-define MT7601U_AP_OPENIPC_INSTALL_FIRMWARE
-	$(INSTALL) -D -m 644 $(@D)/etc/Wireless/RT2870AP/RT2870AP.dat \
-		$(TARGET_DIR)/etc/Wireless/RT2870AP/RT2870AP.dat
-endef
-MT7601U_AP_OPENIPC_POST_INSTALL_TARGET_HOOKS += MT7601U_AP_OPENIPC_INSTALL_FIRMWARE
-
 $(eval $(kernel-module))
 $(eval $(generic-package))

general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk

@@ -4,14 +4,13 @@
 #
 ################################################################################
 
-RTL8733BU_OPENIPC_VERSION = 8c35a579acbe67675c66021160ba8cc6522cd00c
+RTL8733BU_OPENIPC_VERSION = 57bc087de30d3c34ff1c4b1452ea5c91aeb75d07
-RTL8733BU_OPENIPC_SITE = $(call github,gitguest0,rtl8733bu,$(RTL8733BU_OPENIPC_VERSION))
+RTL8733BU_OPENIPC_SITE = $(call github,openipc,rtl8733bu,$(RTL8733BU_OPENIPC_VERSION))
 RTL8733BU_OPENIPC_LICENSE = GPL-2.0
 RTL8733BU_OPENIPC_LICENSE_FILES = COPYING
 
 RTL8733BU_OPENIPC_MODULE_MAKE_OPTS = \
 	CONFIG_RTL8733BU=m \
-	KVER=$(LINUX_VERSION_PROBED) \
 	KSRC=$(LINUX_DIR)
 
 $(eval $(kernel-module))