sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into bas24

Browse Source
This commit is contained in:
Gregory Nutt 2014-11-03 17:22:38 -06:00
commit 57f7c93bad
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/include/efm32/chip.h
View File

@ -46,7 +46,7 @@
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* EFM32 EnergyMicro ************************************************************/ /* EFM32 EnergyMicro ****************************************************************/
/* Tiny Gecko with 32KiB FLASH and 4KiB RAM in a QFN64 package */ /* Tiny Gecko with 32KiB FLASH and 4KiB RAM in a QFN64 package */
@ -59,9 +59,12 @@
#elif defined(CONFIG_ARCH_CHIP_EFM32G880F128) || \ #elif defined(CONFIG_ARCH_CHIP_EFM32G880F128) || \
defined(CONFIG_ARCH_CHIP_EFM32G890F128) defined(CONFIG_ARCH_CHIP_EFM32G890F128)
/* Giant Gecko with 1024KiB FLASH and 128KiB RAM in a QFP64 package */ /* Giant Gecko with 1024KiB FLASH and 128KiB RAM in a QFP64 package
* (EFM32GG332F1024) or BGA112 (EFM32GG990F1024) package
*/
#elif defined(CONFIG_ARCH_CHIP_EFM32GG332F1024) #elif defined(CONFIG_ARCH_CHIP_EFM32GG332F1024) || \
defined(CONFIG_ARCH_CHIP_EFM32GG990F1024)
#else #else
# error "Unsupported EFM32 chip" # error "Unsupported EFM32 chip"

8
arch/arm/src/efm32/Kconfig
View File

@ -42,6 +42,14 @@ config ARCH_CHIP_EFM32GG332F1024
This chip is a Giant Gecko with 1024KiB flash and 128KiB RAM in a This chip is a Giant Gecko with 1024KiB flash and 128KiB RAM in a
QFP64 package. QFP64 package.
config ARCH_CHIP_EFM32GG990F1024
bool "EFM32GG990F1024"
select EFM32_EFM32GG
select ARCH_CORTEXM3
---help---
This chip is a Giant Gecko with 1024KiB flash and 128KiB RAM in a
BGA112 package.
endchoice endchoice
# These hidden selections represent automatically selected MCU families and, # These hidden selections represent automatically selected MCU families and,