Commit Graph

141 Commits

Author SHA1 Message Date
719a7c96c8 Merge "rk3308: use compress Image for kernel" 2018-08-30 14:31:45 +08:00
3d4ffc442e rk3308: use compress Image for kernel
Change-Id: I66744258f552999a83e43f81d5b09404371e50fa
Signed-off-by: Hans Yang <yhx@rock-chips.com>
2018-08-30 14:30:59 +08:00
acec88c2f4 device:rockchip:rk3308:aispeech-6mic-64bit: add vad switch
Change-Id: I56a46995df100f1b73cc8d7da03dae2368052361
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-30 12:06:56 +08:00
cf3c5c5d44 device:rockchip:aispeech-2mic-64bit: add vad switch
Change-Id: Id877e593c171c41ed545565e8d1d5001192f451a
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-30 12:03:59 +08:00
2bd3aab1ad device:rockchip:rk3308:aispeech-2mic-32bit:support vad
Change-Id: I4072c5c84ed81818adb6b03dae55c0b4a5b42557
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-30 11:59:43 +08:00
33bf91488e Merge "device:rockchip:rk3308:oem:change audiotest output file name for adb pull file" 2018-08-28 12:54:41 +08:00
fcb5d80474 device:rockchip:rk3308:oem:change audiotest output file name for adb pull file
Change-Id: I9e6f62d1b27cbe22f62dfd5ae707a69e5dd1299c
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-28 10:39:33 +08:00
da24018288 watch dueros, restart if pid_num less than 2
Change-Id: I48b8097908908dbc5ae2e784d960527cb3e4c95d
Signed-off-by: hertz.wang <wangh@rock-chips.com>
2018-08-27 11:51:43 +08:00
38a2965dc3 device:rockchip:rk3308: add some sh for audio test in oem partion
Change-Id: I2f3e3f13a80d04efb468f2676b026eb3b586f6ac
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-25 12:49:22 +08:00
983bcf3730 rk3308: BoardConfig.mk: set RK_OEM_DIR to oem
Change-Id: I57cb646e65af796f65d485ac13abec9815396ed7
Signed-off-by: Hans Yang <yhx@rock-chips.com>
2018-08-24 11:26:56 +08:00
62dc3fdbbc 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
a9b1646861 rk3308: move aispeech and dueros to oem directory
Change-Id: I05b909636d54cb75ff1e4382ade3de8088066d3e
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 21:01:53 +08:00
4e8be89efd rk3308: change oem dir for some board config
Change-Id: I3abd4642cd8aebcaa222f975fe448d997fbb9dfe
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 20:39:13 +08:00
9749b4dc61 remove unused file
Change-Id: I6547074e0d0fce93b83b7fc671325ef85b6f03fa
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 16:20:52 +08:00
6d7ca905a9 rk3308: mkfirmware: use parameter defined in board config
Change-Id: Ia59232c884e773883fc0d8c8e857b2b6d89035d2
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 16:06:51 +08:00
0af35f7984 rk3308: add more board config file
Change-Id: I4b6d63f9d295882af74753d5c1601739a1b35309
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 16:05:33 +08:00
f79893cf1d rk3308: rename parameter to make it more meaningful
Change-Id: I2e3ad02b31c6cbb65412feaf94c4f490877fce64
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 15:31:47 +08:00
59fdece89e rk3308: aispeech: rename it to make it meaningful
Change-Id: I0a7abe254ccc1c72ee7d17c2db36972a4a7d2ae5
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 15:17:57 +08:00
bd9781f339 export the variable in BoardConfig and add prefix to these variable
we need the make these variable to be environment variable. that will
allow us to use these variable in Makefile.
ie. we need to know the oem and userdata file system type when we
mount it. and that is defined in BoardConifg

Change-Id: I1c816214c60aba4761c34ad8b3d8f5611f81cfbb
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-17 17:33:42 +08:00
b45dc3ac46 Merge "restore alsa state when booting" 2018-08-17 15:55:35 +08:00
85673cf16f restore alsa state when booting
Change-Id: I915105ac186ee25bc9a64724c1e42336f7d80690
Signed-off-by: hertz.wang <wangh@rock-chips.com>
2018-08-17 15:54:06 +08:00
34549c45e4 aispeech: 32bit 4mic add source code
Change-Id: I65686004a3c6c031a823369180176ac1d0b986ba
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-16 20:17:18 +08:00
6081f8f725 Merge "aispeech: add project 32 bit kong tiao kong tiao" 2018-08-16 20:16:58 +08:00
ee3d737a63 aispeech: add project 32 bit kong tiao kong tiao
Change-Id: I1c5dd63c97823232660847635bd2ea45df628006
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-16 20:14:58 +08:00
6237da6a60 Merge "aispeech 32 2mic: add source code" 2018-08-16 20:03:54 +08:00
288fe69ca7 Merge "aispeech: add 4mic sdk" 2018-08-16 20:03:45 +08:00
557c8ba70d Merge "aispeech 32 2mic: add new library" 2018-08-16 20:03:29 +08:00
9a12433a49 aispeech 32 2mic: add source code
Change-Id: I9dcbf3ebb4000a65f4eae2ef2c4237be41534bd8
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-16 19:48:48 +08:00
8f9ddde78e [dueros]: fix restart script and add coredump script
Change-Id: Ic8728748aaf985eff288b9ff2a47913de5aa61e0
Signed-off-by: hertz.wang <wangh@rock-chips.com>
2018-08-15 14:54:14 +08:00
db46163206 Revert "rk3308: mkfirmware.sh: fixup the wildcards in bash if statement"
This reverts commit 8ef549d2f8.
2018-08-14 15:37:10 +08:00
8ef549d2f8 rk3308: mkfirmware.sh: fixup the wildcards in bash if statement
Fixup "./mkfirmware.sh: line 101: [: too many arguments"

Change-Id: I42fb7a6405821f32b86574406ebe6fd2f59cf089
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-08-14 14:08:34 +08:00
63302e8736 Merge "fix dueros 64bit compile" 2018-08-09 08:37:52 +08:00
22095ffe3f Merge "Change the value of the overcommit_memory to 1." 2018-08-09 08:37:18 +08:00
9c0bae53e2 fix dueros 64bit compile
Change-Id: I6d3e35e196f561844df521281cbfa571725015ae
Signed-off-by: hertz.wang <wangh@rock-chips.com>
2018-08-08 20:33:39 +08:00
ctf
70bb9d3738 Change the value of the overcommit_memory to 1.
Change-Id: I9b201745c93044360d48b2292550232037332104
Signed-off-by: ctf <ctf@rock-chips.com>
2018-08-08 17:51:28 +08:00
d7d56ae227 aispeech: add 4mic sdk
Change-Id: Ifa01cfeb8921e99051a8595687498b7a8019b517
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-06 10:34:05 +08:00
a7a6ef716f aispeech 32 2mic: add new library
Change-Id: I55be40167f6a30033fc717beaf253cd765b9df4f
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-04 11:09:43 +08:00
b6a09dbcc8 change the /data/duer destination when running
Change-Id: I274504d6a7830f67b6fef51e6ff02c340504763d
Signed-off-by: hertz.wang <wangh@rock-chips.com>
2018-08-03 16:28:28 +08:00
da3e1c14ac rm files under duer
These will be installed by DuerClientSDK.

Change-Id: I4eec3830d6aba08cfdc54015629706fae8748d82
Signed-off-by: hertz.wang <wangh@rock-chips.com>
2018-08-03 16:28:28 +08:00
d4fd4a2166 aispeech: RkLunch.sh fix alsa device from vad to 6mic_loopback
Change-Id: I1b80cad078f87f3b37c75d460ab43250cd8d761c
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
2018-08-03 10:33:12 +08:00
b2f61dc610 Merge "aispeech: build delay 30ms after system enter suspend" 2018-07-31 09:43:10 +08:00
0a13d23732 aispeech: build delay 30ms after system enter suspend
Change-Id: Ia1b63e2bd30144f946e5707df60d8a55396a289a
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-07-31 09:38:54 +08:00
3865ee1a57 Merge "aispeech: update libdds_client.so to fix sleep-resume bugs" 2018-07-31 09:11:05 +08:00
3f280fde97 aispeech: update libdds_client.so to fix sleep-resume bugs
Change-Id: If80e316aa20e465e23a1d1ede687af0f4cc9e1a9
Signed-off-by: Nyx Zheng <zyh@rock-chips.com>
2018-07-30 16:46:44 +08:00
9165b0fe81 aispeech: delay 30ms after system enter suspend
Change-Id: Ia3e64c7c3a5f94172dc8de5467603ba79adcafb4
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-07-27 18:18:09 +08:00
20636deb9b Merge "aispeech: update v0.2.1" 2018-07-27 18:02:08 +08:00
796ddd2e57 aispeech: update v0.2.1
Change-Id: If9af87c22d73164476fb9abbb08b3e6fa7eeb739
Signed-off-by: Nyx Zheng <zyh@rock-chips.com>
2018-07-26 16:23:52 +08:00
0058f421d2 device/rockchip: adjust the positon of ex2fs check cmd
Change-Id: Ic54b499e8c6e2a607f91b4e90f2a5a5e41026626
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-07-25 11:26:58 +08:00
a6ad2bf547 aispeech-2mic-32bit: compile for last commit
Change-Id: I38ca20feee8c5edcb2f3cca4463fcb77859d61e5
Signed-off-by: Nyx Zheng <zyh@rock-chips.com>
2018-07-25 11:15:16 +08:00
4ada407f21 aispeech-2mic-32bit: add wait_device_mode_timeout_ms when vad resume
Change-Id: I3fb05ecea55db55a099255fbe26951dffe56f0ae
Signed-off-by: Nyx Zheng <zyh@rock-chips.com>
2018-07-25 11:13:45 +08:00