From: luozheng <1732036298@qq.com> Date: Thu, 24 Jul 2025 03:16:49 +0000 (+0800) Subject: drivers文件夹下boards文件夹合并 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~223 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=278c64802c9858b126457487f100839a3501bd9f;p=mirrors%2FFD230.git drivers文件夹下boards文件夹合并 --- diff --git a/code/sdk/drivers/boards/brandy_evb/linker/standard/acore.prelds b/code/sdk/drivers/boards/brandy_evb/linker/standard/acore.prelds index d6994947a..4ec09caf6 100644 --- a/code/sdk/drivers/boards/brandy_evb/linker/standard/acore.prelds +++ b/code/sdk/drivers/boards/brandy_evb/linker/standard/acore.prelds @@ -91,7 +91,11 @@ SECTIONS SORT(*libc++abi*.a:*.o*) (.data .data* .sdata .sdata*) SORT(*libams*.a:*.o*) (.data .data* .sdata .sdata*) SORT(*libbms*.a:*.o*) (.data .data* .sdata .sdata*) - SORT(*libace*.a:*.o*) (.data .data* .sdata .sdata*) + SORT(*libace.a:*.o*) (.data .data* .sdata .sdata*) + SORT(*libace_adapt.a:*.o*) (.data .data* .sdata .sdata*) + SORT(*libace_http*.a:*.o*) (.data .data* .sdata .sdata*) + SORT(*libnetstack_http*.a:*.o*) (.data .data* .sdata .sdata*) + SORT(*libwebsocket*.a:*.o*) (.data .data* .sdata .sdata*) SORT(*libjerryscript*.a:*.o*) (.data .data* .sdata .sdata*) SORT(*libmsg_center*.a:*.o*) (.data .data* .sdata .sdata*) SORT(*libuikit_fwk*.a:*.o*) (.data .data* .sdata .sdata*) @@ -115,8 +119,11 @@ SECTIONS SORT(*libc++abi*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) SORT(*libams*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) SORT(*libbms*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) - SORT(*libace*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) - SORT(*libace*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) + SORT(*libace.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) + SORT(*libace_adapt.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) + SORT(*libace_http*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) + SORT(*libnetstack_http*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) + SORT(*libwebsocket*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) SORT(*libjerryscript*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) SORT(*libmsg_center*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) SORT(*libuikit_fwk*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON) diff --git a/code/sdk/drivers/boards/brandy_evb/memory_config/include/memory_config_common.h b/code/sdk/drivers/boards/brandy_evb/memory_config/include/memory_config_common.h index 03a326d15..55743d659 100644 --- a/code/sdk/drivers/boards/brandy_evb/memory_config/include/memory_config_common.h +++ b/code/sdk/drivers/boards/brandy_evb/memory_config/include/memory_config_common.h @@ -136,7 +136,7 @@ * 打包脚本: * tools\pkg\chip_packet\brandy\packet.py */ -#if defined(CFG_FLASH_SIZE) && (CFG_FLASH_SIZE == 16) +#if defined(CONFIG_NORFLASH_SIZE) && (CONFIG_NORFLASH_SIZE == 16) #include "flash_16M.h" #else #include "flash_8M.h" diff --git a/code/sdk/drivers/boards/brandy_evb/product/product_evb4_standard.h b/code/sdk/drivers/boards/brandy_evb/product/product_evb4_standard.h index 5d7028ea7..4c1a09130 100644 --- a/code/sdk/drivers/boards/brandy_evb/product/product_evb4_standard.h +++ b/code/sdk/drivers/boards/brandy_evb/product/product_evb4_standard.h @@ -25,7 +25,7 @@ #else #define ENABLE_LOW_POWER NO #endif -#if defined(CFG_FLASH_SIZE) && (CFG_FLASH_SIZE == 16) +#if defined(CONFIG_NORFLASH_SIZE) && (CONFIG_NORFLASH_SIZE == 16) #define DTB_IMAGE_PAGES 0 #define RECOVERY_IMAGE_PAGES 256 #define RESERVE_IMAGE_PAGES 64 @@ -34,7 +34,7 @@ #define HIFI0_CODEC_PAGES 448 #define APP_IMAGE_PAGES 2048 #else -#if defined(CFG_LOAD_FROM_FS) +#if defined(CONFIG_LOAD_FROM_FS) #define DTB_IMAGE_PAGES 0 #define RECOVERY_IMAGE_PAGES 64 #define RESERVE_IMAGE_PAGES 0 @@ -84,7 +84,11 @@ #define APP_MASSDATA_LENGTH 0x800 #define APP_LOGGING_LENGTH 0x1C00 #define DSP_LOGGING_LENGTH 0x2000 +#ifndef CONFIG_PSRAM_DENSITY_MB #define PSRAM_DENSITY_MB 32 +#else +#define PSRAM_DENSITY_MB CONFIG_PSRAM_DENSITY_MB +#endif #define RC_CLOCK_ON NO #define SMART_WATCH_BT_COEX_PIN_SWITCH NO // pinmux switch in the Coexistence of BT and WiFi of smart watch #define CAP_SENSOR_BUFF_LEN 128 @@ -113,6 +117,9 @@ #elif defined(SUPPORT_SOFT_SEND_FRM) #define RESOLUTION_WIDTH 368 #define RESOLUTION_HEIGHT 448 +#elif defined(GPU_SUPPORT_VIDEO_MODE) +#define RESOLUTION_WIDTH 360 +#define RESOLUTION_HEIGHT 480 #else #if defined(BOARD_U8) #define RESOLUTION_WIDTH 410//466//454 diff --git a/code/sdk/drivers/boards/brandy_evb/product/product_evb_standard.h b/code/sdk/drivers/boards/brandy_evb/product/product_evb_standard.h index bd94392e9..d45708c8e 100644 --- a/code/sdk/drivers/boards/brandy_evb/product/product_evb_standard.h +++ b/code/sdk/drivers/boards/brandy_evb/product/product_evb_standard.h @@ -60,7 +60,11 @@ #define APP_MASSDATA_LENGTH 0x800 #define APP_LOGGING_LENGTH 0x1C00 #define DSP_LOGGING_LENGTH 0x2000 +#ifndef CONFIG_PSRAM_DENSITY_MB #define PSRAM_DENSITY_MB 32 +#else +#define PSRAM_DENSITY_MB CONFIG_PSRAM_DENSITY_MB +#endif #define RC_CLOCK_ON NO #define SMART_WATCH_BT_COEX_PIN_SWITCH NO // pinmux switch in the Coexistence of BT and WiFi of smart watch #define CAP_SENSOR_BUFF_LEN 128