Skip to content

Commit 6370e9d

Browse files
authored
Merge pull request #4064 from kamtom480/spresense-sdk-2.0.2
Update Spresense SDK and fix USB CDC
2 parents ba84cff + 30a1c52 commit 6370e9d

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

lib/tinyusb

Submodule tinyusb updated 307 files

ports/cxd56/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Bootloader information:
7575

7676
* You have to accept the End User License Agreement to be able to download and use the Spresense bootloader binary.
7777

78-
Download the spresense binaries zip archive from: [Spresense firmware v2-0-000](https://developer.sony.com/file/download/download-spresense-firmware-v2-0-000)
78+
Download the spresense binaries zip archive from: [Spresense firmware v2-0-002](https://developer.sony.com/file/download/download-spresense-firmware-v2-0-002)
7979

8080
Extract spresense binaries in your PC to ports/spresense/spresense-exported-sdk/firmware/
8181

ports/cxd56/configs/circuitpython/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ CONFIG_USBDEV=y
165165
CONFIG_USBDEV_DMA=y
166166
CONFIG_USBDEV_DUALSPEED=y
167167
CONFIG_USEC_PER_TICK=1000
168+
CONFIG_USERMAIN_STACKSIZE=8192
168169
CONFIG_USER_ENTRYPOINT="spresense_main"
169170
CONFIG_VIDEO_ISX012=y
170171
CONFIG_VIDEO_STREAM=y

ports/cxd56/supervisor/internal_flash.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030

3131
/* Prototypes for Remote API */
3232

33-
int FM_RawWrite(uint32_t offset, const void *buf, uint32_t size);
34-
int FM_RawVerifyWrite(uint32_t offset, const void *buf, uint32_t size);
35-
int FM_RawRead(uint32_t offset, void *buf, uint32_t size);
36-
int FM_RawEraseSector(uint32_t sector);
33+
int fw_fm_rawwrite(uint32_t offset, const void *buf, uint32_t size);
34+
int fw_fm_rawverifywrite(uint32_t offset, const void *buf, uint32_t size);
35+
int fw_fm_rawread(uint32_t offset, void *buf, uint32_t size);
36+
int fw_fm_rawerasesector(uint32_t sector);
3737

3838
#define CXD56_SPIFLASHSIZE (16 * 1024 * 1024)
3939

@@ -64,16 +64,16 @@ void port_internal_flash_flush(void) {
6464
return;
6565
}
6666

67-
FM_RawEraseSector(flash_sector);
68-
FM_RawWrite(flash_sector << SECTOR_SHIFT, flash_cache, SECTOR_SIZE);
67+
fw_fm_rawerasesector(flash_sector);
68+
fw_fm_rawwrite(flash_sector << SECTOR_SHIFT, flash_cache, SECTOR_SIZE);
6969

7070
flash_sector = NO_SECTOR;
7171
}
7272

7373
mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
7474
supervisor_flash_flush();
7575

76-
if (FM_RawRead(block << PAGE_SHIFT, dest, num_blocks << PAGE_SHIFT) < 0) {
76+
if (fw_fm_rawread(block << PAGE_SHIFT, dest, num_blocks << PAGE_SHIFT) < 0) {
7777
return 1;
7878
}
7979

@@ -92,7 +92,7 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
9292
if (sector != flash_sector) {
9393
supervisor_flash_flush();
9494

95-
if (FM_RawRead(sector << SECTOR_SHIFT, flash_cache, SECTOR_SIZE) < 0) {
95+
if (fw_fm_rawread(sector << SECTOR_SHIFT, flash_cache, SECTOR_SIZE) < 0) {
9696
return 1;
9797
}
9898

0 commit comments

Comments
 (0)