rk3308: optimize directory structure and remove unuse files

Change-Id: I11eaf882a76507da8eaef2fa03cdc2b7b97e37a1 Signed-off-by: Hans Yang <yhx@rock-chips.com>
2018-08-23 21:38:32 +08:00
parent 1135f6f1ce
commit 62dc3fdbbc
474 changed files with 126 additions and 469 deletions
--- a/oem/baidu_spil_rk3308_32bit_6mic/RkLunch.sh
+++ b/oem/baidu_spil_rk3308_32bit_6mic/RkLunch.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/RkLunch.sh
--- a/oem/baidu_spil_rk3308_32bit_6mic/bin
+++ b/oem/baidu_spil_rk3308_32bit_6mic/bin
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/bin
--- a/oem/baidu_spil_rk3308_32bit_6mic/cfg
+++ b/oem/baidu_spil_rk3308_32bit_6mic/cfg
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/cfg
--- a/oem/baidu_spil_rk3308_32bit_6mic/core_helper
+++ b/oem/baidu_spil_rk3308_32bit_6mic/core_helper
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/core_helper
--- a/oem/baidu_spil_rk3308_32bit_6mic/duer
+++ b/oem/baidu_spil_rk3308_32bit_6mic/duer
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/duer
--- a/oem/baidu_spil_rk3308_32bit_6mic/dueros_service.sh
+++ b/oem/baidu_spil_rk3308_32bit_6mic/dueros_service.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/dueros_service.sh
--- a/oem/baidu_spil_rk3308_32bit_6mic/watch_dueros_service.sh
+++ b/oem/baidu_spil_rk3308_32bit_6mic/watch_dueros_service.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/watch_dueros_service.sh
--- a/oem/baidu_spil_rk3308_64bit_3mic/RkLunch.sh
+++ b/oem/baidu_spil_rk3308_64bit_3mic/RkLunch.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/RkLunch.sh
--- a/oem/baidu_spil_rk3308_64bit_3mic/bin
+++ b/oem/baidu_spil_rk3308_64bit_3mic/bin
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/bin
--- a/oem/baidu_spil_rk3308_64bit_3mic/cfg
+++ b/oem/baidu_spil_rk3308_64bit_3mic/cfg
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/cfg
--- a/oem/baidu_spil_rk3308_64bit_3mic/core_helper
+++ b/oem/baidu_spil_rk3308_64bit_3mic/core_helper
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/core_helper
--- a/oem/baidu_spil_rk3308_64bit_3mic/duer
+++ b/oem/baidu_spil_rk3308_64bit_3mic/duer
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/duer
--- a/oem/baidu_spil_rk3308_64bit_3mic/dueros_service.sh
+++ b/oem/baidu_spil_rk3308_64bit_3mic/dueros_service.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/dueros_service.sh
--- a/oem/baidu_spil_rk3308_64bit_3mic/watch_dueros_service.sh
+++ b/oem/baidu_spil_rk3308_64bit_3mic/watch_dueros_service.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/watch_dueros_service.sh
--- a/oem/baidu_spil_rk3308_64bit_6mic/RkLunch.sh
+++ b/oem/baidu_spil_rk3308_64bit_6mic/RkLunch.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/RkLunch.sh
--- a/oem/baidu_spil_rk3308_64bit_6mic/bin
+++ b/oem/baidu_spil_rk3308_64bit_6mic/bin
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/bin
--- a/oem/baidu_spil_rk3308_64bit_6mic/cfg
+++ b/oem/baidu_spil_rk3308_64bit_6mic/cfg
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/cfg
--- a/oem/baidu_spil_rk3308_64bit_6mic/core_helper
+++ b/oem/baidu_spil_rk3308_64bit_6mic/core_helper
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/core_helper
--- a/oem/baidu_spil_rk3308_64bit_6mic/duer
+++ b/oem/baidu_spil_rk3308_64bit_6mic/duer
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/duer
--- a/oem/baidu_spil_rk3308_64bit_6mic/dueros_service.sh
+++ b/oem/baidu_spil_rk3308_64bit_6mic/dueros_service.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/dueros_service.sh
--- a/oem/baidu_spil_rk3308_64bit_6mic/watch_dueros_service.sh
+++ b/oem/baidu_spil_rk3308_64bit_6mic/watch_dueros_service.sh
@ -1 +0,0 @@
 ../baidu_spil_rk3308_common/watch_dueros_service.sh
--- a/rk3308/BoardConfig_64bit_emmc.mk
+++ b/rk3308/BoardConfig_64bit_emmc.mk
@ -11,7 +11,7 @@ export RK_KERNEL_DTS=rk3308-evb-dmic-pdm-v11
 # boot image type
 export RK_BOOT_IMG=boot.img
 # parameter for GPT table
-export RK_PARAMETER=parameter-emmc-64bit.txt
+export RK_PARAMETER=parameter-64bit.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_release
 # Recovery config
@ -31,9 +31,9 @@ export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
-export RK_STORAGE_TYPE=emmc
+export RK_STORAGE_TYPE=nand
-#OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
+#OEM config: /oem/dueros/aispeech-6mic-64bit/aispeech-2mic-64bit/aispeech-4mic-32bit/aispeech-2mic-32bit/aispeech-2mic-kongtiao-32bit/iflytekSDK/CaeDemo_VAD/smart_voice
-export RK_OEM_DIR=oem_sample
+export RK_OEM_DIR=dueros
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_32bit_nand_aispeech_2mic.mk
+++ b/rk3308/BoardConfig_32bit_nand_aispeech_2mic.mk
@ -11,7 +11,7 @@ export RK_KERNEL_DTS=rk3308-voice-module-board-v10-aarch32
 # boot image type
 export RK_BOOT_IMG=zboot.img
 # parameter for GPT table
-export RK_PARAMETER=parameter-nand-32bit-aispeech.txt
+export RK_PARAMETER=parameter-32bit.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_32_release
 # Recovery config
@ -31,9 +31,9 @@ export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
-export RK_STORAGE_TYPE=emmc
+export RK_STORAGE_TYPE=nand
-#OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
+#OEM config: /oem/dueros/aispeech-6mic-64bit/aispeech-2mic-64bit/aispeech-4mic-32bit/aispeech-2mic-32bit/aispeech-2mic-kongtiao-32bit/iflytekSDK/CaeDemo_VAD/smart_voice
-export RK_OEM_DIR=aispeech-2mic-32bit
+export RK_OEM_DIR=oem
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_32bit_nand_aispeech_2mic_kongtiao.mk
+++ b/rk3308/BoardConfig_32bit_nand_aispeech_2mic_kongtiao.mk
@ -1,39 +0,0 @@
 #!/bin/bash
 # Target arch
 export RK_ARCH=arm
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=evb-aarch32-rk3308
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rk3308_linux_aarch32_debug_defconfig
 # Kernel dts
 export RK_KERNEL_DTS=rk3308-voice-module-board-v10-aarch32
 # boot image type
 export RK_BOOT_IMG=zboot.img
 # parameter for GPT table
 export RK_PARAMETER=parameter-nand-32bit-aispeech.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_32_release
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3308_recovery
 # Pcba config
 export RK_CFG_PCBA=rockchip_rk3308_pcba
 # Build jobs
 export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3308
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=squashfs
 # rootfs image path
 export RK_ROOTFS_IMG=buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
 export RK_STORAGE_TYPE=emmc
 #OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
 export RK_OEM_DIR=aispeech-2mic-kongtiao-32bit
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_32bit_nand_aispeech_4mic.mk
+++ b/rk3308/BoardConfig_32bit_nand_aispeech_4mic.mk
@ -1,39 +0,0 @@
 #!/bin/bash
 # Target arch
 export RK_ARCH=arm
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=evb-aarch32-rk3308
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rk3308_linux_aarch32_debug_defconfig
 # Kernel dts
 export RK_KERNEL_DTS=rk3308-voice-module-board-v10-aarch32
 # boot image type
 export RK_BOOT_IMG=zboot.img
 # parameter for GPT table
 export RK_PARAMETER=parameter-nand-32bit-aispeech.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_32_release
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3308_recovery
 # Pcba config
 export RK_CFG_PCBA=rockchip_rk3308_pcba
 # Build jobs
 export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3308
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=squashfs
 # rootfs image path
 export RK_ROOTFS_IMG=buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
 export RK_STORAGE_TYPE=emmc
 #OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
 export RK_OEM_DIR=aispeech-4mic-32bit
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_32bit_nand_dueros_6mic.mk
+++ b/rk3308/BoardConfig_32bit_nand_dueros_6mic.mk
@ -1,39 +0,0 @@
 #!/bin/bash
 # Target arch
 export RK_ARCH=arm
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=evb-aarch32-rk3308
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rk3308_linux_aarch32_debug_defconfig
 # Kernel dts
 export RK_KERNEL_DTS=rk3308-voice-module-board-v10-aarch32
 # boot image type
 export RK_BOOT_IMG=zboot.img
 # parameter for GPT table
 export RK_PARAMETER=parameter-nand-32bit-dueros.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_32_release
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3308_recovery
 # Pcba config
 export RK_CFG_PCBA=rockchip_rk3308_pcba
 # Build jobs
 export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3308
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=squashfs
 # rootfs image path
 export RK_ROOTFS_IMG=buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
 export RK_STORAGE_TYPE=emmc
 #OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
 export RK_OEM_DIR=baidu_spil_rk3308_32bit_6mic
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_64bit_nand.mk
+++ b/rk3308/BoardConfig_64bit_nand.mk
@ -1,39 +0,0 @@
 #!/bin/bash
 # Target arch
 export RK_ARCH=arm64
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=evb-rk3308
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rk3308_linux_defconfig
 # Kernel dts
 export RK_KERNEL_DTS=rk3308-evb-dmic-pdm-v11
 # boot image type
 export RK_BOOT_IMG=boot.img
 # parameter for GPT table
 export RK_PARAMETER=parameter-nand-64bit.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_release
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3308_recovery
 # Pcba config
 export RK_CFG_PCBA=rockchip_rk3308_pcba
 # Build jobs
 export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3308
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=squashfs
 # rootfs image path
 export RK_ROOTFS_IMG=buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
 export RK_STORAGE_TYPE=emmc
 #OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
 export RK_OEM_DIR=oem_sample
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_64bit_nand_aispeech_2mic.mk
+++ b/rk3308/BoardConfig_64bit_nand_aispeech_2mic.mk
@ -1,39 +0,0 @@
 #!/bin/bash
 # Target arch
 export RK_ARCH=arm64
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=evb-rk3308
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rk3308_linux_defconfig
 # Kernel dts
 export RK_KERNEL_DTS=rk3308-evb-dmic-pdm-v11
 # boot image type
 export RK_BOOT_IMG=boot.img
 # parameter for GPT table
 export RK_PARAMETER=parameter-nand-64bit-aispeech.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_release
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3308_recovery
 # Pcba config
 export RK_CFG_PCBA=rockchip_rk3308_pcba
 # Build jobs
 export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3308
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=squashfs
 # rootfs image path
 export RK_ROOTFS_IMG=buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
 export RK_STORAGE_TYPE=emmc
 #OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
 export RK_OEM_DIR=aispeech-2mic-64bit
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_64bit_nand_aispeech_6mic.mk
+++ b/rk3308/BoardConfig_64bit_nand_aispeech_6mic.mk
@ -1,39 +0,0 @@
 #!/bin/bash
 # Target arch
 export RK_ARCH=arm64
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=evb-rk3308
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rk3308_linux_defconfig
 # Kernel dts
 export RK_KERNEL_DTS=rk3308-evb-dmic-pdm-v11
 # boot image type
 export RK_BOOT_IMG=boot.img
 # parameter for GPT table
 export RK_PARAMETER=parameter-nand-64bit-aispeech.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_release
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3308_recovery
 # Pcba config
 export RK_CFG_PCBA=rockchip_rk3308_pcba
 # Build jobs
 export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3308
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=squashfs
 # rootfs image path
 export RK_ROOTFS_IMG=buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
 export RK_STORAGE_TYPE=emmc
 #OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
 export RK_OEM_DIR=aispeech-6mic-64bit
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_64bit_nand_dueros_3mic.mk
+++ b/rk3308/BoardConfig_64bit_nand_dueros_3mic.mk
@ -1,39 +0,0 @@
 #!/bin/bash
 # Target arch
 export RK_ARCH=arm64
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=evb-rk3308
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rk3308_linux_defconfig
 # Kernel dts
 export RK_KERNEL_DTS=rk3308-evb-dmic-pdm-v11
 # boot image type
 export RK_BOOT_IMG=boot.img
 # parameter for GPT table
 export RK_PARAMETER=parameter-nand-64bit-dueros.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_release
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3308_recovery
 # Pcba config
 export RK_CFG_PCBA=rockchip_rk3308_pcba
 # Build jobs
 export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3308
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=squashfs
 # rootfs image path
 export RK_ROOTFS_IMG=buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
 export RK_STORAGE_TYPE=emmc
 #OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
 export RK_OEM_DIR=baidu_spil_rk3308_64bit_3mic
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/BoardConfig_64bit_nand_dueros_6mic.mk
+++ b/rk3308/BoardConfig_64bit_nand_dueros_6mic.mk
@ -1,39 +0,0 @@
 #!/bin/bash
 # Target arch
 export RK_ARCH=arm64
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=evb-rk3308
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rk3308_linux_defconfig
 # Kernel dts
 export RK_KERNEL_DTS=rk3308-evb-dmic-pdm-v11
 # boot image type
 export RK_BOOT_IMG=boot.img
 # parameter for GPT table
 export RK_PARAMETER=parameter-nand-64bit-dueros.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3308_release
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3308_recovery
 # Pcba config
 export RK_CFG_PCBA=rockchip_rk3308_pcba
 # Build jobs
 export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3308
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=squashfs
 # rootfs image path
 export RK_ROOTFS_IMG=buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
 # Set oem partition type, including ext2 squashfs
 export RK_OEM_FS_TYPE=ext2
 # Set userdata partition type, including ext2, fat
 export RK_USERDATA_FS_TYPE=ext2
 # Set flash type. support <emmc, nand, spi_nand, spi_nor>
 export RK_STORAGE_TYPE=emmc
 #OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
 export RK_OEM_DIR=baidu_spil_rk3308_64bit_6mic
 #userdata config
 export RK_USERDATA_DIR=userdata_empty
 MIC_NUM=6
--- a/rk3308/aispeech-2mic-32bit/RkLunch.sh
+++ b/rk3308/aispeech-2mic-32bit/RkLunch.sh
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/README
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/README
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/connect_ok.mp3
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/connect_ok.mp3
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/do_connect.mp3
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/do_connect.mp3
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/need_connect.mp3
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/need_connect.mp3
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/start_connect.mp3
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/start_connect.mp3
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/wifi_ok.mp3
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/audio/wifi_ok.mp3
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/bin/aispeech_player
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/bin/aispeech_player
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/bin/aispeech_softap
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/bin/aispeech_softap
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/bin/aispeech_softap_server
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/bin/aispeech_softap_server
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/bin/aispeech_startup
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/bin/aispeech_startup
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/device/app.json
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/device/app.json
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/device/device.json
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/device/device.json
--- a/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/install_v11.sh
+++ b/rk3308/aispeech-2mic-32bit/aispeech_softap_lite/install_v11.sh
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/README
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/README
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/aimake.sh
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/aimake.sh
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/aimakefile
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/aimakefile
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/build_all.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/build_all.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/build_executable.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/build_executable.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/build_shared_library.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/build_shared_library.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/build_static_library.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/build_static_library.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/init.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/linux/init.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/main.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/main.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/build_all.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/build_all.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/build_executable.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/build_executable.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/build_shared_library.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/build_shared_library.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/build_static_library.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/build_static_library.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/init.mk
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimake/rk3308_32/init.mk
--- a/rk3308/aispeech-2mic-32bit/dds_client/aimakefile
+++ b/rk3308/aispeech-2mic-32bit/dds_client/aimakefile
--- a/rk3308/aispeech-2mic-32bit/dds_client/audio/minor_wakeup.mp3
+++ b/rk3308/aispeech-2mic-32bit/dds_client/audio/minor_wakeup.mp3
--- a/rk3308/aispeech-2mic-32bit/dds_client/audio/network_error.mp3
+++ b/rk3308/aispeech-2mic-32bit/dds_client/audio/network_error.mp3
--- a/rk3308/aispeech-2mic-32bit/dds_client/audio/vad_start_timeout.mp3
+++ b/rk3308/aispeech-2mic-32bit/dds_client/audio/vad_start_timeout.mp3
--- a/rk3308/aispeech-2mic-32bit/dds_client/audio/vad_start_timeout2.mp3
+++ b/rk3308/aispeech-2mic-32bit/dds_client/audio/vad_start_timeout2.mp3
--- a/rk3308/aispeech-2mic-32bit/dds_client/audio/wakeup.mp3
+++ b/rk3308/aispeech-2mic-32bit/dds_client/audio/wakeup.mp3
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/dui/dui_major_minor_multiple.c
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/dui/dui_major_minor_multiple.c
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/dui/dui_major_minor_multiple.o
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/dui/dui_major_minor_multiple.o
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/dui/include/dui.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/dui/include/dui.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/dui/include/dui_msg.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/dui/include/dui_msg.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/dui/wakeup_fespa.c
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/dui/wakeup_fespa.c
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/dui/wakeup_fespl.c
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/dui/wakeup_fespl.c
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/fsm/dui_fsm.c
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/fsm/dui_fsm.c
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/fsm/dui_fsm.o
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/fsm/dui_fsm.o
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/fsm/include/dui_fsm.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/fsm/include/dui_fsm.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/json/cJSON.c
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/json/cJSON.c
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/json/cJSON.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/json/cJSON.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/components/json/cJSON.o
+++ b/rk3308/aispeech-2mic-32bit/dds_client/components/json/cJSON.o
--- a/rk3308/aispeech-2mic-32bit/dds_client/dui_fespl
+++ b/rk3308/aispeech-2mic-32bit/dds_client/dui_fespl
--- a/rk3308/aispeech-2mic-32bit/dds_client/dui_fespl.json
+++ b/rk3308/aispeech-2mic-32bit/dds_client/dui_fespl.json
--- a/rk3308/aispeech-2mic-32bit/dds_client/dui_fespl_record
+++ b/rk3308/aispeech-2mic-32bit/dds_client/dui_fespl_record
--- a/rk3308/aispeech-2mic-32bit/dds_client/example/main.c
+++ b/rk3308/aispeech-2mic-32bit/dds_client/example/main.c
--- a/rk3308/aispeech-2mic-32bit/dds_client/example/main.o
+++ b/rk3308/aispeech-2mic-32bit/dds_client/example/main.o
--- a/rk3308/aispeech-2mic-32bit/dds_client/example/main_vad.c
+++ b/rk3308/aispeech-2mic-32bit/dds_client/example/main_vad.c
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/alsa_cfg.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/alsa_cfg.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/dds.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/dds.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/duilite.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/duilite.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_event_group.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_event_group.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_log.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_log.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_memory.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_memory.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_mutex.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_mutex.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_queue.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_queue.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_semaphore.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_semaphore.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_stream.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_stream.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_thread.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_thread.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_time.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_time.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/os_utils.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/os_utils.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/player.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/player.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/include/recorder.h
+++ b/rk3308/aispeech-2mic-32bit/dds_client/include/recorder.h
--- a/rk3308/aispeech-2mic-32bit/dds_client/lib/rk3308_32/libauth_rk3308.so
+++ b/rk3308/aispeech-2mic-32bit/dds_client/lib/rk3308_32/libauth_rk3308.so
--- a/rk3308/aispeech-2mic-32bit/dds_client/lib/rk3308_32/libdds.so
+++ b/rk3308/aispeech-2mic-32bit/dds_client/lib/rk3308_32/libdds.so
--- a/Show More
+++ b/Show More
		`@ -1 +0,0 @@`
			`../baidu_spil_rk3308_common/dueros_service.sh`
		`@ -1 +0,0 @@`
			`../baidu_spil_rk3308_common/watch_dueros_service.sh`