k230 sdk release v2.0

Author: wuwentao

Kconfig.board

@@ -49,6 +49,11 @@ config BOARD_K230_CANMV_DONGSHANPI
         help
            "CANMV(DONGSHANPI)";
 
+config BOARD_K230_CANMV_RTT_EVB
+       bool "K230 CANMV(rtt evb)"
+        help
+           "CANMV(rtt evb)";
+
 config BOARD_K230D_CANMV_BPI
        bool "K230 CANMV(BPI)"
         help

Makefile

@@ -120,8 +120,8 @@ prepare_sourcecode:prepare_toolchain
 #ai
 	@echo "download nncase sdk"
 	@rm -rf src/big/utils/; rm -rf src/big/ai;
-	@wget -q --show-progress $(DOWNLOAD_URL)/downloads/kmodel/kmodel_v2.9.0.tgz -O - | tar -xzC src/big/
-	@wget -q --show-progress $(DOWNLOAD_URL)/downloads/nncase/nncase_k230_rtos_v2.9.0.tgz -O - | tar -xzC src/big/
+	@wget -q --show-progress $(DOWNLOAD_URL)/downloads/kmodel/kmodel_v2.10.0.tgz -O - | tar -xzC src/big/
+	@wget -q --show-progress $(DOWNLOAD_URL)/downloads/nncase/nncase_k230_rtos_v2.10.0.tgz -O - | tar -xzC src/big/
 
 #big utils
 	@echo "download big utils"

configs/k230_canmv_rtt_evb_defconfig

@@ -0,0 +1,75 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# K230 SDK Configuration
+#
+
+#
+# board configuration
+#
+# CONFIG_BOARD_K230_EVB is not set
+# CONFIG_BOARD_K230_FPGA is not set
+# CONFIG_BOARD_K230D is not set
+# CONFIG_BOARD_K230_CANMV is not set
+# CONFIG_BOARD_K230_CANMV_V2 is not set
+# CONFIG_BOARD_K230D_CANMV is not set
+# CONFIG_BOARD_K230_CANMV_01STUDIO is not set
+# CONFIG_BOARD_K230_CANMV_LCKFB is not set
+# CONFIG_BOARD_K230_CANMV_DONGSHANPI is not set
+CONFIG_BOARD_K230_CANMV_RTT_EVB=y
+# CONFIG_BOARD_K230D_CANMV_BPI is not set
+CONFIG_BOARD_NAME="k230_rtt_evb"
+# CONFIG_QUICK_BOOT is not set
+# CONFIG_GEN_SECURITY_IMG is not set
+CONFIG_UBOOT_DEFCONFIG="k230_canmv_dongshanpi"
+CONFIG_LINUX_DEFCONFIG="k230_canmv_dongshanpi"
+CONFIG_LINUX_DTB="k230_canmv_dongshanpi"
+CONFIG_BUILDROOT_DEFCONFIG="k230_evb"
+CONFIG_RTTHREAD_DEFCONFIG="k230_canmv_rtt_evb"
+# CONFIG_REMOTE_TEST_PLATFORM is not set
+CONFIG_GEN_IMG_SCRIPT="board/common/gen_image_script/gen_image.sh"
+CONFIG_RTT_CONSOLE_ID=3
+CONFIG_CANAAN_SITE_IMG_NAME_PREFIX=""
+
+#
+# toolchain configurations
+#
+CONFIG_TOOLCHAIN_PREFIX_RTT="riscv64-unknown-linux-musl-"
+CONFIG_TOOLCHAIN_PATH_RTT="/opt/toolchain/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin"
+CONFIG_TOOLCHAIN_PREFIX_LINUX="riscv64-unknown-linux-gnu-"
+CONFIG_TOOLCHAIN_PATH_LINUX="/opt/toolchain/Xuantie-900-gcc-linux-5.10.4-glibc-x86_64-V2.6.0/bin"
+
+#
+# Memory configuration
+#
+CONFIG_MEM_TOTAL_SIZE=0x40000000
+CONFIG_MEM_IPCM_BASE=0x00100000
+CONFIG_MEM_IPCM_SIZE=0x00100000
+CONFIG_MEM_RTT_SYS_BASE=0x00200000
+CONFIG_MEM_RTT_SYS_SIZE=0x07E00000
+CONFIG_MEM_MMZ_BASE=0x10000000
+CONFIG_MEM_MMZ_SIZE=0x0FC00000
+CONFIG_MEM_LINUX_SYS_BASE=0x08000000
+CONFIG_MEM_LINUX_SYS_SIZE=0x08000000
+CONFIG_MEM_BOUNDARY_RESERVED_SIZE=0x00001000
+
+#
+# storage configurations
+#
+# CONFIG_SPI_NOR is not set
+# CONFIG_SPI_NAND is not set
+CONFIG_SDCAED=y
+
+#
+# wifi configurations
+#
+# CONFIG_AP6212A is not set
+# CONFIG_AP6256 is not set
+CONFIG_RTL8188FU=y
+# CONFIG_RTL8723DU is not set
+# CONFIG_AIC_8800 is not set
+CONFIG_SUPPORT_RTSMART=y
+CONFIG_SUPPORT_LINUX=y
+CONFIG_LINUX_RUN_CORE_ID=0
+# CONFIG_MPP_MIDDLEWARE is not set
+# CONFIG_BUILD_DEBUG_VER is not set
+CONFIG_BUILD_RELEASE_VER=y

repo.mak

@@ -1,11 +1,11 @@
-RT-SMART_VERSION        = "8a21a1a7ae223037a40c2e4328ed7bc17c5710f8"
-MPP_VERSION             = "e13594a7e7412db9611d2639be9830d113885edb"
+RT-SMART_VERSION        = "4096e1730f5e1b8c530a1c4fe05a90d09b2b0782"
+MPP_VERSION             = "869e5a1ca170f658d8516122e4d95b8594265418"
 UNITTEST_VERSION        = "a07caf5e19a6a215605271cfeedce18111790e9d"
 OPENSBI_VERSION         = "1f89326f7dc48d701dbed79f828b80fa28e5b34c"
 BUILDROOT-EXT_VERSION   = "3cef3f973d261f96a6c8f7ccb3bc140b972e1f1c"
-LINUX_VERSION           = "cf51662aaea9e4c594f48c6589f9c323830275c7"
-CDK_VERSION             = "dd23db766f15e43e2ca4cf77c11666319f50e279"
-UBOOT_VERSION           = "fd011fafcf2a1030a4a01b23151b1675fcf5e98c"
+LINUX_VERSION           = "33d1e773a745e533637447812c9aad924bbea25b"
+CDK_VERSION             = "193bd614c422065327ce4d68776e37bef94d19bf"
+UBOOT_VERSION           = "9af86a1892e01bc329329a118f322fe77f05c9f7"
 
 RT-SMART_SRC_PATH        = src/big/rt-smart
 MPP_SRC_PATH             = src/big/mpp

src/big/mpp/include/comm/k_board_config_comm.h

@@ -451,7 +451,51 @@ extern "C" {
 #define LT9611_SLAVE_ADDR   0x3b
 #define LT9611_I2C_BUS      "i2c3"//"i2c4"
 
+#elif defined(CONFIG_BOARD_K230_CANMV_RTT_EVB)
+// usip evb gpio config
+// display gpio
+#define DISPLAY_LCD_RST_GPIO                            22
+#define DISPLAY_LCD_BACKLIGHT_EN                        25
+
+// imx335 gpio config
+#define VICAP_IMX335_RST_GPIO                           46
+#define VICAP_IMX335_MASTER_GPIO                        28
+//OV9286 gpio cinfig
+#define VICAP_OV9286_RST_GPIO                           20
+
+#define OV5647_IIC "i2c0"
+#define OV5647_CAM_PIN                                  61
+
+#define OV5647_CSI1_IIC  "i2c1"
+#define OV5647_CSI2_IIC "i2c4"
 
+#define OV5647_CAM_PIN_CSI2                             (21)
+#define OV5647_CAM_PIN_CSI1                             (60)
+
+#define OV9732_RST_PIN                                  (28)
+
+#define GC2053_CSI0_IIC "i2c4"
+#define VICAP_GC2053_RST_GPIO                           (21)
+
+#define GC2093_CSI0_IIC "i2c4"
+#define GC2093_SLAVE_ADDR   0x7e
+#define VICAP_GC2093_RST_GPIO                           (21)
+
+#define GC2093_CSI1_IIC         "i2c3"
+#define GC2093_CSI1_SLAVE_ADDR   0x7e
+#define GC2093_CSI1_RST_GPIO                            (23)
+
+#define GC2093_CSI2_IIC         "i2c4"
+#define GC2093_CSI2_SLAVE_ADDR   0x37 //0x3f
+#define GC2093_CSI2_RST_GPIO                            (62)
+
+#define BOARD_CSI0_CONN                          CONNECTOR_EXTERNAL_BOARD_SENOSR
+#define BOARD_CSI1_CONN                          CONNECTOR_EXTERNAL_BOARD_SENOSR
+#define BOARD_CSI2_CONN                          CONNECTOR_ON_BOARD_SENOSR
+
+#define LT9611_RESET_GPIO   24 //42
+#define LT9611_SLAVE_ADDR   0x3b
+#define LT9611_I2C_BUS      "i2c3"//"i2c4"
 #else
 
 #define DISPLAY_LCD_RST_GPIO                            9

src/big/mpp/include/comm/k_connector_comm.h

@@ -55,6 +55,7 @@ typedef enum {
     ST7701_V1_MIPI_2LAN_480X800_30FPS = 2,
     ST7701_V1_MIPI_2LAN_480X854_30FPS = 3,
     ILI9806_MIPI_2LAN_480X800_30FPS = 4,
+    NT35516_MIPI_2LAN_540X960_30FPS = 5,
     LT9611_MIPI_ADAPT_RESOLUTION = 100,
     LT9611_MIPI_4LAN_1920X1080_60FPS,
     LT9611_MIPI_4LAN_1920X1080_50FPS,
@@ -94,7 +95,7 @@ typedef struct {
 
 typedef enum
 {
-    K_CONNECTOR_MIRROR_HOR = 1, 
+    K_CONNECTOR_MIRROR_HOR = 1,
     K_CONNECTOR_MIRROR_VER,
     K_CONNECTOR_MIRROR_BOTH,
 }k_connector_mirror;

src/big/mpp/include/comm/k_dma_comm.h

@@ -51,6 +51,8 @@ extern "C" {
 #define DMA_MAX_CHN_NUMS        (GDMA_MAX_CHN_NUMS + SDMA_MAX_CHN_NUMS) /**< The maximum number of the DMA channel. FIXED! */
 #define DMA_LINKLIST_BYTE       (24)    /**< The number of bytes occupied by a linked list of DMA. */
 
+#define GDMA_TYPE 0
+#define SDMA_TYPE 1
 
 /**
  * @brief Defines the working mode of the dma
@@ -201,6 +203,37 @@ typedef struct
     k_video_frame_info vf_info;             /**< video information */
 } k_dma_frame_info;
 
+typedef union
+{
+    struct {
+        k_u32 dat_mode : 1;
+        k_u32 dat_size : 2;
+        k_u32 reserved_0 : 1;
+        k_u32 dat_endian : 2;
+        k_u32 reserved_1 : 2;
+        k_u32 src_fixed : 1;
+        k_u32 dst_fixed : 1;
+        k_u32 dec_en : 1;
+        k_u32 reserved_2 : 5;
+        k_u32 wr_outstanding : 4;
+        k_u32 rd_outstanding : 4;
+        k_u32 reserved_3 : 8;
+    };
+    k_u32 value;
+} k_sdma_ch_cfg_t;
+
+typedef struct
+{
+    void *src_addr;
+    void *dst_addr;
+    k_u8 dimension;
+    k_u16 line_num;
+    k_u16 line_space;
+    k_u32 line_size;
+    k_u32 user_data;
+    k_sdma_ch_cfg_t ch_cfg;
+} k_sdma_transfer_cfg_t;
+
 #define K_ERR_DMA_INVALID_DEVID     K_DEF_ERR(K_ID_DMA, K_ERR_LEVEL_ERROR, K_ERR_INVALID_DEVID)
 #define K_ERR_DMA_INVALID_CHNID     K_DEF_ERR(K_ID_DMA, K_ERR_LEVEL_ERROR, K_ERR_INVALID_CHNID)
 #define K_ERR_DMA_ILLEGAL_PARAM     K_DEF_ERR(K_ID_DMA, K_ERR_LEVEL_ERROR, K_ERR_ILLEGAL_PARAM)

src/big/mpp/include/comm/k_sensor_comm.h

@@ -623,6 +623,17 @@ typedef struct {
     k_u8   otp_date[20];
 } k_sensor_otp_date;
 
+typedef enum  {
+    SENSOR_FOCUS_POS_ABSOLUTE = 0,
+    SENSOR_FOCUS_POS_RELATIVE,
+} k_sensor_focus_pos_mode;
+
+typedef struct {
+    k_sensor_focus_pos_mode posType;
+    k_u32 pos;
+} k_sensor_focus_pos;
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

src/big/mpp/include/comm/k_vicap_comm.h

@@ -244,6 +244,7 @@ typedef enum {
     VICAP_WORK_LOAD_IMAGE_MODE,
     VICAP_WORK_ONLY_MCM_MODE,
     VICAP_WORK_SW_TILE_MODE,
+    VICAP_WORK_MCM_MIPI_MODE,
 } k_vicap_work_mode;
 
 /**
@@ -442,6 +443,7 @@ typedef struct {
     k_u32 buffer_num;
     k_u32 buffer_size;
     k_vicap_mirror mirror;
+    k_bool fastboot_enable;
 } k_vicap_dev_attr;
 
 /**
@@ -598,6 +600,7 @@ typedef struct {
     k_vicap_mcm_cfg cfg;
     k_vicap_chn mcm_chn;
     k_u32 buff_num;
+    k_u32 work_mode;
 }k_vicap_mcm_chn_attr;
 
 /**

src/big/mpp/include/ioctl/k_sensor_ioctl.h

@@ -75,6 +75,9 @@ typedef enum {
     KD_IOC_NR_SENSOR_DEV_GET_OTP_DATA,
     KD_IOC_NR_SENSOR_DEV_SET_OTP_DATA,
     KD_IOC_NR_SENSOR_DEV_SET_MIRROR,
+    KD_IOC_NR_SENSOR_S_FOCUS_POINT,
+    KD_IOC_NR_SENSOR_G_FOCUS_POINT,
+
 } k_ioc_nr_sensor;
 
 #define KD_IOC_SENSOR_S_POWER           _IOW(K_IOC_TYPE_SENSOR, KD_IOC_NR_SENSOR_DEV_POWER, k_s32)
@@ -107,6 +110,9 @@ typedef enum {
 #define KD_IOC_SENSOR_G_OTP_DATA        _IOW(K_IOC_TYPE_SENSOR, KD_IOC_NR_SENSOR_DEV_GET_OTP_DATA, void*)
 #define KD_IOC_SENSOR_S_OTP_DATA        _IOW(K_IOC_TYPE_SENSOR, KD_IOC_NR_SENSOR_DEV_SET_OTP_DATA, void*)
 #define KD_IOC_SENSOR_S_MIRROR          _IOW(K_IOC_TYPE_SENSOR, KD_IOC_NR_SENSOR_DEV_SET_MIRROR, k_vicap_mirror_mode)
+//AF 
+#define KD_IOC_SENSOR_S_FOCUS_POINT     _IOW(K_IOC_TYPE_SENSOR, KD_IOC_NR_SENSOR_S_FOCUS_POINT, k_sensor_focus_pos)
+#define KD_IOC_SENSOR_G_FOCUS_POINT     _IOW(K_IOC_TYPE_SENSOR, KD_IOC_NR_SENSOR_G_FOCUS_POINT, k_sensor_focus_pos)
 
 #ifdef __cplusplus
 }