Merge branch 'cvitek-v4.1.0' into develop

.gitignore

@@ -18,3 +18,5 @@ cscope.*
 ncscope.*
 .svim
 
+__pycache__
+.vscode

build/Kconfig

@@ -228,6 +228,12 @@ config ENABLE_SDK_ASAN
 
 	  If unsure, say N.
 
+config DISABLE_PQBIN_JSON
+	bool "Disable PQbin json"
+	default n
+	help
+	  Make pqbin not include json param
+
 config FLASH_SIZE_SHRINK
 	bool "Do not install sample and self test application"
 	default n
@@ -402,6 +408,13 @@ config UBOOT_SRC
 	string
 	default "u-boot" if UBOOT_2017_07
 	default "u-boot-2021.10" if UBOOT_2021_10
+
+config UBOOT_SPL_CUSTOM
+	bool "Generate the fip_spl.bin contain u-boot-spl"
+	default n
+	depends on UBOOT_2021_10
+	help
+	  Set fip_spl.bin contain u-boot-spl or u-boot.
 endmenu
 
 menu "Kernel options"

build/Makefile

@@ -100,6 +100,10 @@ else
 UBOOT_CONFIG_NAME := ${BRAND}_${PROJECT_FULLNAME}_rls_defconfig
 endif
 
+ifeq ($(CONFIG_UBOOT_SPL_CUSTOM),y)
+UBOOT-SPL_CONFIG_NAME := ${BRAND}_${PROJECT_FULLNAME}_spl_defconfig
+endif
+
 ifeq (${RELEASE_VERSION},1)
 uboot_release_action := ${Q}sed -i "s/CONFIG_BOOTDELAY=1/CONFIG_BOOTDELAY=-2/g" ${UBOOT_PATH}/${UBOOT_OUTPUT_FOLDER}/.config
 endif
@@ -139,14 +143,20 @@ ${UBOOT_PATH}/${UBOOT_OUTPUT_FOLDER}:
 
 UBOOT_OUTPUT_CONFIG_PATH := ${UBOOT_PATH}/${UBOOT_OUTPUT_FOLDER}/.config
 UBOOT_DEFAULT_CONFIG_PATH := ${BUILD_PATH}/boards/${CHIP_ARCH_L}/${PROJECT_FULLNAME}/u-boot/${UBOOT_CONFIG_NAME}
+ifeq ($(CONFIG_UBOOT_SPL_CUSTOM),y)
+UBOOT-SPL_DEFAULT_CONFIG_PATH := ${BUILD_PATH}/boards/${CHIP_ARCH_L}/${PROJECT_FULLNAME}/u-boot/${UBOOT-SPL_CONFIG_NAME}
+endif
 
 # Make a copy to .config~
-${UBOOT_OUTPUT_CONFIG_PATH}: ${UBOOT_DEFAULT_CONFIG_PATH} ${BUILD_PATH}/.config
+${UBOOT_OUTPUT_CONFIG_PATH}: ${UBOOT_DEFAULT_CONFIG_PATH} ${UBOOT-SPL_DEFAULT_CONFIG_PATH} ${BUILD_PATH}/.config
 	$(call print_target)
 	${Q}echo "u-boot's defconfig is updated. Use it."
 	${Q}mkdir -p $(dir ${UBOOT_OUTPUT_CONFIG_PATH})
 	${Q}cmp -s ${UBOOT_DEFAULT_CONFIG_PATH} ${UBOOT_OUTPUT_CONFIG_PATH} || \
 		${Q}cp -vb ${UBOOT_DEFAULT_CONFIG_PATH} ${UBOOT_OUTPUT_CONFIG_PATH}
+ifeq ($(CONFIG_UBOOT_SPL_CUSTOM),y)
+		${Q}-cat ${UBOOT-SPL_DEFAULT_CONFIG_PATH} >> ${UBOOT_OUTPUT_CONFIG_PATH}
+endif
 	$(call uboot_release_action)
 	$(call uboot_bootlogo_action)
 ifeq ($(STORAGE_TYPE), spinor)
@@ -199,6 +209,9 @@ u-boot-build: ${UBOOT_PATH}/${UBOOT_OUTPUT_FOLDER} ${UBOOT_CVIPART_DEP} ${UBOOT_
 	${Q}$(MAKE) -j${NPROC} -C ${UBOOT_PATH} olddefconfig
 	${Q}$(MAKE) -j${NPROC} -C ${UBOOT_PATH} all
 	${Q}cat ${UBOOT_PATH}/${UBOOT_OUTPUT_FOLDER}/u-boot.bin > ${UBOOT_PATH}/${UBOOT_OUTPUT_FOLDER}/u-boot-raw.bin
+ifeq (${CONFIG_UBOOT_SPL_CUSTOM},y)
+	${Q}cat ${UBOOT_PATH}/${UBOOT_OUTPUT_FOLDER}/spl/u-boot-spl.bin > ${UBOOT_PATH}/${UBOOT_OUTPUT_FOLDER}/spl/u-boot-spl-raw.bin
+endif
 
 u-boot: u-boot-dep
 

build/boards/chip_list.json

@@ -16,5 +16,5 @@
 
   "cv180x": {
     "cv180x": ["cv180x", "cv1800b", "cv1800c", "cv1801b", "cv1801c", "cv180zb"]
-  }
+    }
 }

build/boards/cv180x/cv1800b_wevb_0008a_spinor/cv1800b_wevb_0008a_spinor_defconfig

@@ -43,3 +43,4 @@ CONFIG_TARGET_PACKAGE_NTP=y
 CONFIG_ENABLE_FREERTOS=y
 CONFIG_ENABLE_RTOS_DUMP_PRINT=y
 CONFIG_DUMP_PRINT_SZ_IDX=17
+CONFIG_SENSOR_LONTIUM_LT6911=y

build/boards/cv180x/cv1800b_wevb_0008a_spinor/dts_riscv/cv1800b_wevb_0008a_spinor.dts

@@ -4,10 +4,6 @@
 #include "cv180x_asic_spinor.dtsi"
 #include "cv180x_default_memmap.dtsi"
 
-&i2c2 {
-	status = "disabled";
-};
-
 / {
 
 };

build/boards/cv180x/cv1800b_wevb_0008a_spinor/linux/cvitek_cv1800b_wevb_0008a_spinor_defconfig

@@ -155,9 +155,12 @@ CONFIG_SND_SOC_CV182XAADC=y
 CONFIG_SND_SOC_CV182XADAC=y
 CONFIG_SND_SOC_CV1835_USE_AUDIO_PLL=y
 CONFIG_CV1835_I2S_SUBSYS=y
+CONFIG_SND_SOC_CV1835_LT9611=y
+CONFIG_SND_SOC_CV183x_DUMMY_CARD=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_SERIAL=y
 CONFIG_USB_CONFIGFS_ACM=y
@@ -211,3 +214,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_RCU_TRACE is not set
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_USB_STORAGE=y

build/boards/cv180x/cv1800b_wevb_0008a_spinor/u-boot/cvitek_cv1800b_wevb_0008a_spinor_rls_defconfig

@@ -0,0 +1 @@
+../../cv1800b_wdmb_0008a_spinor/u-boot/cvitek_cv1800b_wdmb_0008a_spinor_rls_defconfig

build/boards/cv180x/cv180zb_wevb_0008a_spinor/cv180zb_wevb_0008a_spinor_defconfig

@@ -32,6 +32,7 @@ CONFIG_TARGET_PACKAGE_CRONTABS=y
 CONFIG_TARGET_PACKAGE_WIFI=y
 CONFIG_TARGET_PACKAGE_DROPBEAR=y
 CONFIG_TARGET_PACKAGE_NTP=y
+CONFIG_ENABLE_FREERTOS=y
 CONFIG_ENABLE_RTOS_DUMP_PRINT=y
 CONFIG_DUMP_PRINT_SZ_IDX=17
 CONFIG_USE_4K_ERASE_SIZE_FOR_JFFS2=y

build/boards/cv181x/cv1810c_wevb_0006a_spinor/cv1810c_wevb_0006a_spinor_defconfig

@@ -44,3 +44,4 @@ CONFIG_TARGET_PACKAGE_NTP=y
 CONFIG_ENABLE_FREERTOS=y
 CONFIG_ENABLE_RTOS_DUMP_PRINT=y
 CONFIG_DUMP_PRINT_SZ_IDX=17
+CONFIG_UBOOT_SPL_CUSTOM=n

build/boards/cv181x/cv1810c_wevb_0006a_spinor/u-boot/cvitek_cv1810c_wevb_0006a_spinor_spl_defconfig

@@ -0,0 +1 @@
+../../../default/u-boot/cvitek_uboot_spl_riscv_spinor_defconfig

build/boards/cv181x/cv1811c_wevb_0006a_spinand/linux/cvitek_cv1811c_wevb_0006a_spinand_rls_defconfig

@@ -118,7 +118,7 @@ CONFIG_RTL8188FU=y
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
-# CONFIG_INPUT is not set
+CONFIG_INPUT=y
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
@@ -143,6 +143,8 @@ CONFIG_POWER_RESET=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_WATCHDOG=y
+CONFIG_FB=y
+CONFIG_FB_CVITEK=m
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_PCM_TIMER is not set

build/boards/cv181x/cv1811c_wevb_0006a_spinand/u-boot/cvitek_cv1811c_wevb_0006a_spinand_rls_defconfig

@@ -6,76 +6,39 @@ CONFIG_IDENT_STRING=" cvitek_cv181x"
 CONFIG_ARCH_RV64I=y
 CONFIG_RISCV_SMODE=y
 CONFIG_TARGET_CVITEK_CV181X=y
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-# CONFIG_FIT_PRINT is not set
-# CONFIG_LEGACY_IMAGE_FORMAT is not set
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
 CONFIG_BOOTDELAY=0
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run distro_bootcmd"
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-# CONFIG_SYS_LONGHELP is not set
 CONFIG_SYS_PROMPT="cv181x_c906# "
-# CONFIG_SYS_XTRACE is not set
-# CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
-# CONFIG_CMD_CPU is not set
-# CONFIG_CMD_BOOTD is not set
-# CONFIG_CMD_BOOTI is not set
-# CONFIG_BOOTM_NETBSD is not set
-CONFIG_BOOTM_OPENRTOS=y
-# CONFIG_BOOTM_PLAN9 is not set
-# CONFIG_BOOTM_RTEMS is not set
-# CONFIG_BOOTM_VXWORKS is not set
-# CONFIG_CMD_ELF is not set
-# CONFIG_CMD_FDT is not set
-# CONFIG_CMD_GO is not set
-# CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_EXPORTENV is not set
-# CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_EDITENV is not set
-# CONFIG_CMD_SAVEENV is not set
-# CONFIG_CMD_ENV_EXISTS is not set
 # CONFIG_CMD_CRC32 is not set
-# CONFIG_CMD_MEMORY is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LZMADEC is not set
+# CONFIG_CMD_UNLZ4 is not set
+# CONFIG_CMD_UNZIP is not set
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_MMC=y
-CONFIG_CMD_PART=y
-# CONFIG_CMD_ECHO is not set
 # CONFIG_CMD_ITEST is not set
-# CONFIG_CMD_SOURCE is not set
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_BOOTP is not set
-# CONFIG_CMD_TFTPBOOT is not set
-# CONFIG_CMD_NFS is not set
-# CONFIG_CMD_BLOCK_CACHE is not set
-# CONFIG_CMD_SLEEP is not set
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-# CONFIG_ENV_IS_IN_SPI_FLASH is not set
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_CVI_SD_UPDATE=y
+# CONFIG_ISO_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_CVITEK=y
 CONFIG_MTD=y
 # CONFIG_SPI_FLASH is not set
-# CONFIG_PHY_SMSC is not set
 CONFIG_PHY_CVITEK=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
-CONFIG_FAT_WRITE=y
-# CONFIG_REGEX is not set
+CONFIG_LZ4=y
 CONFIG_LZMA=y
-# CONFIG_GZIP is not set
-# CONFIG_EFI_LOADER is not set
 # CONFIG_TOOLS_LIBCRYPTO is not set
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_FLASH_CVSNFC_V3=y

build/boards/cv181x/cv1811c_wevb_0006a_spinor/cv1811c_wevb_0006a_spinor_defconfig

@@ -44,3 +44,4 @@ CONFIG_TARGET_PACKAGE_NTP=y
 CONFIG_ENABLE_FREERTOS=y
 CONFIG_ENABLE_RTOS_DUMP_PRINT=y
 CONFIG_DUMP_PRINT_SZ_IDX=17
+CONFIG_UBOOT_SPL_CUSTOM=n

build/boards/cv181x/cv1811c_wevb_0006a_spinor/u-boot/cvitek_cv1811c_wevb_0006a_spinor_spl_defconfig

@@ -0,0 +1 @@
+../../../default/u-boot/cvitek_uboot_spl_riscv_spinor_defconfig

build/boards/cv181x/cv1812cp_wevb_0006a_emmc/config.json

@@ -0,0 +1,9 @@
+{
+    "ddr_cfg_list": [
+        "",
+        "ddr3_1866_x16",
+        "ddr3_2133_x16",
+        "ddr_auto_x16"
+    ],
+    "board_information": "C906B + EMMC 8192MB + BGA SIP 256MB"
+}

build/boards/cv181x/cv1812cp_wevb_0006a_emmc/cv1812cp_wevb_0006a_emmc_defconfig

@@ -0,0 +1,39 @@
+CONFIG_CHIP_cv1812cp=y
+CONFIG_BOARD_wevb_0006a_emmc=y
+CONFIG_DDR_CFG_ddr3_1866_x16=y
+CONFIG_ARCH="riscv"
+CONFIG_CROSS_COMPILE="riscv64-unknown-linux-gnu-"
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_KERNEL_ENTRY_HACK=y
+CONFIG_KERNEL_ENTRY_HACK_ADDR="0x80200000"
+CONFIG_TOOLCHAIN_MUSL_RISCV64=y
+CONFIG_FLASH_SIZE_SHRINK=y
+CONFIG_BOOT_IMAGE_SINGLE_DTB=y
+CONFIG_STORAGE_TYPE_emmc=y
+CONFIG_SENSOR_GCORE_GC4653=y
+CONFIG_SENSOR_SMS_SC3335=y
+CONFIG_SENSOR_SMS_SC500AI=y
+CONFIG_SENSOR_SONY_IMX307=y
+CONFIG_SENSOR_SONY_IMX307_2L=y
+CONFIG_SENSOR_SONY_IMX307_SLAVE=y
+CONFIG_SENSOR_SONY_IMX327=y
+CONFIG_SENSOR_SONY_IMX327_2L=y
+CONFIG_SENSOR_SONY_IMX327_SLAVE=y
+CONFIG_SENSOR_OV_OS04C10=y
+CONFIG_SENSOR_OV_OS04A10=y
+CONFIG_UBOOT_2021_10=y
+CONFIG_KERNEL_SRC_5.10=y
+CONFIG_KERNEL_LZMA=y
+CONFIG_SKIP_RAMDISK=y
+CONFIG_SENSOR_TUNING_PARAM_cv181x_src_gcore_gc4653=y
+# CONFIG_ROOTFS_OVERLAYFS is not set
+CONFIG_TARGET_PACKAGE_DROPBEAR=y
+CONFIG_TARGET_PACKAGE_MTD-UTILS=y
+# CONFIG_TARGET_PACKAGE_RSYSLOG is not set
+CONFIG_TARGET_PACKAGE_BUSYBOX_SYSLOGD_SCRIPT=y
+CONFIG_ENABLE_FREERTOS=y
+CONFIG_ENABLE_RTOS_DUMP_PRINT=y
+CONFIG_DUMP_PRINT_SZ_IDX=17
+CONFIG_TARGET_PACKAGE_GATORD=n
+CONFIG_TARGET_PACKAGE_NTP=y
+CONFIG_TARGET_PACKAGE_WIFI=y

build/boards/cv181x/cv1812cp_wevb_0006a_emmc/dts_riscv/cv1812cp_wevb_0006a_emmc.dts

@@ -0,0 +1,14 @@
+/dts-v1/;
+#include "cv181x_base_riscv.dtsi"
+#include "cv181x_asic_qfn.dtsi"
+#include "cv181x_asic_emmc.dtsi"
+#include "cv181x_default_memmap.dtsi"
+
+/ {
+
+};
+
+&emmc {
+	no-1-8-v;
+};
+