Rename CCM to DTCM for consistency.

This commit is contained in:
iabdalkader 2020-07-31 19:35:02 +02:00
parent 798dff2648
commit cae556d033
9 changed files with 28 additions and 28 deletions

View File

@ -17,13 +17,13 @@ ENTRY(Reset_Handler)
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
CCM (xrw) : ORIGIN = OMV_CCM_ORIGIN, LENGTH = OMV_CCM_LENGTH DTCM (xrw) : ORIGIN = OMV_DTCM_ORIGIN, LENGTH = OMV_DTCM_LENGTH
RAM (xrw) : ORIGIN = OMV_SRAM1_ORIGIN, LENGTH = OMV_SRAM1_LENGTH RAM (xrw) : ORIGIN = OMV_SRAM1_ORIGIN, LENGTH = OMV_SRAM1_LENGTH
FLASH_TEXT (rx) : ORIGIN = OMV_BOOT_ORIGIN, LENGTH = OMV_BOOT_LENGTH FLASH_TEXT (rx) : ORIGIN = OMV_BOOT_ORIGIN, LENGTH = OMV_BOOT_LENGTH
} }
_estack = ORIGIN(CCM) + LENGTH(CCM); _estack = ORIGIN(DTCM) + LENGTH(DTCM);
_ram_end = ORIGIN(CCM) + LENGTH(CCM); _ram_end = ORIGIN(DTCM) + LENGTH(DTCM);
_stack_size = (4K); /* minimum amount of stack */ _stack_size = (4K); /* minimum amount of stack */
/* Define output sections */ /* Define output sections */
@ -58,7 +58,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_edata = .; /* define a global symbol at data end */ _edata = .; /* define a global symbol at data end */
} >CCM } >DTCM
/* Uninitialized data section */ /* Uninitialized data section */
. = ALIGN(4); . = ALIGN(4);
@ -75,7 +75,7 @@ SECTIONS
_ebss = .; /* define a global symbol at bss end */ _ebss = .; /* define a global symbol at bss end */
__bss_end__ = _ebss; __bss_end__ = _ebss;
_bss_end = _ebss; /* for gccollect */ _bss_end = _ebss; /* for gccollect */
} >CCM } >DTCM
/* Make sure there is enough RAM the stack and FS cache */ /* Make sure there is enough RAM the stack and FS cache */
.stack : .stack :
@ -83,7 +83,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
. = . + _stack_size; . = . + _stack_size;
. = ALIGN(4); . = ALIGN(4);
} >CCM } >DTCM
.ARM.attributes 0 : { *(.ARM.attributes) } .ARM.attributes 0 : { *(.ARM.attributes) }
} }

View File

@ -50,8 +50,8 @@
#define OMV_TEXT_LENGTH 448K #define OMV_TEXT_LENGTH 448K
#define OMV_SRAM1_ORIGIN 0x20000000 #define OMV_SRAM1_ORIGIN 0x20000000
#define OMV_SRAM1_LENGTH 128K #define OMV_SRAM1_LENGTH 128K
#define OMV_CCM_ORIGIN 0x10000000 #define OMV_DTCM_ORIGIN 0x10000000
#define OMV_CCM_LENGTH 64K #define OMV_DTCM_LENGTH 64K
/* SCCB/I2C */ /* SCCB/I2C */
#define SCCB_I2C (I2C1) #define SCCB_I2C (I2C1)

View File

@ -74,8 +74,8 @@
// The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp).
// Note: fb_alloc overwrites the line buffer which is only used during readout. // Note: fb_alloc overwrites the line buffer which is only used during readout.
#define OMV_FB_MEMORY SRAM1 // Framebuffer, fb_alloc #define OMV_FB_MEMORY SRAM1 // Framebuffer, fb_alloc
#define OMV_MAIN_MEMORY CCM // data, bss and heap memory #define OMV_MAIN_MEMORY DTCM // data, bss and heap memory
#define OMV_STACK_MEMORY CCM // stack memory #define OMV_STACK_MEMORY DTCM // stack memory
#define OMV_DMA_MEMORY SRAM2 // Misc DMA buffers #define OMV_DMA_MEMORY SRAM2 // Misc DMA buffers
#define OMV_FB_SIZE (150K) // FB memory: header + QVGA/GS image #define OMV_FB_SIZE (150K) // FB memory: header + QVGA/GS image
@ -93,8 +93,8 @@
#define OMV_BOOT_LENGTH 16K #define OMV_BOOT_LENGTH 16K
#define OMV_TEXT_ORIGIN 0x08010000 #define OMV_TEXT_ORIGIN 0x08010000
#define OMV_TEXT_LENGTH 960K #define OMV_TEXT_LENGTH 960K
#define OMV_CCM_ORIGIN 0x10000000 #define OMV_DTCM_ORIGIN 0x10000000
#define OMV_CCM_LENGTH 64K #define OMV_DTCM_LENGTH 64K
#define OMV_SRAM1_ORIGIN 0x20000000 #define OMV_SRAM1_ORIGIN 0x20000000
#define OMV_SRAM1_LENGTH 163K #define OMV_SRAM1_LENGTH 163K
#define OMV_SRAM2_ORIGIN 0x20028C00 #define OMV_SRAM2_ORIGIN 0x20028C00

View File

@ -74,9 +74,9 @@
// Note: fb_alloc is a stack-based, dynamically allocated memory on FB. // Note: fb_alloc is a stack-based, dynamically allocated memory on FB.
// The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp).
#define OMV_FB_MEMORY SRAM1 // Framebuffer, fb_alloc #define OMV_FB_MEMORY SRAM1 // Framebuffer, fb_alloc
#define OMV_MAIN_MEMORY CCM // data, bss and heap #define OMV_MAIN_MEMORY DTCM // data, bss and heap
#define OMV_STACK_MEMORY ITCM // stack memory #define OMV_STACK_MEMORY ITCM // stack memory
#define OMV_DMA_MEMORY CCM // Misc DMA buffers #define OMV_DMA_MEMORY DTCM // Misc DMA buffers
#define OMV_FB_SIZE (300K) // FB memory: header + VGA/GS image #define OMV_FB_SIZE (300K) // FB memory: header + VGA/GS image
#define OMV_FB_ALLOC_SIZE (84K) // minimum fb alloc size #define OMV_FB_ALLOC_SIZE (84K) // minimum fb alloc size
@ -93,8 +93,8 @@
#define OMV_BOOT_LENGTH 32K #define OMV_BOOT_LENGTH 32K
#define OMV_TEXT_ORIGIN 0x08020000 #define OMV_TEXT_ORIGIN 0x08020000
#define OMV_TEXT_LENGTH 1920K #define OMV_TEXT_LENGTH 1920K
#define OMV_CCM_ORIGIN 0x20000000 #define OMV_DTCM_ORIGIN 0x20000000
#define OMV_CCM_LENGTH 128K // Note DTCM/ITCM memory is not cacheable on M7 #define OMV_DTCM_LENGTH 128K // Note DTCM/ITCM memory is not cacheable on M7
#define OMV_ITCM_ORIGIN 0x00000000 #define OMV_ITCM_ORIGIN 0x00000000
#define OMV_ITCM_LENGTH 16K #define OMV_ITCM_LENGTH 16K
#define OMV_SRAM1_ORIGIN 0x20020000 #define OMV_SRAM1_ORIGIN 0x20020000

View File

@ -110,7 +110,7 @@
// Linker script constants (see the linker script template stm32fxxx.ld.S). // Linker script constants (see the linker script template stm32fxxx.ld.S).
// Note: fb_alloc is a stack-based, dynamically allocated memory on FB. // Note: fb_alloc is a stack-based, dynamically allocated memory on FB.
// The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp).
#define OMV_FFS_MEMORY CCM // Flash filesystem cache memory #define OMV_FFS_MEMORY DTCM // Flash filesystem cache memory
#define OMV_MAIN_MEMORY SRAM1 // data, bss and heap memory #define OMV_MAIN_MEMORY SRAM1 // data, bss and heap memory
#define OMV_STACK_MEMORY SRAM1 // stack memory #define OMV_STACK_MEMORY SRAM1 // stack memory
#define OMV_DMA_MEMORY AXI_SRAM // DMA buffers memory. #define OMV_DMA_MEMORY AXI_SRAM // DMA buffers memory.
@ -132,8 +132,8 @@
#define OMV_BOOT_LENGTH 128K #define OMV_BOOT_LENGTH 128K
#define OMV_TEXT_ORIGIN 0x08040000 #define OMV_TEXT_ORIGIN 0x08040000
#define OMV_TEXT_LENGTH 1792K #define OMV_TEXT_LENGTH 1792K
#define OMV_CCM_ORIGIN 0x20000000 // Note accessible by CPU and MDMA only. #define OMV_DTCM_ORIGIN 0x20000000 // Note accessible by CPU and MDMA only.
#define OMV_CCM_LENGTH 128K #define OMV_DTCM_LENGTH 128K
#define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_ORIGIN 0x30000000
#define OMV_SRAM1_LENGTH 256K #define OMV_SRAM1_LENGTH 256K
#define OMV_SRAM3_ORIGIN 0x30040000 #define OMV_SRAM3_ORIGIN 0x30040000

View File

@ -111,7 +111,7 @@
// Linker script constants (see the linker script template stm32fxxx.ld.S). // Linker script constants (see the linker script template stm32fxxx.ld.S).
// Note: fb_alloc is a stack-based, dynamically allocated memory on FB. // Note: fb_alloc is a stack-based, dynamically allocated memory on FB.
// The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp).
#define OMV_FFS_MEMORY CCM // Flash filesystem cache memory #define OMV_FFS_MEMORY DTCM // Flash filesystem cache memory
#define OMV_MAIN_MEMORY SRAM1 // data, bss and heap #define OMV_MAIN_MEMORY SRAM1 // data, bss and heap
#define OMV_STACK_MEMORY SRAM1 // stack memory #define OMV_STACK_MEMORY SRAM1 // stack memory
#define OMV_DMA_MEMORY AXI_SRAM // DMA buffers memory. #define OMV_DMA_MEMORY AXI_SRAM // DMA buffers memory.
@ -138,8 +138,8 @@
#define OMV_BOOT_LENGTH 128K #define OMV_BOOT_LENGTH 128K
#define OMV_TEXT_ORIGIN 0x08040000 #define OMV_TEXT_ORIGIN 0x08040000
#define OMV_TEXT_LENGTH 1792K #define OMV_TEXT_LENGTH 1792K
#define OMV_CCM_ORIGIN 0x20000000 // Note accessible by CPU and MDMA only. #define OMV_DTCM_ORIGIN 0x20000000 // Note accessible by CPU and MDMA only.
#define OMV_CCM_LENGTH 128K #define OMV_DTCM_LENGTH 128K
#define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_ORIGIN 0x30000000
#define OMV_SRAM1_LENGTH 256K #define OMV_SRAM1_LENGTH 256K
#define OMV_SRAM3_ORIGIN 0x30040000 #define OMV_SRAM3_ORIGIN 0x30040000

View File

@ -107,7 +107,7 @@
// Linker script constants (see the linker script template stm32fxxx.ld.S). // Linker script constants (see the linker script template stm32fxxx.ld.S).
// Note: fb_alloc is a stack-based, dynamically allocated memory on FB. // Note: fb_alloc is a stack-based, dynamically allocated memory on FB.
// The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp).
#define OMV_FFS_MEMORY CCM // Flash filesystem cache memory #define OMV_FFS_MEMORY DTCM // Flash filesystem cache memory
#define OMV_MAIN_MEMORY SRAM1 // data, bss and heap #define OMV_MAIN_MEMORY SRAM1 // data, bss and heap
#define OMV_STACK_MEMORY SRAM1 // stack memory #define OMV_STACK_MEMORY SRAM1 // stack memory
#define OMV_DMA_MEMORY AXI_SRAM // DMA buffers memory. #define OMV_DMA_MEMORY AXI_SRAM // DMA buffers memory.
@ -134,8 +134,8 @@
#define OMV_BOOT_LENGTH 128K #define OMV_BOOT_LENGTH 128K
#define OMV_TEXT_ORIGIN 0x08040000 #define OMV_TEXT_ORIGIN 0x08040000
#define OMV_TEXT_LENGTH 1792K #define OMV_TEXT_LENGTH 1792K
#define OMV_CCM_ORIGIN 0x20000000 // Note accessible by CPU and MDMA only. #define OMV_DTCM_ORIGIN 0x20000000 // Note accessible by CPU and MDMA only.
#define OMV_CCM_LENGTH 128K #define OMV_DTCM_LENGTH 128K
#define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_ORIGIN 0x30000000
#define OMV_SRAM1_LENGTH 256K #define OMV_SRAM1_LENGTH 256K
#define OMV_SRAM3_ORIGIN 0x30040000 #define OMV_SRAM3_ORIGIN 0x30040000

View File

@ -17,7 +17,7 @@ ENTRY(Reset_Handler)
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
CCM (xrw) : ORIGIN = OMV_CCM_ORIGIN, LENGTH = OMV_CCM_LENGTH DTCM (xrw) : ORIGIN = OMV_DTCM_ORIGIN, LENGTH = OMV_DTCM_LENGTH
#if defined(OMV_ITCM_ORIGIN) #if defined(OMV_ITCM_ORIGIN)
ITCM (xrw) : ORIGIN = OMV_ITCM_ORIGIN, LENGTH = OMV_ITCM_LENGTH ITCM (xrw) : ORIGIN = OMV_ITCM_ORIGIN, LENGTH = OMV_ITCM_LENGTH
#endif #endif

View File

@ -17,7 +17,7 @@ ENTRY(Reset_Handler)
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
CCM (xrw) : ORIGIN = OMV_CCM_ORIGIN, LENGTH = OMV_CCM_LENGTH DTCM (xrw) : ORIGIN = OMV_DTCM_ORIGIN, LENGTH = OMV_DTCM_LENGTH
#if defined(OMV_ITCM_ORIGIN) #if defined(OMV_ITCM_ORIGIN)
ITCM (xrw) : ORIGIN = OMV_ITCM_ORIGIN, LENGTH = OMV_ITCM_LENGTH ITCM (xrw) : ORIGIN = OMV_ITCM_ORIGIN, LENGTH = OMV_ITCM_LENGTH
#endif #endif