diff options
25 files changed, 94 insertions, 94 deletions
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_memorymap.h b/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_memorymap.h index fcbcde0eb..8bf9b562a 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_memorymap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_memorymap.h @@ -57,7 +57,7 @@ /* 0x00100000-0x07ffffff: Reserved */ #define STM32_FLASH_BASE 0x08000000 /* 0x08000000-0x080fffff: FLASH memory */ /* 0x08100000-0x0fffffff: Reserved */ -#define STM32_TCMRAM_BASE 0x10000000 /* 0x10000000-0x1000ffff: 64Kb TCM data RAM */ +#define STM32_CCMRAM_BASE 0x10000000 /* 0x10000000-0x1000ffff: 64Kb CCM data RAM */ /* 0x10010000-0x1ffeffff: Reserved */ #define STM32_SYSMEM_BASE 0x1fff0000 /* 0x1fff0000-0x1fff7a0f: System memory */ /* 0x1fff7a10-0x1fff7fff: Reserved */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h index 91dbf9689..c7f7ff2ec 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h @@ -57,7 +57,7 @@ /* 0x00100000-0x07ffffff: Reserved */ #define STM32_FLASH_BASE 0x08000000 /* 0x08000000-0x080fffff: FLASH memory */ /* 0x08100000-0x0fffffff: Reserved */ -#define STM32_TCMRAM_BASE 0x10000000 /* 0x10000000-0x1000ffff: 64Kb TCM data RAM */ +#define STM32_CCMRAM_BASE 0x10000000 /* 0x10000000-0x1000ffff: 64Kb CCM data RAM */ /* 0x10010000-0x1ffeffff: Reserved */ #define STM32_SYSMEM_BASE 0x1fff0000 /* 0x1fff0000-0x1fff7a0f: System memory */ /* 0x1fff7a10-0x1fff7fff: Reserved */ diff --git a/nuttx/arch/arm/src/stm32/stm32_allocateheap.c b/nuttx/arch/arm/src/stm32/stm32_allocateheap.c index e54042094..ecfcdb09a 100644 --- a/nuttx/arch/arm/src/stm32/stm32_allocateheap.c +++ b/nuttx/arch/arm/src/stm32/stm32_allocateheap.c @@ -61,11 +61,11 @@ * CONFIG_DRAM_END : End address (+1) of SRAM (F1 family only, the * : F4 family uses the a priori end of SRAM) * - * The F4 family also contains internal TCM SRAM. This SRAM is different + * The F4 family also contains internal CCM SRAM. This SRAM is different * because it cannot be used for DMA. So if DMA needed, then the following - * should be defined to exclude TCM SRAM from the heap: + * should be defined to exclude CCM SRAM from the heap: * - * CONFIG_STM32_TCMEXCLUDE : Exclude TCM SRAM from the HEAP + * CONFIG_STM32_CCMEXCLUDE : Exclude CCM SRAM from the HEAP * * In addition to internal SRAM, SRAM may also be available through the FSMC. * In order to use FSMC SRAM, the following additional things need to be @@ -112,24 +112,24 @@ # error "CONFIG_MM_REGIONS > 1 but I don't know what the other region(s) are" # endif - /* The STM32 F1 has not TCM SRAM */ + /* The STM32 F1 has not CCM SRAM */ -# undef CONFIG_STM32_TCMEXCLUDE -# define CONFIG_STM32_TCMEXCLUDE 1 +# undef CONFIG_STM32_CCMEXCLUDE +# define CONFIG_STM32_CCMEXCLUDE 1 /* All members of the STM32F20xxx and STM32F40xxx families have 192Kb in three banks: * * 1) 112Kb of System SRAM beginning at address 0x2000:0000 * 2) 16Kb of System SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * As determined by ld.script, g_heapbase lies in the 112Kb memory * region and that extends to 0x2001:0000. But the first and second memory * regions are contiguous and treated as one in this logic that extends to * 0x2002:0000. * - * As a complication, it appears that TCM SRAM cannot be used for DMA. So, if - * STM32 DMA is enabled, TCM SRAM should probably be excluded from the heap. + * As a complication, it appears that CCM SRAM cannot be used for DMA. So, if + * STM32 DMA is enabled, CCM SRAM should probably be excluded from the heap. * * In addition, external FSMC SRAM may be available. */ @@ -140,7 +140,7 @@ # define SRAM1_END 0x20020000 - /* Set the range of TCM SRAM as well (although we may not use it) */ + /* Set the range of CCM SRAM as well (although we may not use it) */ # define SRAM2_START 0x10000000 # define SRAM2_END 0x10010000 @@ -150,19 +150,19 @@ * Configuration 1. System SRAM (only) * CONFIG_MM_REGIONS == 1 * CONFIG_STM32_FSMC_SRAM NOT defined - * CONFIG_STM32_TCMEXCLUDE defined - * Configuration 2. System SRAM and TCM SRAM + * CONFIG_STM32_CCMEXCLUDE defined + * Configuration 2. System SRAM and CCM SRAM * CONFIG_MM_REGIONS == 2 * CONFIG_STM32_FSMC_SRAM NOT defined - * CONFIG_STM32_TCMEXCLUDE NOT defined + * CONFIG_STM32_CCMEXCLUDE NOT defined * Configuration 3. System SRAM and FSMC SRAM * CONFIG_MM_REGIONS == 2 * CONFIG_STM32_FSMC_SRAM defined - * CONFIG_STM32_TCMEXCLUDE defined - * Configuration 4. System SRAM, TCM SRAM, and FSMC SRAM + * CONFIG_STM32_CCMEXCLUDE defined + * Configuration 4. System SRAM, CCM SRAM, and FSMC SRAM * CONFIG_MM_REGIONS == 3 * CONFIG_STM32_FSMC_SRAM defined - * CONFIG_STM32_TCMEXCLUDE NOT defined + * CONFIG_STM32_CCMEXCLUDE NOT defined * * Let's make sure that all definitions are consitent before doing * anything else @@ -177,20 +177,20 @@ # if CONFIG_MM_REGIONS < 2 /* Only one memory region. Force Configuration 1 */ -# warning "FSMC SRAM (and TCM SRAM) excluded from the heap" +# warning "FSMC SRAM (and CCM SRAM) excluded from the heap" # undef CONFIG_STM32_FSMC_SRAM -# undef CONFIG_STM32_TCMEXCLUDE -# define CONFIG_STM32_TCMEXCLUDE 1 +# undef CONFIG_STM32_CCMEXCLUDE +# define CONFIG_STM32_CCMEXCLUDE 1 - /* CONFIG_MM_REGIONS may be 3 if TCM SRAM is included in the head */ + /* CONFIG_MM_REGIONS may be 3 if CCM SRAM is included in the head */ # elif CONFIG_MM_REGIONS > 2 - /* More than two memory regions. This is okay if TCM SRAM is not + /* More than two memory regions. This is okay if CCM SRAM is not * disabled. */ -# if defined(CONFIG_STM32_TCMEXCLUDE) +# if defined(CONFIG_STM32_CCMEXCLUDE) /* Configuration 3: CONFIG_MM_REGIONS should have been 2 */ @@ -204,7 +204,7 @@ */ # ifdef (CONFIG_STM32_DMA) -# warning "TCM SRAM is included in the heap AND DMA is enabled" +# warning "CCM SRAM is included in the heap AND DMA is enabled" # endif # if CONFIG_MM_REGIONS != 3 # error "CONFIG_MM_REGIONS > 3 but I don't know what some of the region(s) are" @@ -213,29 +213,29 @@ # endif # endif - /* CONFIG_MM_REGIONS is exactly 2. We cannot support both TCM SRAM and + /* CONFIG_MM_REGIONS is exactly 2. We cannot support both CCM SRAM and * FSMC SRAM. */ -# elif !defined(CONFIG_STM32_TCMEXCLUDE) -# error "CONFIG_MM_REGIONS == 2, cannot support both TCM SRAM and FSMC SRAM" -# undef CONFIG_STM32_TCMEXCLUDE -# define CONFIG_STM32_TCMEXCLUDE 1 +# elif !defined(CONFIG_STM32_CCMEXCLUDE) +# error "CONFIG_MM_REGIONS == 2, cannot support both CCM SRAM and FSMC SRAM" +# undef CONFIG_STM32_CCMEXCLUDE +# define CONFIG_STM32_CCMEXCLUDE 1 # endif -# elif !defined(CONFIG_STM32_TCMEXCLUDE) +# elif !defined(CONFIG_STM32_CCMEXCLUDE) - /* Configuration 2: FSMC SRAM is not used, but TCM SRAM is requested. DMA + /* Configuration 2: FSMC SRAM is not used, but CCM SRAM is requested. DMA * should be disabled and CONFIG_MM_REGIONS should be 2. */ # ifdef CONFIG_STM32_DMA -# warning "TCM SRAM is included in the heap AND DMA is enabled" +# warning "CCM SRAM is included in the heap AND DMA is enabled" # endif # if CONFIG_MM_REGIONS < 2 -# error "TCM SRAM excluded from the heap because CONFIG_MM_REGIONS < 2" -# undef CONFIG_STM32_TCMEXCLUDE -# define CONFIG_STM32_TCMEXCLUDE 1 +# error "CCM SRAM excluded from the heap because CONFIG_MM_REGIONS < 2" +# undef CONFIG_STM32_CCMEXCLUDE +# define CONFIG_STM32_CCMEXCLUDE 1 # elif CONFIG_MM_REGIONS > 2 # error "CONFIG_MM_REGIONS > 2 but I don't know what some of the region(s) are" # undef CONFIG_MM_REGIONS @@ -300,9 +300,9 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) #if CONFIG_MM_REGIONS > 1 void up_addregion(void) { - /* Add the STM32F20xxx/STM32F40xxx TCM SRAM heap region. */ + /* Add the STM32F20xxx/STM32F40xxx CCM SRAM heap region. */ -#ifndef CONFIG_STM32_TCMEXCLUDE +#ifndef CONFIG_STM32_CCMEXCLUDE mm_addregion((FAR void*)SRAM2_START, SRAM2_END-SRAM2_START); #endif diff --git a/nuttx/configs/stm3220g-eval/dhcpd/ld.script b/nuttx/configs/stm3220g-eval/dhcpd/ld.script index 2ddf2f942..feb0726f0 100644 --- a/nuttx/configs/stm3220g-eval/dhcpd/ld.script +++ b/nuttx/configs/stm3220g-eval/dhcpd/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3220g-eval/nettest/ld.script b/nuttx/configs/stm3220g-eval/nettest/ld.script index 6926b9bd0..b86d39533 100644 --- a/nuttx/configs/stm3220g-eval/nettest/ld.script +++ b/nuttx/configs/stm3220g-eval/nettest/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3220g-eval/nsh/ld.script b/nuttx/configs/stm3220g-eval/nsh/ld.script index 235ebb210..005caabf2 100644 --- a/nuttx/configs/stm3220g-eval/nsh/ld.script +++ b/nuttx/configs/stm3220g-eval/nsh/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3220g-eval/nsh2/ld.script b/nuttx/configs/stm3220g-eval/nsh2/ld.script index 734733241..23c3d87c5 100644 --- a/nuttx/configs/stm3220g-eval/nsh2/ld.script +++ b/nuttx/configs/stm3220g-eval/nsh2/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3220g-eval/ostest/ld.script b/nuttx/configs/stm3220g-eval/ostest/ld.script index a4d40cbec..0cb680344 100644 --- a/nuttx/configs/stm3220g-eval/ostest/ld.script +++ b/nuttx/configs/stm3220g-eval/ostest/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3220g-eval/telnetd/ld.script b/nuttx/configs/stm3220g-eval/telnetd/ld.script index 69e8845c3..f7f48769e 100644 --- a/nuttx/configs/stm3220g-eval/telnetd/ld.script +++ b/nuttx/configs/stm3220g-eval/telnetd/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index 33cf7f39e..5b5c62749 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -456,11 +456,11 @@ The on-board SRAM can be configured by setting Configuration Options --------------------- Internal SRAM is available in all members of the STM32 family. The F4 family -also contains internal TCM SRAM. This SRAM is different because it cannot +also contains internal CCM SRAM. This SRAM is different because it cannot be used for DMA. So if DMA needed, then the following should be defined -to exclude TCM SRAM from the heap: +to exclude CCM SRAM from the heap: - CONFIG_STM32_TCMEXCLUDE : Exclude TCM SRAM from the HEAP + CONFIG_STM32_CCMEXCLUDE : Exclude CCM SRAM from the HEAP In addition to internal SRAM, SRAM may also be available through the FSMC. In order to use FSMC SRAM, the following additional things need to be @@ -483,19 +483,19 @@ There are 4 possible SRAM configurations: Configuration 1. System SRAM (only) CONFIG_MM_REGIONS == 1 CONFIG_STM32_FSMC_SRAM NOT defined - CONFIG_STM32_TCMEXCLUDE defined - Configuration 2. System SRAM and TCM SRAM + CONFIG_STM32_CCMEXCLUDE defined + Configuration 2. System SRAM and CCM SRAM CONFIG_MM_REGIONS == 2 CONFIG_STM32_FSMC_SRAM NOT defined - CONFIG_STM32_TCMEXCLUDE NOT defined + CONFIG_STM32_CCMEXCLUDE NOT defined Configuration 3. System SRAM and FSMC SRAM CONFIG_MM_REGIONS == 2 CONFIG_STM32_FSMC_SRAM defined - CONFIG_STM32_TCMEXCLUDE defined - Configuration 4. System SRAM, TCM SRAM, and FSMC SRAM + CONFIG_STM32_CCMEXCLUDE defined + Configuration 4. System SRAM, CCM SRAM, and FSMC SRAM CONFIG_MM_REGIONS == 3 CONFIG_STM32_FSMC_SRAM defined - CONFIG_STM32_TCMEXCLUDE NOT defined + CONFIG_STM32_CCMEXCLUDE NOT defined STM3240G-EVAL-specific Configuration Options ============================================ @@ -554,7 +554,7 @@ STM3240G-EVAL-specific Configuration Options CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_STM32_TCMEXCLUDE - Exclude TCM SRAM from the HEAP + CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP In addition to internal SRAM, SRAM may also be available through the FSMC. In order to use FSMC SRAM, the following additional things need to be @@ -948,9 +948,9 @@ Where <subdir> is one of the following: 4. In order to use SDIO without overruns, DMA must be used. The STM32 F4 has 192Kb of SRAM in two banks: 112Kb of "system" SRAM located at - 0x2000:0000 and 64Kb of "TCM" SRAM located at 0x1000:0000. It appears - that you cannot perform DMA from TCM SRAM. The work around that I have now - is simply to omit the 64Kb of TCM SRAM from the heap so that all memory is + 0x2000:0000 and 64Kb of "CCM" SRAM located at 0x1000:0000. It appears + that you cannot perform DMA from CCM SRAM. The work around that I have now + is simply to omit the 64Kb of CCM SRAM from the heap so that all memory is allocated from System SRAM. This is done by setting: CONFIG_MM_REGIONS=1 diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig index 0b6b59ade..7576c605f 100644 --- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig @@ -121,10 +121,10 @@ CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n CONFIG_STM32_JTAG_SW_ENABLE=n # -# On-chip TCM SRAM configuration +# On-chip CCM SRAM configuration # -# CONFIG_STM32_TCMEXCLUDE - Exclude TCM SRAM from the HEAP. You would need -# to do this if DMA is enabled to prevent non-DMA-able TCM memory from +# CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP. You would need +# to do this if DMA is enabled to prevent non-DMA-able CCM memory from # being a part of the stack. # diff --git a/nuttx/configs/stm3240g-eval/dhcpd/ld.script b/nuttx/configs/stm3240g-eval/dhcpd/ld.script index 48653f322..fb461a804 100644 --- a/nuttx/configs/stm3240g-eval/dhcpd/ld.script +++ b/nuttx/configs/stm3240g-eval/dhcpd/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig index 0bda593c3..232f26a5d 100644 --- a/nuttx/configs/stm3240g-eval/nettest/defconfig +++ b/nuttx/configs/stm3240g-eval/nettest/defconfig @@ -121,10 +121,10 @@ CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n CONFIG_STM32_JTAG_SW_ENABLE=n # -# On-chip TCM SRAM configuration +# On-chip CCM SRAM configuration # -# CONFIG_STM32_TCMEXCLUDE - Exclude TCM SRAM from the HEAP. You would need -# to do this if DMA is enabled to prevent non-DMA-able TCM memory from +# CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP. You would need +# to do this if DMA is enabled to prevent non-DMA-able CCM memory from # being a part of the stack. # diff --git a/nuttx/configs/stm3240g-eval/nettest/ld.script b/nuttx/configs/stm3240g-eval/nettest/ld.script index 29bd8634e..fea4d6b95 100644 --- a/nuttx/configs/stm3240g-eval/nettest/ld.script +++ b/nuttx/configs/stm3240g-eval/nettest/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig index 4a6f39426..2d2074f6e 100644 --- a/nuttx/configs/stm3240g-eval/nsh/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh/defconfig @@ -121,10 +121,10 @@ CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n CONFIG_STM32_JTAG_SW_ENABLE=n # -# On-chip TCM SRAM configuration +# On-chip CCM SRAM configuration # -# CONFIG_STM32_TCMEXCLUDE - Exclude TCM SRAM from the HEAP. You would need -# to do this if DMA is enabled to prevent non-DMA-able TCM memory from +# CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP. You would need +# to do this if DMA is enabled to prevent non-DMA-able CCM memory from # being a part of the stack. # diff --git a/nuttx/configs/stm3240g-eval/nsh/ld.script b/nuttx/configs/stm3240g-eval/nsh/ld.script index dc7c5afbd..750030989 100644 --- a/nuttx/configs/stm3240g-eval/nsh/ld.script +++ b/nuttx/configs/stm3240g-eval/nsh/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig index d34eca003..cb856579c 100644 --- a/nuttx/configs/stm3240g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig @@ -121,13 +121,13 @@ CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n CONFIG_STM32_JTAG_SW_ENABLE=n # -# On-chip TCM SRAM configuration +# On-chip CCM SRAM configuration # -# CONFIG_STM32_TCMEXCLUDE - Exclude TCM SRAM from the HEAP. You would need -# to do this if DMA is enabled to prevent non-DMA-able TCM memory from +# CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP. You would need +# to do this if DMA is enabled to prevent non-DMA-able CCM memory from # being a part of the stack. # -CONFIG_STM32_TCMEXCLUDE=y +CONFIG_STM32_CCMEXCLUDE=y # # On-board FSMC SRAM configuration diff --git a/nuttx/configs/stm3240g-eval/nsh2/ld.script b/nuttx/configs/stm3240g-eval/nsh2/ld.script index 329b4a9a0..b3b6b5601 100644 --- a/nuttx/configs/stm3240g-eval/nsh2/ld.script +++ b/nuttx/configs/stm3240g-eval/nsh2/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig index cb5a1bf7b..f7db3edc8 100644 --- a/nuttx/configs/stm3240g-eval/ostest/defconfig +++ b/nuttx/configs/stm3240g-eval/ostest/defconfig @@ -121,10 +121,10 @@ CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n CONFIG_STM32_JTAG_SW_ENABLE=n # -# On-chip TCM SRAM configuration +# On-chip CCM SRAM configuration # -# CONFIG_STM32_TCMEXCLUDE - Exclude TCM SRAM from the HEAP. You would need -# to do this if DMA is enabled to prevent non-DMA-able TCM memory from +# CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP. You would need +# to do this if DMA is enabled to prevent non-DMA-able CCM memory from # being a part of the stack. # diff --git a/nuttx/configs/stm3240g-eval/ostest/ld.script b/nuttx/configs/stm3240g-eval/ostest/ld.script index 3fabe9bbe..97b0240a5 100644 --- a/nuttx/configs/stm3240g-eval/ostest/ld.script +++ b/nuttx/configs/stm3240g-eval/ostest/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm3240g-eval/telnetd/defconfig b/nuttx/configs/stm3240g-eval/telnetd/defconfig index 107c17755..3fb7ac74e 100644 --- a/nuttx/configs/stm3240g-eval/telnetd/defconfig +++ b/nuttx/configs/stm3240g-eval/telnetd/defconfig @@ -121,10 +121,10 @@ CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n CONFIG_STM32_JTAG_SW_ENABLE=n # -# On-chip TCM SRAM configuration +# On-chip CCM SRAM configuration # -# CONFIG_STM32_TCMEXCLUDE - Exclude TCM SRAM from the HEAP. You would need -# to do this if DMA is enabled to prevent non-DMA-able TCM memory from +# CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP. You would need +# to do this if DMA is enabled to prevent non-DMA-able CCM memory from # being a part of the stack. # diff --git a/nuttx/configs/stm3240g-eval/telnetd/ld.script b/nuttx/configs/stm3240g-eval/telnetd/ld.script index 8108d7545..ee14f4bfb 100644 --- a/nuttx/configs/stm3240g-eval/telnetd/ld.script +++ b/nuttx/configs/stm3240g-eval/telnetd/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index e685d2767..d9720fdf2 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -432,11 +432,11 @@ reference in case you choose to add some. Configuration Options --------------------- Internal SRAM is available in all members of the STM32 family. The F4 family -also contains internal TCM SRAM. This SRAM is different because it cannot +also contains internal CCM SRAM. This SRAM is different because it cannot be used for DMA. So if DMA needed, then the following should be defined -to exclude TCM SRAM from the heap: +to exclude CCM SRAM from the heap: - CONFIG_STM32_TCMEXCLUDE : Exclude TCM SRAM from the HEAP + CONFIG_STM32_CCMEXCLUDE : Exclude CCM SRAM from the HEAP In addition to internal SRAM, SRAM may also be available through the FSMC. In order to use FSMC SRAM, the following additional things need to be @@ -459,19 +459,19 @@ There are 4 possible SRAM configurations: Configuration 1. System SRAM (only) CONFIG_MM_REGIONS == 1 CONFIG_STM32_FSMC_SRAM NOT defined - CONFIG_STM32_TCMEXCLUDE defined - Configuration 2. System SRAM and TCM SRAM + CONFIG_STM32_CCMEXCLUDE defined + Configuration 2. System SRAM and CCM SRAM CONFIG_MM_REGIONS == 2 CONFIG_STM32_FSMC_SRAM NOT defined - CONFIG_STM32_TCMEXCLUDE NOT defined + CONFIG_STM32_CCMEXCLUDE NOT defined Configuration 3. System SRAM and FSMC SRAM CONFIG_MM_REGIONS == 2 CONFIG_STM32_FSMC_SRAM defined - CONFIG_STM32_TCMEXCLUDE defined - Configuration 4. System SRAM, TCM SRAM, and FSMC SRAM + CONFIG_STM32_CCMEXCLUDE defined + Configuration 4. System SRAM, CCM SRAM, and FSMC SRAM CONFIG_MM_REGIONS == 3 CONFIG_STM32_FSMC_SRAM defined - CONFIG_STM32_TCMEXCLUDE NOT defined + CONFIG_STM32_CCMEXCLUDE NOT defined Configuration Changes --------------------- @@ -557,7 +557,7 @@ STM32F4Discovery-specific Configuration Options CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_STM32_TCMEXCLUDE - Exclude TCM SRAM from the HEAP + CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP In addition to internal SRAM, SRAM may also be available through the FSMC. In order to use FSMC SRAM, the following additional things need to be diff --git a/nuttx/configs/stm32f4discovery/nsh/ld.script b/nuttx/configs/stm32f4discovery/nsh/ld.script index 264440d14..899cba9a8 100755 --- a/nuttx/configs/stm32f4discovery/nsh/ld.script +++ b/nuttx/configs/stm32f4discovery/nsh/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm32f4discovery/ostest/ld.script b/nuttx/configs/stm32f4discovery/ostest/ld.script index 274f020ae..c3a5ed818 100755 --- a/nuttx/configs/stm32f4discovery/ostest/ld.script +++ b/nuttx/configs/stm32f4discovery/ostest/ld.script @@ -38,7 +38,7 @@ * * 1) 112Kb of SRAM beginning at address 0x2000:0000 * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of TCM SRAM beginning at address 0x1000:0000 + * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in |