summaryrefslogtreecommitdiff
path: root/nuttx/configs/stm3240g-eval
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-07 20:54:45 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-07 20:54:45 +0000
commitbcb1a538de42c6ac901be52239a9e907734a9e0f (patch)
tree440b149e9a017d48b397c19243363c57cc7ada7b /nuttx/configs/stm3240g-eval
parent45ad2f7a8b237cf58518b874326078659ff90011 (diff)
downloadpx4-nuttx-bcb1a538de42c6ac901be52239a9e907734a9e0f.tar.gz
px4-nuttx-bcb1a538de42c6ac901be52239a9e907734a9e0f.tar.bz2
px4-nuttx-bcb1a538de42c6ac901be52239a9e907734a9e0f.zip
Fix much replicated typo. STM32 F4 SRAM is CCM, not TCM
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4571 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3240g-eval')
-rwxr-xr-xnuttx/configs/stm3240g-eval/README.txt26
-rw-r--r--nuttx/configs/stm3240g-eval/dhcpd/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/dhcpd/ld.script2
-rw-r--r--nuttx/configs/stm3240g-eval/nettest/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/nettest/ld.script2
-rw-r--r--nuttx/configs/stm3240g-eval/nsh/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/nsh/ld.script2
-rw-r--r--nuttx/configs/stm3240g-eval/nsh2/defconfig8
-rw-r--r--nuttx/configs/stm3240g-eval/nsh2/ld.script2
-rw-r--r--nuttx/configs/stm3240g-eval/ostest/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/ostest/ld.script2
-rw-r--r--nuttx/configs/stm3240g-eval/telnetd/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/telnetd/ld.script2
13 files changed, 38 insertions, 38 deletions
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