From fd2ef6ea49d17f77f635c9c00b90f056537581fa Mon Sep 17 00:00:00 2001 From: Wendal Chen Date: Tue, 30 Apr 2024 08:59:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=20=E8=B0=83=E6=95=B4project?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=AF=91=E8=AD=A6=E5=91=8A,=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=9C=89=E8=BE=83=E5=A4=A7=E9=9A=90=E6=82=A3=E7=9A=84?= =?UTF-8?q?error=E5=BC=BA=E5=88=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/project.lua | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/project/project.lua b/project/project.lua index ded7f7f8..e090b67c 100644 --- a/project/project.lua +++ b/project/project.lua @@ -100,6 +100,33 @@ function description_csdk() "-Wl,--wrap=time", {force = true}) + -- 已经生效的GCC警告信息 + add_cxflags("-Werror=maybe-uninitialized") + add_cxflags("-Werror=unused-value") + add_cxflags("-Werror=array-bounds") + add_cxflags("-Werror=return-type") + add_cxflags("-Werror=overflow") + add_cxflags("-Werror=empty-body") + add_cxflags("-Werror=old-style-declaration") + -- add_cxflags("-Werror=implicit-function-declaration") + add_cxflags("-Werror=implicit-int") + + -- 暂不考虑的GCC警告信息 + add_cxflags("-Wno-unused-parameter") + add_cxflags("-Wno-unused-but-set-variable") + add_cxflags("-Wno-sign-compare") + add_cxflags("-Wno-unused-variable") + add_cxflags("-Wno-unused-function") + + -- 待修复的GCC警告信息 + add_cxflags("-Wno-int-conversion") + add_cxflags("-Wno-discarded-qualifiers") + add_cxflags("-Wno-pointer-sign") + add_cxflags("-Wno-type-limits") + add_cxflags("-Wno-incompatible-pointer-types") + add_cxflags("-Wno-pointer-to-int-cast") + add_cxflags("-Wno-int-to-pointer-cast") + -- ============================== -- === includes ===== -- SDK相关头文件引用 From 156004629c586843a480edfada3cf8518f00c85b Mon Sep 17 00:00:00 2001 From: Wendal Chen Date: Tue, 30 Apr 2024 09:32:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update:=20example=5Fpm=5Fhib=5Fgpio=5Fwakeu?= =?UTF-8?q?p=E4=B8=8D=E9=9C=80=E8=A6=81=E5=AE=9A=E4=B9=89mem=5Fmap=5F7xx.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inc/mem_map_7xx.h | 331 ------------------ 1 file changed, 331 deletions(-) delete mode 100644 project/example_pm_hib_gpio_wakeup/inc/mem_map_7xx.h diff --git a/project/example_pm_hib_gpio_wakeup/inc/mem_map_7xx.h b/project/example_pm_hib_gpio_wakeup/inc/mem_map_7xx.h deleted file mode 100644 index d43dc34a..00000000 --- a/project/example_pm_hib_gpio_wakeup/inc/mem_map_7xx.h +++ /dev/null @@ -1,331 +0,0 @@ - -#ifndef MEM_MAP_7XX_H -#define MEM_MAP_7XX_H - -/* - 自行修改分区有风险,请认真检查分区修改合理性并做好测试！！！！！！！ - 自行修改分区有风险,请认真检查分区修改合理性并做好测试！！！！！！！ - 自行修改分区有风险,请认真检查分区修改合理性并做好测试！！！！！！！ - - 依据给出的分区表,自行计算所要修改的分区,并修改对应的宏地址! -*/ - -#if defined TYPE_EC718S - -/*2M flash only, no psram*/ - -/* -AP/CP flash layout, toatl 2MB -flash raw address: 0x00000000---0x00200000 -flash xip address(from ap/cp view): 0x00800000---0x00a00000 - - -0x00000000 |---------------------------------| - | header1 4KB | -0x00001000 |---------------------------------| - | header2 4KB | -0x00002000 |---------------------------------| - | fuse mirror 4KB | -0x00003000 |---------------------------------| - | BL 72KB | -0x00015000 |---------------------------------| - | rel (factory) 20KB |----compress -#if (defined MID_FEATURE_MODE) || (defined GCF_FEATURE_MODE) -0x0001a000 |---------------------------------| - | cp img 360KB | -0x00074000 |---------------------------------| - | ap img 1224KB | -#else -0x0001a000 |---------------------------------| - | cp img 352KB | -0x00072000 |---------------------------------| - | ap img 1232KB | -#endif -0x001a6000 |---------------------------------| - | lfs 48KB | -0x001b2000 |---------------------------------| - | fota 256KB | -0x001f2000 |---------------------------------| - | rel 52KB | -0x001ff000 |---------------------------------| - | plat config 4KB |---- read-modify-write -0x00200000 |---------------------------------| - - -*/ - -/* -------------------------------flash address define-------------------------*/ - - -#ifndef AP_FLASH_LOAD_SIZE -#ifdef MID_FEATURE_MODE -#define AP_FLASH_LOAD_SIZE (0x132000)//1232KB-8KB for CP -#define AP_FLASH_LOAD_UNZIP_SIZE (0x140000)//1288KB-8KB for CP,for ld -#else -#define AP_FLASH_LOAD_SIZE (0x134000)//1232KB -#define AP_FLASH_LOAD_UNZIP_SIZE (0x142000)//1288KB ,for ld -#endif -#else -#define AP_FLASH_LOAD_UNZIP_SIZE (AP_FLASH_LOAD_SIZE + 0x10000)//AP_FLASH_LOAD_SIZE+64KB ,for ld -#endif //undef AP_FLASH_LOAD_SIZE - - -/*temp add here, need handle from caller !!!!*/ -//hib bakcup addr and size but not used - -#define FLASH_HIB_BACKUP_EXIST (0) -#define FLASH_MEM_BACKUP_ADDR (0) -#define FLASH_MEM_BACKUP_NONXIP_ADDR (0) -#define FLASH_MEM_BACKUP_SIZE (0) -#define FLASH_MEM_BLOCK_SIZE (0) -#define FLASH_MEM_BLOCK_CNT (0) - -//fs addr and size -#define FLASH_FS_REGION_START (0x1a6000) -#define FLASH_FS_REGION_END (0x1b2000) -#define FLASH_FS_REGION_SIZE (FLASH_FS_REGION_END-FLASH_FS_REGION_START) // 48KB - -#define FLASH_FOTA_REGION_START (0x1b2000) -#define FLASH_FOTA_REGION_LEN (0x40000)//256KB -#define FLASH_FOTA_REGION_END (0x1f2000) - -#if 0 //需要HIB参考这个配置 -#define FLASH_HIB_BACKUP_EXIST (1) -#define FLASH_MEM_BACKUP_ADDR (AP_FLASH_XIP_ADDR+FLASH_MEM_BACKUP_NONXIP_ADDR) -#define FLASH_MEM_BACKUP_NONXIP_ADDR (0x1a6000) -#define FLASH_MEM_BACKUP_SIZE (0x18000)//96KB -#define FLASH_MEM_BLOCK_SIZE (0x6000) -#define FLASH_MEM_BLOCK_CNT (0x4) - -//fs addr and size -#define FLASH_FS_REGION_START (0x1be000) -#define FLASH_FS_REGION_END (0x1ca000) -#define FLASH_FS_REGION_SIZE (FLASH_FS_REGION_END-FLASH_FS_REGION_START) // 48KB - -#define FLASH_FOTA_REGION_START (0x1ca000) -#define FLASH_FOTA_REGION_LEN (0x28000) //160KB -#define FLASH_FOTA_REGION_END (0x1f2000) - -#endif - -// mapdef -#ifndef AP_PKGIMG_LIMIT_SIZE -#if defined GCF_FEATURE_MODE -#define AP_PKGIMG_LIMIT_SIZE (0x16e000) -#elif defined MID_FEATURE_MODE -#define AP_PKGIMG_LIMIT_SIZE (0x132000) -#else -#define AP_PKGIMG_LIMIT_SIZE (0x134000) -#endif -#endif //undefined AP_PKGIMG_LIMIT_SIZE - -#elif defined TYPE_EC718P - -/* - -0x00000000 |---------------------------------| - | header1 4KB | -0x00001000 |---------------------------------| - | header2 4KB | -0x00002000 |---------------------------------| - | fuse mirror 4KB | -0x00003000 |---------------------------------| - | bl 72KB | -0x00015000 |---------------------------------| - | rel data(factory)20KB | -0x0001a000 |---------------------------------| - -#if defined (FEATURE_AMR_CP_ENABLE) || defined (FEATURE_VEM_CP_ENABLE) - | cp img 640KB | -0x000Ba000 |---------------------------------| - | app img 2616KB | -#else - | cp img 400KB | -0x0007e000 |---------------------------------| - | app img 2856KB | -#endif -0x00348000 |---------------------------------| - | fota 260KB (164KB可用) | 因增大fs导致fota缩小至260KB -0x00389000 |---------------------------------| - | fs 256KB | 此demo增大fs至256KB -0x003c9000 |---------------------------------| - | kv 64KB | -0x003d9000 |---------------------------------| - | hib backup 96KB | -0x003f1000 |---------------------------------| - | rel data 52KB | -0x003fe000 |---------------------------------| - | plat config 8KB | -0x00400000 |---------------------------------| - -*/ - -#define BOOTLOADER_FLASH_LOAD_SIZE (0x11000)//68kB, real region size, tool will check when zip TODO:ZIP -#define BOOTLOADER_FLASH_LOAD_UNZIP_SIZE (0x18000)//96KB ,for ld - -//ap image addr and size -#if defined (FEATURE_AMR_CP_ENABLE) || defined (FEATURE_VEM_CP_ENABLE) -#define AP_FLASH_LOAD_ADDR (0x008BA000) -#ifndef AP_FLASH_LOAD_SIZE -#define AP_FLASH_LOAD_SIZE (0x28E000)//2616KB -#endif -#else -#define AP_FLASH_LOAD_ADDR (0x0087e000) -#ifndef AP_FLASH_LOAD_SIZE -#define AP_FLASH_LOAD_SIZE (0x2ca000)//2856KB -#endif -#endif - -#ifndef FULL_OTA_SAVE_ADDR -#define FULL_OTA_SAVE_ADDR (0x0) -#endif -#define AP_FLASH_LOAD_UNZIP_SIZE (AP_FLASH_LOAD_SIZE + 0x10000)//AP_FLASH_LOAD_SIZE+64KB ,for ld - - -//fota addr and size -#ifndef FLASH_FOTA_REGION_START -#define FLASH_FOTA_REGION_START (0x348000) -#define FLASH_FOTA_REGION_LEN (0x41000)//260KB -#define FLASH_FOTA_REGION_END (0x389000) -#endif - - -//fs addr and size -#ifndef FLASH_FS_REGION_START -#define FLASH_FS_REGION_START (0x389000) -#define FLASH_FS_REGION_END (0x3c9000) -#endif -#define FLASH_FS_REGION_SIZE (FLASH_FS_REGION_END-FLASH_FS_REGION_START) //256KB - - -//fskv addr and size -#define FLASH_FDB_REGION_START (0x3c9000)//64KB -#define FLASH_FDB_REGION_END (0x3d9000) - -//hib bakcup addr and size -#define FLASH_HIB_BACKUP_EXIST (1) -#define FLASH_MEM_BACKUP_ADDR (AP_FLASH_XIP_ADDR+FLASH_MEM_BACKUP_NONXIP_ADDR) -#define FLASH_MEM_BACKUP_NONXIP_ADDR (0x3d9000) -#define FLASH_MEM_BACKUP_SIZE (0x18000)//96KB -#define FLASH_MEM_BLOCK_SIZE (0x6000) -#define FLASH_MEM_BLOCK_CNT (0x4) - -// mapdef -#define BOOTLOADER_PKGIMG_LIMIT_SIZE (0x11000) - -#ifndef AP_PKGIMG_LIMIT_SIZE -#define AP_PKGIMG_LIMIT_SIZE (0x2ca000) -#endif - -#elif defined TYPE_EC716S - -/*2M flash only, no psram*/ - -/* -AP/CP flash layout, toatl 2MB -flash raw address: 0x00000000---0x00200000 -flash xip address(from ap/cp view): 0x00800000---0x00a00000 - - -0x00000000 |---------------------------------| - | header1 4KB | -0x00001000 |---------------------------------| - | header2 4KB | -0x00002000 |---------------------------------| - | fuse mirror 4KB | -0x00003000 |---------------------------------| - | BL 72KB | -0x00015000 |---------------------------------| - | rel (factory) 20KB |----compress -#if (defined MID_FEATURE_MODE) || (defined GCF_FEATURE_MODE) -0x0001a000 |---------------------------------| - | cp img 360KB | -0x00074000 |---------------------------------| - | ap img 1224KB | -#else -0x0001a000 |---------------------------------| - | cp img 352KB | -0x00072000 |---------------------------------| - | ap img 1232KB | -#endif -0x001a6000 |---------------------------------| - | lfs 48KB | -0x001b2000 |---------------------------------| - | fota 256KB | -0x001f2000 |---------------------------------| - | rel 52KB | -0x001ff000 |---------------------------------| - | plat config 4KB |---- read-modify-write -0x00200000 |---------------------------------| - - -*/ - -/* -------------------------------flash address define-------------------------*/ - -#ifndef AP_FLASH_LOAD_SIZE -#ifdef MID_FEATURE_MODE -#define AP_FLASH_LOAD_SIZE (0x132000)//1232KB-8KB for CP -#define AP_FLASH_LOAD_UNZIP_SIZE (0x140000)//1288KB-8KB for CP,for ld -#else -#define AP_FLASH_LOAD_SIZE (0x134000)//1232KB -#define AP_FLASH_LOAD_UNZIP_SIZE (0x142000)//1288KB ,for ld -#endif -#else -#define AP_FLASH_LOAD_UNZIP_SIZE (AP_FLASH_LOAD_SIZE + 0x10000)//AP_FLASH_LOAD_SIZE+64KB ,for ld -#endif //undef AP_FLASH_LOAD_SIZE - -/*temp add here, need handle from caller !!!!*/ -//hib bakcup addr and size but not used -#if 0 -#define FLASH_HIB_BACKUP_EXIST (0) -#define FLASH_MEM_BACKUP_ADDR (0) -#define FLASH_MEM_BACKUP_NONXIP_ADDR (0) -#define FLASH_MEM_BACKUP_SIZE (0) -#define FLASH_MEM_BLOCK_SIZE (0) -#define FLASH_MEM_BLOCK_CNT (0) - -//fs addr and size -#define FLASH_FS_REGION_START (0x1a6000) -#define FLASH_FS_REGION_END (0x1b2000) -#define FLASH_FS_REGION_SIZE (FLASH_FS_REGION_END-FLASH_FS_REGION_START) // 48KB - -#define FLASH_FOTA_REGION_START (0x1b2000) -#define FLASH_FOTA_REGION_LEN (0x40000)//256KB -#define FLASH_FOTA_REGION_END (0x1f2000) - -#else //需要HIB参考这个配置 -#define FLASH_HIB_BACKUP_EXIST (1) -#define FLASH_MEM_BACKUP_ADDR (AP_FLASH_XIP_ADDR+FLASH_MEM_BACKUP_NONXIP_ADDR) -#define FLASH_MEM_BACKUP_NONXIP_ADDR (0x1a6000) -#define FLASH_MEM_BACKUP_SIZE (0x18000)//96KB -#define FLASH_MEM_BLOCK_SIZE (0x6000) -#define FLASH_MEM_BLOCK_CNT (0x4) - -//fs addr and size -#define FLASH_FS_REGION_START (0x1be000) -#define FLASH_FS_REGION_END (0x1ca000) -#define FLASH_FS_REGION_SIZE (FLASH_FS_REGION_END-FLASH_FS_REGION_START) // 48KB - -#define FLASH_FOTA_REGION_START (0x1ca000) -#define FLASH_FOTA_REGION_LEN (0x28000) //160KB -#define FLASH_FOTA_REGION_END (0x1f2000) - -#endif - -// mapdef -#ifndef AP_PKGIMG_LIMIT_SIZE -#if defined GCF_FEATURE_MODE -#define AP_PKGIMG_LIMIT_SIZE (0x16e000) -#elif defined MID_FEATURE_MODE -#define AP_PKGIMG_LIMIT_SIZE (0x132000) -#else -#define AP_PKGIMG_LIMIT_SIZE (0x134000) -#endif -#endif //undefined AP_PKGIMG_LIMIT_SIZE - -#else - #error "Need define chip type" -#endif - -#endif From 640ae999fc692b8f19f410716125095c8344e59d Mon Sep 17 00:00:00 2001 From: Wendal Chen Date: Tue, 30 Apr 2024 09:34:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:=20example=5Faudio=5Fflash=E4=BB=85?= =?UTF-8?q?=E5=9C=A8EC718P=E4=B8=8B=E6=A3=80=E6=9F=A5,=20=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=8C=85=E5=90=ABtts=E8=B5=84?= =?UTF-8?q?=E6=BA=90,=E5=85=B6=E4=BB=96=E8=8A=AF=E7=89=87=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E6=94=BE=E4=B8=8D=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/example_audio_flash/ci_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/example_audio_flash/ci_conf.json b/project/example_audio_flash/ci_conf.json index a1ed9f9b..1bb65724 100644 --- a/project/example_audio_flash/ci_conf.json +++ b/project/example_audio_flash/ci_conf.json @@ -1,5 +1,5 @@ { "build" : { - "chip_target": ["ec718p", "ec718pv"] + "chip_target": ["ec718p"] } } \ No newline at end of file