diff --git a/configs/stm3220g-eval/dhcpd/ld.script b/configs/stm3220g-eval/dhcpd/ld.script index 2ddf2f9428a..feb0726f082 100644 --- a/configs/stm3220g-eval/dhcpd/ld.script +++ b/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/configs/stm3220g-eval/nettest/ld.script b/configs/stm3220g-eval/nettest/ld.script index 6926b9bd022..b86d395332e 100644 --- a/configs/stm3220g-eval/nettest/ld.script +++ b/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/configs/stm3220g-eval/nsh/ld.script b/configs/stm3220g-eval/nsh/ld.script index 235ebb21032..005caabf262 100644 --- a/configs/stm3220g-eval/nsh/ld.script +++ b/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/configs/stm3220g-eval/nsh2/ld.script b/configs/stm3220g-eval/nsh2/ld.script index 734733241fc..23c3d87c5aa 100644 --- a/configs/stm3220g-eval/nsh2/ld.script +++ b/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/configs/stm3220g-eval/ostest/ld.script b/configs/stm3220g-eval/ostest/ld.script index a4d40cbec90..0cb6803444b 100644 --- a/configs/stm3220g-eval/ostest/ld.script +++ b/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/configs/stm3220g-eval/telnetd/ld.script b/configs/stm3220g-eval/telnetd/ld.script index 69e8845c351..f7f48769ee0 100644 --- a/configs/stm3220g-eval/telnetd/ld.script +++ b/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/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index 33cf7f39ea6..5b5c6274968 100755 --- a/configs/stm3240g-eval/README.txt +++ b/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 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/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig index 0b6b59adebb..7576c605f10 100644 --- a/configs/stm3240g-eval/dhcpd/defconfig +++ b/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/configs/stm3240g-eval/dhcpd/ld.script b/configs/stm3240g-eval/dhcpd/ld.script index 48653f32247..fb461a80465 100644 --- a/configs/stm3240g-eval/dhcpd/ld.script +++ b/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/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig index 0bda593c338..232f26a5d5a 100644 --- a/configs/stm3240g-eval/nettest/defconfig +++ b/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/configs/stm3240g-eval/nettest/ld.script b/configs/stm3240g-eval/nettest/ld.script index 29bd8634e5d..fea4d6b95ac 100644 --- a/configs/stm3240g-eval/nettest/ld.script +++ b/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/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig index 4a6f39426b3..2d2074f6e28 100644 --- a/configs/stm3240g-eval/nsh/defconfig +++ b/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/configs/stm3240g-eval/nsh/ld.script b/configs/stm3240g-eval/nsh/ld.script index dc7c5afbd87..750030989f3 100644 --- a/configs/stm3240g-eval/nsh/ld.script +++ b/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/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig index d34eca00351..cb856579cd6 100644 --- a/configs/stm3240g-eval/nsh2/defconfig +++ b/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/configs/stm3240g-eval/nsh2/ld.script b/configs/stm3240g-eval/nsh2/ld.script index 329b4a9a030..b3b6b5601a4 100644 --- a/configs/stm3240g-eval/nsh2/ld.script +++ b/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/configs/stm3240g-eval/ostest/defconfig b/configs/stm3240g-eval/ostest/defconfig index cb5a1bf7b53..f7db3edc814 100644 --- a/configs/stm3240g-eval/ostest/defconfig +++ b/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/configs/stm3240g-eval/ostest/ld.script b/configs/stm3240g-eval/ostest/ld.script index 3fabe9bbe70..97b0240a55c 100644 --- a/configs/stm3240g-eval/ostest/ld.script +++ b/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/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig index 107c1775528..3fb7ac74ec6 100644 --- a/configs/stm3240g-eval/telnetd/defconfig +++ b/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/configs/stm3240g-eval/telnetd/ld.script b/configs/stm3240g-eval/telnetd/ld.script index 8108d7545fe..ee14f4bfb53 100644 --- a/configs/stm3240g-eval/telnetd/ld.script +++ b/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/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt index e685d276722..d9720fdf271 100755 --- a/configs/stm32f4discovery/README.txt +++ b/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/configs/stm32f4discovery/nsh/ld.script b/configs/stm32f4discovery/nsh/ld.script index 264440d1464..899cba9a826 100755 --- a/configs/stm32f4discovery/nsh/ld.script +++ b/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/configs/stm32f4discovery/ostest/ld.script b/configs/stm32f4discovery/ostest/ld.script index 274f020ae28..c3a5ed8186c 100755 --- a/configs/stm32f4discovery/ostest/ld.script +++ b/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