From 370b90721b5a7c85c54c2fa174ca1462fffae63a Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 5 Sep 2012 23:02:43 +0000 Subject: [PATCH] STM32 Kconfig looks good. STM32 external ram configuration changed. git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5100 42af7a65-404d-4744-a932-0658087f49c3 --- configs/compal_e99/nsh_compalram/defconfig | 4 ++-- configs/compal_e99/nsh_highram/defconfig | 4 ++-- configs/hymini-stm32v/buttons/defconfig | 8 -------- configs/hymini-stm32v/nsh/defconfig | 8 -------- configs/hymini-stm32v/nsh2/defconfig | 8 -------- configs/hymini-stm32v/nx/defconfig | 8 -------- configs/hymini-stm32v/nxlines/defconfig | 8 -------- configs/hymini-stm32v/usbserial/defconfig | 8 -------- configs/hymini-stm32v/usbstorage/defconfig | 8 -------- configs/kwikstik-k40/ostest/defconfig | 8 -------- configs/olimex-stm32-p107/nsh/defconfig | 8 -------- configs/olimex-stm32-p107/ostest/defconfig | 8 -------- configs/stm3210e-eval/README.txt | 2 +- configs/stm3210e-eval/RIDE/defconfig | 8 -------- configs/stm3210e-eval/buttons/defconfig | 8 -------- configs/stm3210e-eval/composite/defconfig | 8 -------- configs/stm3210e-eval/nsh/defconfig | 8 -------- configs/stm3210e-eval/nsh2/defconfig | 8 -------- configs/stm3210e-eval/nx/defconfig | 8 -------- configs/stm3210e-eval/nxconsole/defconfig | 8 -------- configs/stm3210e-eval/nxlines/defconfig | 8 -------- configs/stm3210e-eval/nxtext/defconfig | 8 -------- configs/stm3210e-eval/ostest/defconfig | 8 -------- configs/stm3210e-eval/pm/defconfig | 8 -------- configs/stm3210e-eval/usbserial/defconfig | 8 -------- configs/stm3210e-eval/usbstorage/defconfig | 8 -------- configs/stm3220g-eval/README.txt | 8 ++++---- configs/stm3220g-eval/dhcpd/defconfig | 10 +--------- configs/stm3220g-eval/nettest/defconfig | 10 +--------- configs/stm3220g-eval/nsh/defconfig | 10 +--------- configs/stm3220g-eval/nsh2/defconfig | 10 +--------- configs/stm3220g-eval/nxwm/defconfig | 10 +--------- configs/stm3220g-eval/ostest/defconfig | 10 +--------- configs/stm3220g-eval/telnetd/defconfig | 10 +--------- configs/stm3240g-eval/README.txt | 8 ++++---- configs/stm3240g-eval/dhcpd/defconfig | 10 +--------- configs/stm3240g-eval/nettest/defconfig | 10 +--------- configs/stm3240g-eval/nsh/defconfig | 10 +--------- configs/stm3240g-eval/nsh2/defconfig | 10 +--------- configs/stm3240g-eval/nxconsole/defconfig | 10 +--------- configs/stm3240g-eval/nxwm/defconfig | 10 +--------- configs/stm3240g-eval/ostest/defconfig | 10 +--------- configs/stm3240g-eval/telnetd/defconfig | 10 +--------- configs/stm3240g-eval/webserver/defconfig | 10 +--------- configs/stm32f4discovery/README.txt | 14 +++++++------- configs/stm32f4discovery/ostest/defconfig | 8 -------- configs/twr-k60n512/nsh/defconfig | 8 -------- configs/twr-k60n512/ostest/defconfig | 8 -------- configs/vsn/nsh/defconfig | 10 +--------- 49 files changed, 37 insertions(+), 381 deletions(-) diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig index a52e2aaf06..a60fbf9479 100644 --- a/configs/compal_e99/nsh_compalram/defconfig +++ b/configs/compal_e99/nsh_compalram/defconfig @@ -45,8 +45,8 @@ CONFIG_ARCH_BOARD_COMPALE99=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n CONFIG_MM_REGIONS=2 -CONFIG_HEAP2_START=0x01000000 -CONFIG_HEAP2_END=0x01200000 +CONFIG_HEAP2_BASE=0x01000000 +CONFIG_HEAP2_SIZE=2097152 CONFIG_ARCH_LEDS=n CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig index e5f997ebf7..4ed6e486bc 100644 --- a/configs/compal_e99/nsh_highram/defconfig +++ b/configs/compal_e99/nsh_highram/defconfig @@ -45,8 +45,8 @@ CONFIG_ARCH_BOARD_COMPALE99=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n CONFIG_MM_REGIONS=2 -CONFIG_HEAP2_START=0x01000000 -CONFIG_HEAP2_END=0x01200000 +CONFIG_HEAP2_BASE=0x01000000 +CONFIG_HEAP2_SIZE=2097152 CONFIG_ARCH_LEDS=n CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig index 5038643192..a5792af4fd 100644 --- a/configs/hymini-stm32v/buttons/defconfig +++ b/configs/hymini-stm32v/buttons/defconfig @@ -155,14 +155,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=y -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig index 17aaf9f6cb..89d40eb584 100755 --- a/configs/hymini-stm32v/nsh/defconfig +++ b/configs/hymini-stm32v/nsh/defconfig @@ -153,14 +153,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103V specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index 54574b26c5..8b835ee273 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/configs/hymini-stm32v/nsh2/defconfig @@ -158,14 +158,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/hymini-stm32v/nx/defconfig b/configs/hymini-stm32v/nx/defconfig index 2d3d03832c..7eeff113e4 100644 --- a/configs/hymini-stm32v/nx/defconfig +++ b/configs/hymini-stm32v/nx/defconfig @@ -153,14 +153,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103V specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/hymini-stm32v/nxlines/defconfig b/configs/hymini-stm32v/nxlines/defconfig index 1dc04c0134..f2ca2651fd 100644 --- a/configs/hymini-stm32v/nxlines/defconfig +++ b/configs/hymini-stm32v/nxlines/defconfig @@ -157,14 +157,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103V specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig index 8f0e1f3d46..2f4b27f96b 100755 --- a/configs/hymini-stm32v/usbserial/defconfig +++ b/configs/hymini-stm32v/usbserial/defconfig @@ -155,14 +155,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103V specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/hymini-stm32v/usbstorage/defconfig b/configs/hymini-stm32v/usbstorage/defconfig index 85627dfda5..33c8b4db33 100755 --- a/configs/hymini-stm32v/usbstorage/defconfig +++ b/configs/hymini-stm32v/usbstorage/defconfig @@ -154,14 +154,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103V specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig index 3f26570ce8..400ff88762 100755 --- a/configs/kwikstik-k40/ostest/defconfig +++ b/configs/kwikstik-k40/ostest/defconfig @@ -165,14 +165,6 @@ CONFIG_UART3_PARITY=0 CONFIG_UART4_PARITY=0 CONFIG_UART5_PARITY=0 -# -# K40X256VLQ100 specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig index 781dcd64ca..18858d5df2 100644 --- a/configs/olimex-stm32-p107/nsh/defconfig +++ b/configs/olimex-stm32-p107/nsh/defconfig @@ -183,14 +183,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/olimex-stm32-p107/ostest/defconfig b/configs/olimex-stm32-p107/ostest/defconfig index ad07b7aa1c..5532a921f7 100644 --- a/configs/olimex-stm32-p107/ostest/defconfig +++ b/configs/olimex-stm32-p107/ostest/defconfig @@ -185,14 +185,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=y -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt index 0d292565eb..8582e95ff8 100755 --- a/configs/stm3210e-eval/README.txt +++ b/configs/stm3210e-eval/README.txt @@ -362,7 +362,7 @@ The on-board SRAM can be configured by setting CONFIG_STM32_FSMC=y : Enables the FSMC CONFIG_STM32_FSMC_SRAM=y : Enable external SRAM support CONFIG_HEAP2_BASE=0x68000000 : SRAM will be located at 0x680000000 - CONFIG_HEAP2_END=(0x68000000+(1*1024*1024)) : The size of the SRAM is 1Mbyte + CONFIG_HEAP2_SIZE=1048576 : The size of the SRAM is 1Mbyte CONFIG_MM_REGIONS=2 : There will be two memory regions : in the heap diff --git a/configs/stm3210e-eval/RIDE/defconfig b/configs/stm3210e-eval/RIDE/defconfig index 4d87e2d2c8..942f3e4ba3 100755 --- a/configs/stm3210e-eval/RIDE/defconfig +++ b/configs/stm3210e-eval/RIDE/defconfig @@ -151,14 +151,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig index 08703af7d3..102b091407 100644 --- a/configs/stm3210e-eval/buttons/defconfig +++ b/configs/stm3210e-eval/buttons/defconfig @@ -162,14 +162,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=y -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig index 16415e793f..e79cdb8c02 100755 --- a/configs/stm3210e-eval/composite/defconfig +++ b/configs/stm3210e-eval/composite/defconfig @@ -160,14 +160,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig index 3aedb6bd55..d5fd9a30c9 100755 --- a/configs/stm3210e-eval/nsh/defconfig +++ b/configs/stm3210e-eval/nsh/defconfig @@ -160,14 +160,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index a9d2790512..20e276a6ab 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -181,14 +181,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index 359e70969e..7a7eaf1d9d 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -160,14 +160,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig index 4d30ed8eaa..6084a228a5 100644 --- a/configs/stm3210e-eval/nxconsole/defconfig +++ b/configs/stm3210e-eval/nxconsole/defconfig @@ -160,14 +160,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/nxlines/defconfig b/configs/stm3210e-eval/nxlines/defconfig index 476f85e5fb..554b15f6f6 100644 --- a/configs/stm3210e-eval/nxlines/defconfig +++ b/configs/stm3210e-eval/nxlines/defconfig @@ -160,14 +160,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig index cef3a62467..4e95c11082 100644 --- a/configs/stm3210e-eval/nxtext/defconfig +++ b/configs/stm3210e-eval/nxtext/defconfig @@ -160,14 +160,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/ostest/defconfig b/configs/stm3210e-eval/ostest/defconfig index 18239c9958..cb93364334 100755 --- a/configs/stm3210e-eval/ostest/defconfig +++ b/configs/stm3210e-eval/ostest/defconfig @@ -161,14 +161,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig index 48b9e83b3b..370399882c 100644 --- a/configs/stm3210e-eval/pm/defconfig +++ b/configs/stm3210e-eval/pm/defconfig @@ -191,14 +191,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig index da13a876dd..829e551969 100755 --- a/configs/stm3210e-eval/usbserial/defconfig +++ b/configs/stm3210e-eval/usbserial/defconfig @@ -161,14 +161,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3210e-eval/usbstorage/defconfig b/configs/stm3210e-eval/usbstorage/defconfig index 05b5a288fa..72ef6cc672 100755 --- a/configs/stm3210e-eval/usbstorage/defconfig +++ b/configs/stm3210e-eval/usbstorage/defconfig @@ -160,14 +160,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM3210E-EVAL specific LCD settings # diff --git a/configs/stm3220g-eval/README.txt b/configs/stm3220g-eval/README.txt index bbd42cbc94..04585f69f4 100644 --- a/configs/stm3220g-eval/README.txt +++ b/configs/stm3220g-eval/README.txt @@ -352,7 +352,7 @@ The on-board SRAM can be configured by setting CONFIG_STM32_FSMC=y CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 - CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) + CONFIG_HEAP2_SIZE=2097152 CONFIG_MM_REGIONS=2 Configuration Options @@ -368,7 +368,7 @@ NuttX configuration file: FSMC (as opposed to an LCD or FLASH). CONFIG_HEAP2_BASE : The base address of the SRAM in the FSMC address space - CONFIG_HEAP2_END : The end (+1) of the SRAM in the FSMC + CONFIG_HEAP2_SIZE : The size of the SRAM in the FSMC address space CONFIG_MM_REGIONS : Must be set to a large enough value to include the FSMC SRAM @@ -475,9 +475,9 @@ STM3220G-EVAL-specific Configuration Options CONFIG_STM32_FSMC_SRAM - Indicates that SRAM is available via the FSMC (as opposed to an LCD or FLASH). - CONFIG_HEAP2_BASE - The base address of the SRAM in the FSMC address space + CONFIG_HEAP2_BASE - The base address of the SRAM in the FSMC address space (hex) - CONFIG_HEAP2_END - The end (+1) of the SRAM in the FSMC address space + CONFIG_HEAP2_SIZE - The size of the SRAM in the FSMC address space (decimal) CONFIG_ARCH_IRQPRIO - The STM3220xxx supports interrupt prioritization diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig index d8cac6aabf..848121e04c 100644 --- a/configs/stm3220g-eval/dhcpd/defconfig +++ b/configs/stm3220g-eval/dhcpd/defconfig @@ -78,7 +78,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -183,14 +183,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F20xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F20xxx specific CAN device driver settings # diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig index ebd176269c..7e660ad027 100644 --- a/configs/stm3220g-eval/nettest/defconfig +++ b/configs/stm3220g-eval/nettest/defconfig @@ -78,7 +78,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -183,14 +183,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F20xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F20xxx specific CAN device driver settings # diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig index 937ce76861..48912bd8b9 100644 --- a/configs/stm3220g-eval/nsh/defconfig +++ b/configs/stm3220g-eval/nsh/defconfig @@ -78,7 +78,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -183,14 +183,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F20xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F20xxx specific CAN device driver settings # diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig index 7e4d8127c7..c2ede9c67f 100644 --- a/configs/stm3220g-eval/nsh2/defconfig +++ b/configs/stm3220g-eval/nsh2/defconfig @@ -78,7 +78,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -183,14 +183,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F20xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F20xxx specific CAN device driver settings # diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index cbbdca2e32..6e69333255 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -78,7 +78,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=n CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -183,14 +183,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F20xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F20xxx specific CAN device driver settings # diff --git a/configs/stm3220g-eval/ostest/defconfig b/configs/stm3220g-eval/ostest/defconfig index 1ae110716d..d0ace11bce 100644 --- a/configs/stm3220g-eval/ostest/defconfig +++ b/configs/stm3220g-eval/ostest/defconfig @@ -78,7 +78,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -183,14 +183,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F20xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F20xxx specific CAN device driver settings # diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig index f39e104bd5..2ff215afcf 100644 --- a/configs/stm3220g-eval/telnetd/defconfig +++ b/configs/stm3220g-eval/telnetd/defconfig @@ -78,7 +78,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -183,14 +183,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F20xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F20xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index 15e8b9f3d1..151811189a 100755 --- a/configs/stm3240g-eval/README.txt +++ b/configs/stm3240g-eval/README.txt @@ -451,7 +451,7 @@ The on-board SRAM can be configured by setting CONFIG_STM32_FSMC=y CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 - CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) + CONFIG_HEAP2_SIZE=2097152 CONFIG_MM_REGIONS=2 (or =3, see below) Configuration Options @@ -472,7 +472,7 @@ present in the NuttX configuration file: FSMC (as opposed to an LCD or FLASH). CONFIG_HEAP2_BASE : The base address of the SRAM in the FSMC address space - CONFIG_HEAP2_END : The end (+1) of the SRAM in the FSMC + CONFIG_HEAP2_SIZE : The size of the SRAM in the FSMC address space CONFIG_MM_REGIONS : Must be set to a large enough value to include the FSMC SRAM @@ -591,9 +591,9 @@ STM3240G-EVAL-specific Configuration Options CONFIG_STM32_FSMC_SRAM - Indicates that SRAM is available via the FSMC (as opposed to an LCD or FLASH). - CONFIG_HEAP2_BASE - The base address of the SRAM in the FSMC address space + CONFIG_HEAP2_BASE - The base address of the SRAM in the FSMC address space (hex) - CONFIG_HEAP2_END - The end (+1) of the SRAM in the FSMC address space + CONFIG_HEAP2_END - The size of the SRAM in the FSMC address space (decimal) CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig index a8372456f0..382ce61553 100644 --- a/configs/stm3240g-eval/dhcpd/defconfig +++ b/configs/stm3240g-eval/dhcpd/defconfig @@ -83,7 +83,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -189,14 +189,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig index 500a8ab15b..9eb8f3d5ce 100644 --- a/configs/stm3240g-eval/nettest/defconfig +++ b/configs/stm3240g-eval/nettest/defconfig @@ -83,7 +83,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -189,14 +189,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig index 4a0246ef43..8b2617ec05 100644 --- a/configs/stm3240g-eval/nsh/defconfig +++ b/configs/stm3240g-eval/nsh/defconfig @@ -83,7 +83,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -189,14 +189,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig index e9e0c272f6..00d9dac0a2 100644 --- a/configs/stm3240g-eval/nsh2/defconfig +++ b/configs/stm3240g-eval/nsh2/defconfig @@ -84,7 +84,7 @@ CONFIG_STM32_CCMEXCLUDE=y # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -190,14 +190,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig index 8413a1b594..172d17b6ff 100644 --- a/configs/stm3240g-eval/nxconsole/defconfig +++ b/configs/stm3240g-eval/nxconsole/defconfig @@ -83,7 +83,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -189,14 +189,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index de8ebffaec..07bc408dcc 100644 --- a/configs/stm3240g-eval/nxwm/defconfig +++ b/configs/stm3240g-eval/nxwm/defconfig @@ -83,7 +83,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=n CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -189,14 +189,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/ostest/defconfig b/configs/stm3240g-eval/ostest/defconfig index 58b86beea0..1f23047306 100644 --- a/configs/stm3240g-eval/ostest/defconfig +++ b/configs/stm3240g-eval/ostest/defconfig @@ -83,7 +83,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -189,14 +189,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig index 39cde6b0fb..44a0f27baa 100644 --- a/configs/stm3240g-eval/telnetd/defconfig +++ b/configs/stm3240g-eval/telnetd/defconfig @@ -83,7 +83,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -189,14 +189,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig index 5c6e573d54..7bd8e52ceb 100644 --- a/configs/stm3240g-eval/webserver/defconfig +++ b/configs/stm3240g-eval/webserver/defconfig @@ -83,7 +83,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=0x64200000 +CONFIG_HEAP2_SIZE=2097152 # # Individual subsystems can be enabled: @@ -189,14 +189,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt index 93b8fee038..12b30c62c4 100755 --- a/configs/stm32f4discovery/README.txt +++ b/configs/stm32f4discovery/README.txt @@ -445,13 +445,13 @@ present in the NuttX configuration file: CONFIG_STM32_FSMC=y : Enables the FSMC CONFIG_STM32_FSMC_SRAM=y : Indicates that SRAM is available via the - FSMC (as opposed to an LCD or FLASH). + FSMC (as opposed to an LCD or FLASH). CONFIG_HEAP2_BASE : The base address of the SRAM in the FSMC - address space - CONFIG_HEAP2_END : The end (+1) of the SRAM in the FSMC - address space + address space + CONFIG_HEAP2_SIZE : The size of the SRAM in the FSMC + address space CONFIG_MM_REGIONS : Must be set to a large enough value to - include the FSMC SRAM + include the FSMC SRAM SRAM Configurations ------------------- @@ -704,9 +704,9 @@ STM32F4Discovery-specific Configuration Options CONFIG_STM32_FSMC_SRAM - Indicates that SRAM is available via the FSMC (as opposed to an LCD or FLASH). - CONFIG_HEAP2_BASE - The base address of the SRAM in the FSMC address space + CONFIG_HEAP2_BASE - The base address of the SRAM in the FSMC address space (hex) - CONFIG_HEAP2_END - The end (+1) of the SRAM in the FSMC address space + CONFIG_HEAP2_SIZE - The size of the SRAM in the FSMC address space (decimal) CONFIG_ARCH_IRQPRIO - The STM32F4Discovery supports interrupt prioritization diff --git a/configs/stm32f4discovery/ostest/defconfig b/configs/stm32f4discovery/ostest/defconfig index c7cee2331f..5c120c6144 100644 --- a/configs/stm32f4discovery/ostest/defconfig +++ b/configs/stm32f4discovery/ostest/defconfig @@ -178,14 +178,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F40xxx specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # STM32F40xxx specific CAN device driver settings # diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig index b9670c3984..ca1dbe3350 100644 --- a/configs/twr-k60n512/nsh/defconfig +++ b/configs/twr-k60n512/nsh/defconfig @@ -164,14 +164,6 @@ CONFIG_UART3_PARITY=0 CONFIG_UART4_PARITY=0 CONFIG_UART5_PARITY=0 -# -# K40X256VLQ100 specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/twr-k60n512/ostest/defconfig b/configs/twr-k60n512/ostest/defconfig index 5d5b1245c5..1bb41c3108 100644 --- a/configs/twr-k60n512/ostest/defconfig +++ b/configs/twr-k60n512/ostest/defconfig @@ -164,14 +164,6 @@ CONFIG_UART3_PARITY=0 CONFIG_UART4_PARITY=0 CONFIG_UART5_PARITY=0 -# -# K40X256VLQ100 specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=n -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # General build options # diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig index 348a678448..0ee46dec07 100755 --- a/configs/vsn/nsh/defconfig +++ b/configs/vsn/nsh/defconfig @@ -3,7 +3,7 @@ # # Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved. # Copyright (c) 2011 Uros Platise. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # Uros Platise # # Redistribution and use in source and binary forms, with or without @@ -181,14 +181,6 @@ CONFIG_USART3_2STOP=0 CONFIG_UART4_2STOP=0 CONFIG_UART5_2STOP=0 -# -# STM32F103Z specific SSI device driver settings -# -CONFIG_SSI0_DISABLE=y -CONFIG_SSI1_DISABLE=y -CONFIG_SSI_POLLWAIT=y -#CONFIG_SSI_TXLIMIT=4 - # # OS support for I2C #