Merge branch 'OpenIPC:master' into my_changes

.github/workflows/matrix_build.yml

@@ -57,6 +57,7 @@ jobs:
           - ssc335
           - ssc338q
           - t31
+          - t40
           - xm510
           - xm530
 
@@ -194,6 +195,7 @@ jobs:
           - gk7202v300
           - gk7605v100
           - t31
+          - t40
         release:
           - lite
           - ultimate

Makefile

@@ -75,7 +75,7 @@ else
 	DEBIAN_FRONTEND=noninteractive apt-get update && \
 		apt-get -y install \
 		build-essential git make libncurses-dev wget curl \
-		cpio rsync bc unzip file
+		cpio rsync bc unzip file lzop
 endif
 
 

br-ext-chip-sigmastar/board/infinity6e/kernel/patches/01_infinity6e_kernel_4.9.84_sdk-set_uart_pad.patch

@@ -0,0 +1,13 @@
+diff --git a/arch/arm/boot/dts/infinity6e.dtsi b/arch/arm/boot/dts/infinity6e.dtsi
+index 6337859aa4b5..7cfb80ce2225 100755
+--- a/arch/arm/boot/dts/infinity6e.dtsi
++++ b/arch/arm/boot/dts/infinity6e.dtsi
+@@ -577,7 +577,7 @@
+ #endif
+             sctp_enable = <1>;//rts cts enable is 1
+             dma = <1>;
+-            pad = <PAD_PM_GPIO0>;//fuart mode3
++            pad = <PAD_FUART_RX>;
+             //pad = <PAD_PM_GPIO2>;//fuart mode6
+             //pad = <PAD_FUART_RX>;
+             //pad = <PAD_FUART_TX>;

br-ext-chip-sigmastar/board/infinity6e/kernel/patches/02_infinity6e_kernel_4.9.84_sdk-reduce_i2c_logging.patch

@@ -0,0 +1,49 @@
+diff --git a/drivers/sstar/i2c/ms_iic.c b/drivers/sstar/i2c/ms_iic.c
+index 797560daf683..df8f8238e3d3 100755
+--- a/drivers/sstar/i2c/ms_iic.c
++++ b/drivers/sstar/i2c/ms_iic.c
+@@ -1029,7 +1029,7 @@ ms_i2c_xfer_read(u8 u8Port, struct i2c_msg *pmsg, u8 *pbuf, int length)
+ 				perrBuf += sprintf(perrBuf,"%#x ", *pbuf);
+ 				pbuf++;
+ 			}
+-			pr_info("ERROR: Bus[%d] in ms_i2c_xfer_read: Slave dev NAK, Addr: %#x, Data: %s \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),errBuf);
++			pr_debug("ERROR: Bus[%d] in ms_i2c_xfer_read: Slave dev NAK, Addr: %#x, Data: %s \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),errBuf);
+ 			return -ETIMEDOUT;
+ 		} else {
+ 			return 0;
+@@ -1060,7 +1060,7 @@ ms_i2c_xfer_read(u8 u8Port, struct i2c_msg *pmsg, u8 *pbuf, int length)
+ 			perrBuf += sprintf(perrBuf,"%#x ", *pbuf);
+             pbuf++;
+ 		 }
+-		 pr_info("ERROR: Bus[%d] in ms_i2c_xfer_read: Slave dev NAK, Addr: %#x, Data: %s \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),errBuf);
++		 pr_debug("ERROR: Bus[%d] in ms_i2c_xfer_read: Slave dev NAK, Addr: %#x, Data: %s \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),errBuf);
+ 
+         return -ETIMEDOUT;
+     }
+@@ -1150,7 +1150,7 @@ ms_i2c_xfer_write(u8 u8Port, struct i2c_msg *pmsg, u8 *pbuf, int length)
+ 				perrBuf += sprintf(perrBuf,"%#x ", *pbuf);
+ 				pbuf++;
+ 			}
+-			pr_info("ERROR: Bus[%d] in ms_i2c_xfer_write: Slave dev NAK, Addr: %#x, Data: %s \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),errBuf);
++			pr_debug("ERROR: Bus[%d] in ms_i2c_xfer_write: Slave dev NAK, Addr: %#x, Data: %s \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),errBuf);
+ 			return -ETIMEDOUT;
+ 		}else{
+ 			return 0;
+@@ -1182,7 +1182,7 @@ ms_i2c_xfer_write(u8 u8Port, struct i2c_msg *pmsg, u8 *pbuf, int length)
+ 			perrBuf += sprintf(perrBuf,"%#x ", *pbuf);
+             pbuf++;
+ 		 }
+-		 pr_info("ERROR: Bus[%d] in ms_i2c_xfer_write: Slave dev NAK, Addr: %#x, Data: %s \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),errBuf);
++		 pr_debug("ERROR: Bus[%d] in ms_i2c_xfer_write: Slave dev NAK, Addr: %#x, Data: %s \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),errBuf);
+          return -ETIMEDOUT;
+      }
+ 
+@@ -1197,7 +1197,7 @@ ms_i2c_xfer_write(u8 u8Port, struct i2c_msg *pmsg, u8 *pbuf, int length)
+         }
+         else
+         {
+-			pr_info("ERROR: Bus[%d] in ms_i2c_xfer_write: Slave data NAK, Addr: %#x, Data: %#x \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),*pbuf);
++			pr_debug("ERROR: Bus[%d] in ms_i2c_xfer_write: Slave data NAK, Addr: %#x, Data: %#x \r\n", (u16Offset/256),(((pmsg->addr & I2C_BYTE_MASK) << 1) | ((pmsg->flags & I2C_M_RD) ? 1 : 0)),*pbuf);
+             return -ETIMEDOUT;
+         }
+     }

br-ext-chip-sigmastar/board/infinity6e/kernel/ssc338q.generic.config

@@ -335,7 +335,7 @@ CONFIG_MODULES_AREA_SIZE=0x00800000
 #
 # Options
 #
-CONFIG_SS_DTB_NAME="infinity6e-ssc338q-camhi"
+CONFIG_SS_DTB_NAME="infinity6e-ssc012b-s01a"
 CONFIG_SS_BUILTIN_DTB=y
 CONFIG_MS_KERNEL_TYPE=""
 CONFIG_SSTAR_CHIP_NAME="infinity6e"
@@ -522,7 +522,9 @@ CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_AREAS=1
 # CONFIG_ZPOOL is not set
 # CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
+CONFIG_ZSMALLOC=y
+CONFIG_PGTABLE_MAPPING=y
+# CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_FORCE_MAX_ZONEORDER=10
@@ -919,7 +921,7 @@ CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_GLUEBI=y
 # CONFIG_MTD_UBI_BLOCK is not set
 CONFIG_DTC=y
 CONFIG_OF=y
@@ -934,7 +936,20 @@ CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_PARPORT is not set
-# CONFIG_BLK_DEV is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
+CONFIG_ZRAM=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=2
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_BLK_DEV_RBD is not set
 # CONFIG_NVME_TARGET is not set
 
 #
@@ -1114,23 +1129,7 @@ CONFIG_FIXED_PHY=y
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 # CONFIG_USB_NET_DRIVERS is not set
-CONFIG_WLAN=y
+# CONFIG_WLAN is not set
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-# CONFIG_WLAN_VENDOR_ATH is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-# CONFIG_WLAN_VENDOR_BROADCOM is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
-# CONFIG_WLAN_VENDOR_INTEL is not set
-# CONFIG_WLAN_VENDOR_INTERSIL is not set
-# CONFIG_WLAN_VENDOR_MARVELL is not set
-# CONFIG_WLAN_VENDOR_MEDIATEK is not set
-# CONFIG_WLAN_VENDOR_RALINK is not set
-# CONFIG_WLAN_VENDOR_REALTEK is not set
-# CONFIG_WLAN_VENDOR_RSI is not set
-# CONFIG_WLAN_VENDOR_ST is not set
-# CONFIG_WLAN_VENDOR_TI is not set
-# CONFIG_WLAN_VENDOR_ZYDAS is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1276,7 +1275,7 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPMI is not set
@@ -1896,7 +1895,8 @@ CONFIG_MS_ZEN=y
 # CONFIG_MSYS_DMEM_SYSFS_ALL is not set
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
-# CONFIG_MS_FLASH_ISP is not set
+CONFIG_MS_FLASH_ISP=y
+CONFIG_MS_FLASH_ISP_MXP_PARTS=y
 CONFIG_MS_PWM=y
 # CONFIG_PWM_NEW is not set
 CONFIG_MS_SPINAND=y
@@ -1907,7 +1907,8 @@ CONFIG_AUTO_DETECT=y
 # CONFIG_NAND_QUAL_WRITE is not set
 CONFIG_AUTO_DETECT_WRITE=y
 # CONFIG_MS_SPI_INFINITY is not set
-# CONFIG_SS_MSPI is not set
+CONFIG_SS_MSPI=y
+# CONFIG_SPI_INT_CALL is not set
 # CONFIG_CAM_CLK is not set
 # CONFIG_MS_EMMC is not set
 CONFIG_MS_SDMMC=y
@@ -2040,7 +2041,8 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_EFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WRITEBUFFER is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
 # CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
@@ -2436,7 +2438,7 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
-# CONFIG_CRYPTO_LZ4 is not set
+CONFIG_CRYPTO_LZ4=y
 # CONFIG_CRYPTO_LZ4HC is not set
 
 #
@@ -2492,6 +2494,8 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_X86 is not set
 # CONFIG_XZ_DEC_POWERPC is not set

br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig

@@ -23,7 +23,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.84"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6e/kernel/ssc338q.generic.config.camhi"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6e/kernel/ssc338q.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 BR2_LINUX_KERNEL_EXT_SIGMASTAR_PATCHER=y

br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig

@@ -23,7 +23,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.84"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6e/kernel/ssc338q.generic.config.camhi"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6e/kernel/ssc338q.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 BR2_LINUX_KERNEL_EXT_SIGMASTAR_PATCHER=y
@@ -37,7 +37,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
 BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y
-BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="$(TOPDIR)/../scripts/ubinize.cfg"
+BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="$(TOPDIR)/../scripts/ubinize_sigmastar.cfg"
 BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
 BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh"
@@ -69,7 +69,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
 BR2_PACKAGE_LIBOGG_OPENIPC=y
 BR2_PACKAGE_LIBYAML=y
 # BR2_PACKAGE_MAJESTIC_FONTS is not set
-# BR2_PACKAGE_MAJESTIC is not set
+BR2_PACKAGE_MAJESTIC=y
 BR2_PACKAGE_MBEDTLS_OPENIPC=y
 # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
 # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
@@ -79,7 +79,6 @@ BR2_PACKAGE_MICROBE_WEB=y
 BR2_PACKAGE_OPUS_OPENIPC=y
 BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
 BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y
-BR2_PACKAGE_SIGMASTAR_OSDRV_SENSOR="imx415"
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_EXFAT_OPENIPC=y

general/overlay/etc/shadow

@@ -0,0 +1,9 @@
+root:$1$jv4d1NpW$PpH6Xd79JR1JkUDLMJLch1:19477::::::
+daemon:*:::::::
+bin:*:::::::
+sys:*:::::::
+sync:*:::::::
+mail:*:::::::
+www-data:*:::::::
+operator:*:::::::
+nobody:*:::::::

general/overlay/usr/sbin/sysupgrade

@@ -63,8 +63,9 @@ do_update_rootfs() {
 	local y=/tmp/rootfs
 	if mkdir -p "$y" && loop=$(losetup -f) && losetup "$loop" "$x" && mount "$loop" "$y"; then
 		check_soc "$(head -1 ${y}/etc/hostname | cut -d- -f2)"
-		compare_versions "$system_version" "$(get_system_version "$y")" && return 0
+		compare_versions "$system_version" "$(get_system_version "$y")" && exit_update=1
 		umount "$y" && rm -rf "$y" && losetup -d "$loop"
+		[ "$exit_update" ] && return 0
 	else
 		die "Unable to mount $y!"
 	fi
@@ -76,14 +77,15 @@ do_update_rootfs() {
 do_wipe_overlay() {
 	echo_c 33 "\nOverlayFS"
 	echo "Erase overlay partition"
-	flash_eraseall -j "$(get_device "rootfs_data")"
+	[ $(ipcinfo -F) = "nand" ] || jffs2="-j"
+	flash_eraseall $jffs2 "$(get_device "rootfs_data")"
 }
 
 download_firmware() {
 	echo_c 33 "\nFirmware"
 	osr=$(get_system_build)
 	ftype=$(ipcinfo -F 2>/dev/null)
-	[ ${#ftype} -gt 4 ] && ftype=$(get_flash_type)
+	[ ${#ftype} -ge 4 ] && ftype=$(get_flash_type)
 	build="${soc}-${ftype}-${osr}"
 	[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz"
 	echo "Download from $url"

general/package/busybox/busybox.config

@@ -866,7 +866,7 @@ CONFIG_FEATURE_HTTPD_CGI=y
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-CONFIG_FEATURE_HTTPD_PROXY=y
+# CONFIG_FEATURE_HTTPD_PROXY is not set
 CONFIG_FEATURE_HTTPD_GZIP=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y

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

@@ -114,7 +114,9 @@ SENSOR_INFO_T g_sinfo[] =
 	{"jxq03"},
 	{"jxq03p"},
 	{"sc3338"},
-
+	{"imx334"},
+	{"imx335"},
+	{"imx415"},
 };
 int main(int argc,char **argv)
 {

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

@@ -174,6 +174,9 @@ SENSOR_INFO_T g_sinfo[] =
 	{"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},
+	{"imx334", 0x1a,  "cgu_cim", 37125000, {0x20, 0x03}, 1, {0x302e, 0x302f}, 2, 2, NULL},
+	{"imx335", 0x1a,  "cgu_cim", 37125000, {0x08, 0x0}, 1, {0x302e, 0x302f}, 2, 2, NULL},
+	{"imx415", 0x1a,  "cgu_cim", 37125000, {0x28, 0x23}, 1, {0x3b00, 0x3b06}, 2, 2, NULL},
 };
 
 static int8_t g_sensor_id = -1;