diff --git a/vision_apps/platform/am62a/rtos/app_mem_map.h b/vision_apps/platform/am62a/rtos/app_mem_map.h index c93a3aea0..803ad35df 100755 --- a/vision_apps/platform/am62a/rtos/app_mem_map.h +++ b/vision_apps/platform/am62a/rtos/app_mem_map.h @@ -131,29 +131,29 @@ #define DDR_DM_R5F_VISS_CONFIG_HEAP_ADDR (0xADC00000u) #define DDR_DM_R5F_VISS_CONFIG_HEAP_SIZE (0x00400000u) -/* DDR for MCU R5F for local heap [ size 16.00 MB ] */ +/* DDR for MCU R5F for local heap [ size 8.00 MB ] */ #define DDR_MCU_R5F_LOCAL_HEAP_ADDR (0xAE000000u) -#define DDR_MCU_R5F_LOCAL_HEAP_SIZE (0x01000000u) +#define DDR_MCU_R5F_LOCAL_HEAP_SIZE (0x00800000u) -/* DDR for DM R5F for local heap [ size 16.00 MB ] */ -#define DDR_DM_R5F_LOCAL_HEAP_ADDR (0xAF000000u) -#define DDR_DM_R5F_LOCAL_HEAP_SIZE (0x01000000u) +/* DDR for DM R5F for local heap [ size 8.00 MB ] */ +#define DDR_DM_R5F_LOCAL_HEAP_ADDR (0xAE800000u) +#define DDR_DM_R5F_LOCAL_HEAP_SIZE (0x00800000u) -/* DDR for c7x_1 for non cacheable local heap [ size 16.00 MB ] */ -#define DDR_C7X_1_LOCAL_HEAP_NON_CACHEABLE_ADDR (0xB0000000u) -#define DDR_C7X_1_LOCAL_HEAP_NON_CACHEABLE_SIZE (0x01000000u) +/* DDR for c7x_1 for non cacheable local heap [ size 8.00 MB ] */ +#define DDR_C7X_1_LOCAL_HEAP_NON_CACHEABLE_ADDR (0xAF000000u) +#define DDR_C7X_1_LOCAL_HEAP_NON_CACHEABLE_SIZE (0x00800000u) -/* DDR for c7x_1 for non cacheable scratch Memory [ size 16.00 MB ] */ -#define DDR_C7X_1_SCRATCH_NON_CACHEABLE_ADDR (0xB1000000u) -#define DDR_C7X_1_SCRATCH_NON_CACHEABLE_SIZE (0x01000000u) +/* DDR for c7x_1 for non cacheable scratch Memory [ size 8.00 MB ] */ +#define DDR_C7X_1_SCRATCH_NON_CACHEABLE_ADDR (0xAF800000u) +#define DDR_C7X_1_SCRATCH_NON_CACHEABLE_SIZE (0x00800000u) -/* DDR for c7x_1 for local heap [ size 112.00 MB ] */ -#define DDR_C7X_1_LOCAL_HEAP_ADDR (0xB2000000u) -#define DDR_C7X_1_LOCAL_HEAP_SIZE (0x07000000u) +/* DDR for c7x_1 for local heap [ size 56.00 MB ] */ +#define DDR_C7X_1_LOCAL_HEAP_ADDR (0xB0000000u) +#define DDR_C7X_1_LOCAL_HEAP_SIZE (0x03800000u) -/* DDR for c7x_1 for Scratch Memory [ size 112.00 MB ] */ -#define DDR_C7X_1_SCRATCH_ADDR (0xB9000000u) -#define DDR_C7X_1_SCRATCH_SIZE (0x07000000u) +/* DDR for c7x_1 for Scratch Memory [ size 56.00 MB ] */ +#define DDR_C7X_1_SCRATCH_ADDR (0xB3800000u) +#define DDR_C7X_1_SCRATCH_SIZE (0x03800000u) #define DDR_64BIT_BASE_VADDR (0x00000000u) #define DDR_64BIT_BASE_PADDR (0x00000000u) diff --git a/vision_apps/platform/am62a/rtos/c7x_1/example.syscfg b/vision_apps/platform/am62a/rtos/c7x_1/example.syscfg index 0a00d3e51..966d05562 100644 --- a/vision_apps/platform/am62a/rtos/c7x_1/example.syscfg +++ b/vision_apps/platform/am62a/rtos/c7x_1/example.syscfg @@ -68,14 +68,14 @@ mmu_armv87.pAddr = 0x7C400000; mmu_armv87.size = 0x100000; mmu_armv87.$name = "DRU"; -mmu_armv88.vAddr = 0x7E000000; -mmu_armv88.pAddr = 0x7E000000; +mmu_armv88.vAddr = 0x7E000000; +mmu_armv88.pAddr = 0x7E000000; mmu_armv88.$name = "L2RAM_C7x_1_MAIN"; -mmu_armv88.size = 0x1000000; +mmu_armv88.size = 0x100000; -mmu_armv89.vAddr = 0x7F000000; -mmu_armv89.pAddr = 0x7F000000; -mmu_armv89.size = 0x1000000; +mmu_armv89.vAddr = 0x7F000000; +mmu_armv89.pAddr = 0x7F000000; +mmu_armv89.size = 0x03C000; mmu_armv89.$name = "L2RAM_C7x_1_AUX"; mmu_armv810.attribute = "MAIR7"; @@ -90,22 +90,22 @@ mmu_armv811.pAddr = 0xA3000000; mmu_armv811.size = 0xAC00000; mmu_armv811.attribute = "MAIR7"; -mmu_armv812.vAddr = 0xB2000000; -mmu_armv812.pAddr = 0xB2000000; -mmu_armv812.size = 0x7000000; +mmu_armv812.vAddr = 0xB0000000; +mmu_armv812.pAddr = 0xB0000000; +mmu_armv812.size = 0x3800000; mmu_armv812.$name = "DDR_C7X_1_LOCAL_HEAP"; mmu_armv812.attribute = "MAIR7"; mmu_armv813.$name = "DDR_C7X_1_SCRATCH"; mmu_armv813.attribute = "MAIR7"; -mmu_armv813.vAddr = 0xB9000000; -mmu_armv813.pAddr = 0xB9000000; -mmu_armv813.size = 0x7000000; +mmu_armv813.vAddr = 0xB3800000; +mmu_armv813.pAddr = 0xB3800000; +mmu_armv813.size = 0x3800000; mmu_armv814.attribute = "MAIR4"; mmu_armv814.vAddr = 0xA1000000; mmu_armv814.pAddr = 0xA1000000; -mmu_armv814.size = 0x40000; +mmu_armv814.size = 0x040000; mmu_armv814.$name = "APP_LOG_MEM"; mmu_armv815.$name = "APP_FILEIO_MEM"; @@ -139,13 +139,13 @@ mmu_armv819.attribute = "MAIR4"; mmu_armv819.$name = "TIOVX_LOG_RT_MEM"; mmu_armv820.$name = "DDR_C7X_1_LOCAL_HEAP_NON_CACHEABLE"; -mmu_armv820.vAddr = 0xB0000000; -mmu_armv820.size = 0x1000000; -mmu_armv820.pAddr = 0xB0000000; +mmu_armv820.vAddr = 0xAF000000; +mmu_armv820.size = 0x800000; +mmu_armv820.pAddr = 0xAF000000; mmu_armv820.attribute = "MAIR4"; mmu_armv821.$name = "DDR_C7X_1_SCRATCH_NON_CACHEABLE"; -mmu_armv821.vAddr = 0xB1000000; -mmu_armv821.pAddr = 0xB1000000; -mmu_armv821.size = 0x1000000; +mmu_armv821.vAddr = 0xAF800000; +mmu_armv821.pAddr = 0xAF800000; +mmu_armv821.size = 0x800000; mmu_armv821.attribute = "MAIR4"; diff --git a/vision_apps/platform/am62a/rtos/c7x_1/linker_mem_map.cmd b/vision_apps/platform/am62a/rtos/c7x_1/linker_mem_map.cmd index 14e8d3653..380142483 100644 --- a/vision_apps/platform/am62a/rtos/c7x_1/linker_mem_map.cmd +++ b/vision_apps/platform/am62a/rtos/c7x_1/linker_mem_map.cmd @@ -94,12 +94,12 @@ MEMORY APP_FILEIO_MEM : ORIGIN = 0xA2000000 , LENGTH = 0x00400000 /* Memory for shared memory buffers in DDR [ size 172.00 MB ] */ DDR_SHARED_MEM : ORIGIN = 0xA3000000 , LENGTH = 0x0AC00000 - /* DDR for c7x_1 for non cacheable local heap [ size 16.00 MB ] */ - DDR_C7X_1_LOCAL_HEAP_NON_CACHEABLE ( RWIX ) : ORIGIN = 0xB0000000 , LENGTH = 0x01000000 - /* DDR for c7x_1 for non cacheable scratch Memory [ size 16.00 MB ] */ - DDR_C7X_1_SCRATCH_NON_CACHEABLE ( RWIX ) : ORIGIN = 0xB1000000 , LENGTH = 0x01000000 - /* DDR for c7x_1 for local heap [ size 112.00 MB ] */ - DDR_C7X_1_LOCAL_HEAP ( RWIX ) : ORIGIN = 0xB2000000 , LENGTH = 0x07000000 - /* DDR for c7x_1 for Scratch Memory [ size 112.00 MB ] */ - DDR_C7X_1_SCRATCH ( RWIX ) : ORIGIN = 0xB9000000 , LENGTH = 0x07000000 + /* DDR for c7x_1 for non cacheable local heap [ size 8.00 MB ] */ + DDR_C7X_1_LOCAL_HEAP_NON_CACHEABLE ( RWIX ) : ORIGIN = 0xAF000000 , LENGTH = 0x00800000 + /* DDR for c7x_1 for non cacheable scratch Memory [ size 8.00 MB ] */ + DDR_C7X_1_SCRATCH_NON_CACHEABLE ( RWIX ) : ORIGIN = 0xAF800000 , LENGTH = 0x00800000 + /* DDR for c7x_1 for local heap [ size 56.00 MB ] */ + DDR_C7X_1_LOCAL_HEAP ( RWIX ) : ORIGIN = 0xB0000000 , LENGTH = 0x03800000 + /* DDR for c7x_1 for Scratch Memory [ size 56.00 MB ] */ + DDR_C7X_1_SCRATCH ( RWIX ) : ORIGIN = 0xB3800000 , LENGTH = 0x03800000 } diff --git a/vision_apps/platform/am62a/rtos/gen_linker_mem_map.py b/vision_apps/platform/am62a/rtos/gen_linker_mem_map.py index 2b00d6220..d6a272a4b 100755 --- a/vision_apps/platform/am62a/rtos/gen_linker_mem_map.py +++ b/vision_apps/platform/am62a/rtos/gen_linker_mem_map.py @@ -218,27 +218,27 @@ ddr_viss_config_heap_size = 4*MB; carveout_size += ddr_viss_config_heap_size mcu_r5f_ddr_local_heap_addr = ddr_viss_config_heap_addr + ddr_viss_config_heap_size; -mcu_r5f_ddr_local_heap_size = 16*MB; +mcu_r5f_ddr_local_heap_size = 8*MB; carveout_size += mcu_r5f_ddr_local_heap_size dm_r5f_ddr_local_heap_addr = mcu_r5f_ddr_local_heap_addr + mcu_r5f_ddr_local_heap_size; -dm_r5f_ddr_local_heap_size = 16*MB; +dm_r5f_ddr_local_heap_size = 8*MB; carveout_size += dm_r5f_ddr_local_heap_size c7x_1_ddr_local_heap_non_cacheable_addr = dm_r5f_ddr_local_heap_addr + dm_r5f_ddr_local_heap_size; -c7x_1_ddr_local_heap_non_cacheable_size = 16*MB; +c7x_1_ddr_local_heap_non_cacheable_size = 8*MB; carveout_size += c7x_1_ddr_local_heap_non_cacheable_size c7x_1_ddr_scratch_non_cacheable_addr = c7x_1_ddr_local_heap_non_cacheable_addr + c7x_1_ddr_local_heap_non_cacheable_size; -c7x_1_ddr_scratch_non_cacheable_size = 16*MB; +c7x_1_ddr_scratch_non_cacheable_size = 8*MB; carveout_size += c7x_1_ddr_scratch_non_cacheable_size c7x_1_ddr_local_heap_addr = c7x_1_ddr_scratch_non_cacheable_addr + c7x_1_ddr_scratch_non_cacheable_size; -c7x_1_ddr_local_heap_size = 112*MB; +c7x_1_ddr_local_heap_size = 56*MB; carveout_size += c7x_1_ddr_local_heap_size c7x_1_ddr_scratch_addr = c7x_1_ddr_local_heap_addr + c7x_1_ddr_local_heap_size; -c7x_1_ddr_scratch_size = 112*MB; +c7x_1_ddr_scratch_size = 56*MB; carveout_size += c7x_1_ddr_scratch_size assert carveout_size <= ddr_mem_size_2 diff --git a/vision_apps/platform/am62a/rtos/mcu1_0/example.syscfg b/vision_apps/platform/am62a/rtos/mcu1_0/example.syscfg index 093f7e4c3..1953db266 100644 --- a/vision_apps/platform/am62a/rtos/mcu1_0/example.syscfg +++ b/vision_apps/platform/am62a/rtos/mcu1_0/example.syscfg @@ -64,7 +64,7 @@ mpu_armv75.tex = 5; mpu_armv75.isCacheable = false; mpu_armv76.baseAddr = 0x9C800000; -mpu_armv76.size = 21; +mpu_armv76.size = 20; mpu_armv76.$name = "IPC_VRING_RESOURCE_TABLE_LINUX"; mpu_armv76.attributes = "CUSTOM"; mpu_armv76.tex = 0; @@ -88,7 +88,7 @@ mpu_armv78.isCacheable = false; mpu_armv78.isBufferable = false; mpu_armv78.tex = 0; mpu_armv78.baseAddr = 0xA1000000; -mpu_armv78.size = 24; +mpu_armv78.size = 18; mpu_armv79.$name = "TIOVX_RUN_TIME_LOGGING2"; mpu_armv79.allowExecute = false; @@ -97,7 +97,7 @@ mpu_armv79.isCacheable = false; mpu_armv79.isBufferable = false; mpu_armv79.tex = 0; mpu_armv79.baseAddr = 0xA2000000; -mpu_armv79.size = 24; +mpu_armv79.size = 22; mpu_armv710.$name = "DDR_DM_R5F_VISS_CONFIG_HEAP"; mpu_armv710.size = 22; diff --git a/vision_apps/platform/am62a/rtos/mcu1_0/linker_mem_map.cmd b/vision_apps/platform/am62a/rtos/mcu1_0/linker_mem_map.cmd index f3b328a5a..ebba3f7b7 100644 --- a/vision_apps/platform/am62a/rtos/mcu1_0/linker_mem_map.cmd +++ b/vision_apps/platform/am62a/rtos/mcu1_0/linker_mem_map.cmd @@ -4,7 +4,7 @@ */ /* * - * Copyright (c) 2018 Texas Instruments Incorporated + * Copyright (c) 2024 Texas Instruments Incorporated * * All rights reserved not granted herein. * @@ -96,8 +96,8 @@ MEMORY APP_FILEIO_MEM : ORIGIN = 0xA2000000 , LENGTH = 0x00400000 /* Memory for shared memory buffers in DDR [ size 172.00 MB ] */ DDR_SHARED_MEM : ORIGIN = 0xA3000000 , LENGTH = 0x0AC00000 - /* Memory for storing DMA buffers for VISS configuration [ size 4.00 MB ] */ - DDR_DM_R5F_VISS_CONFIG_HEAP ( RW ) : ORIGIN = 0xADC00000 , LENGTH = 0x00400000 - /* DDR for DM R5F for local heap [ size 16.00 MB ] */ - DDR_DM_R5F_LOCAL_HEAP ( RWIX ) : ORIGIN = 0xAF000000 , LENGTH = 0x01000000 + /* DDR for storing DMA buffers for VISS configuration [ size 4.00 MB ] */ + DDR_DM_R5F_VISS_CONFIG_HEAP ( RW ) : ORIGIN = 0xADC00000 , LENGTH = 0x00400000 + /* DDR for DM R5F for local heap [ size 8.00 MB ] */ + DDR_DM_R5F_LOCAL_HEAP ( RWIX ) : ORIGIN = 0xAE800000 , LENGTH = 0x00800000 } diff --git a/vision_apps/platform/am62a/rtos/system_memory_map.html b/vision_apps/platform/am62a/rtos/system_memory_map.html index 53526caf5..d15ddb78e 100644 --- a/vision_apps/platform/am62a/rtos/system_memory_map.html +++ b/vision_apps/platform/am62a/rtos/system_memory_map.html @@ -243,48 +243,48 @@