diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-03 17:22:38 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-03 17:22:38 -0600 |
| commit | e3744bf55eca655566a8f9304e25a3591acd13a5 (patch) | |
| tree | 859f74925711262342cedff19fd8f118da0aa55d /nuttx/arch | |
| parent | 8c68010a7bf2d234e985d90cd0f68b63983763e5 (diff) | |
| parent | 66439e77dcf8da9a8482f643632f1be8ed02d94b (diff) | |
| download | nuttx-e3744bf55eca655566a8f9304e25a3591acd13a5.tar.gz nuttx-e3744bf55eca655566a8f9304e25a3591acd13a5.tar.bz2 nuttx-e3744bf55eca655566a8f9304e25a3591acd13a5.zip | |
Merge remote-tracking branch 'origin/master' into bas24
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/include/efm32/chip.h | 9 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/efm32/Kconfig | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/nuttx/arch/arm/include/efm32/chip.h b/nuttx/arch/arm/include/efm32/chip.h index 9b3fb6cee..f063daf7c 100644 --- a/nuttx/arch/arm/include/efm32/chip.h +++ b/nuttx/arch/arm/include/efm32/chip.h @@ -46,7 +46,7 @@ * Pre-processor Definitions ************************************************************************************/ -/* EFM32 EnergyMicro ************************************************************/ +/* EFM32 EnergyMicro ****************************************************************/ /* Tiny Gecko with 32KiB FLASH and 4KiB RAM in a QFN64 package */ @@ -59,9 +59,12 @@ #elif defined(CONFIG_ARCH_CHIP_EFM32G880F128) || \ 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 # error "Unsupported EFM32 chip" diff --git a/nuttx/arch/arm/src/efm32/Kconfig b/nuttx/arch/arm/src/efm32/Kconfig index 3fb0f8040..97a11e798 100644 --- a/nuttx/arch/arm/src/efm32/Kconfig +++ b/nuttx/arch/arm/src/efm32/Kconfig @@ -42,6 +42,14 @@ config ARCH_CHIP_EFM32GG332F1024 This chip is a Giant Gecko with 1024KiB flash and 128KiB RAM in a 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 # These hidden selections represent automatically selected MCU families and, |