Merge branch 'cvitek-v4.1.0' into develop

build/Kconfig

@@ -565,18 +565,47 @@ config FAST_IMAGE_TYPE
 		E_FAST_H264 : 2
 		E_FAST_H265 : 3
 
-config ENABLE_ALIOS
-	bool "Enable ALIOS"
-	default n
+choice
+	prompt "Alios source selection"
+	default DISABLE_ALIOS
+	config DISABLE_ALIOS
+		bool "disable alios"
+		help
+			Disable alios update tool
+			We usually choose this configuration
+			This configuration is required to compile the boot kernel uboot
+			This configuration does not support alios upgrades
+	config ENABLE_ALIOS_UPDATE
+		bool "mars/phobos alios update"
+		help
+			Enable alios update tool
+			We don't usually choose this configuration
+			This configuration is required to compile the tools that update mars/phobos alios
+			This configuration does not support booting the kernel
+	config ENABLE_ALIOS
+		bool "mercury alios"
+		help
+			Enable mercury alios update tool
+			We don't usually choose this configuration
+			This configuration is required to compile the tools that update mercury alios
+			This configuration does not support booting the kernel
+endchoice
+
+config ALIOS_SOURCE
+	string
+	default "mars_alios" if ENABLE_ALIOS_UPDATE
+	default "alios" if ENABLE_ALIOS
+	default "" if DISABLE_ALIOS
 	help
-	  Enable alios.
+		Select build alios source.
 
 config ALIOS_SOLUTION
-	string "Select alios solution"
-	default "cv182x_helloworld"
-	depends on ENABLE_ALIOS
+	string
+	default "helloworld" if ENABLE_ALIOS_UPDATE
+	default "cv182x_helloworld" if ENABLE_ALIOS
+	default "" if DISABLE_ALIOS
 	help
-	  Select solution to build alios.
+		Select solution to build alios.
 
 endmenu
 

build/boards/chip_list.json

@@ -1,20 +1,9 @@
 {
-  "cv183x": {
-    "cv183x": ["cv1829", "cv1832", "cv1835", "cv1838"],
-    "cv952x": ["cv9520"],
-    "cv75x1": ["cv7581"]
-  },
-
-  "cv182x": {
-    "cv182x": ["cv1820", "cv1821", "cv1822", "cv1823", "cv1825", "cv1826"],
-    "cv73x7": ["cv7327", "cv7357"]
-  },
-
   "cv181x": {
-    "cv181x": ["cv181x", "cv1823a", "cv1821a", "cv1820a", "cv1811h", "cv1811c", "cv1810c", "cv1810h", "cv1812cp", "cv1812h", "cv1813h"]
+    "cv181x": ["cv181x", "cv1811h", "cv1811c", "cv1810c", "cv1810h", "cv1812cp", "cv1812h", "cv1813h"]
   },
 
   "cv180x": {
     "cv180x": ["cv180x", "cv1800b", "cv1800c", "cv1801b", "cv1801c", "cv180zb"]
-    }
+  }
 }

build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig

@@ -337,3 +337,6 @@ CONFIG_ADVISE_SYSCALLS=n
 CONFIG_SIGNALFD=n
 CONFIG_TIMERFD=n
 CONFIG_EPOLL=n
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y

build/boards/cv180x/cv1800b_sophpi_duo_sd/linux/cvitek_cv1800b_sophpi_duo_sd_defconfig

@@ -260,3 +260,6 @@ CONFIG_ADVISE_SYSCALLS=n
 CONFIG_SIGNALFD=n
 CONFIG_TIMERFD=n
 CONFIG_EPOLL=n
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y

build/boards/cv180x/cv1800b_wdmb_0008a_spinor/linux/cvitek_cv1800b_wdmb_0008a_spinor_defconfig

@@ -225,3 +225,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_RCU_TRACE is not set
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y

build/boards/cv180x/cv1800b_wevb_0008a_spinor/linux/cvitek_cv1800b_wevb_0008a_spinor_defconfig

@@ -217,3 +217,6 @@ CONFIG_DEBUG_FS=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_USB_STORAGE=y
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y

build/boards/cv180x/cv1800c_wevb_0009a_spinor/linux/cvitek_cv1800c_wevb_0009a_spinor_defconfig

@@ -211,3 +211,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_RCU_TRACE is not set
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y

build/boards/cv180x/cv1801b_wevb_0008a_spinor/linux/cvitek_cv1801b_wevb_0008a_spinor_defconfig

@@ -371,3 +371,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y

build/boards/cv180x/cv1801c_wdmb_0009a_spinor/linux/cvitek_cv1801c_wdmb_0009a_spinor_defconfig

@@ -387,3 +387,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y

build/boards/cv180x/cv1801c_wevb_0009a_spinand/linux/cvitek_cv1801c_wevb_0009a_spinand_defconfig

@@ -458,3 +458,6 @@ CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_SERIAL=y
 CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y

build/boards/cv180x/cv1801c_wevb_0009a_spinor/linux/cvitek_cv1801c_wevb_0009a_spinor_defconfig

@@ -372,3 +372,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_FTRACE is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_ELF_CORE=y
+CONFIG_COREDUMP=y
+CONFIG_PROC_SYSCTL=y