summaryrefslogtreecommitdiff
path: root/nuttx/Documentation/NuttX.html
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-11-03 16:13:12 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-11-03 16:13:12 -0600
commita054b3e4ed58737eeb38f314ff4f1c2611405bd2 (patch)
tree4f4e570ee22169e07f1688aa4acdbe3642f6a56c /nuttx/Documentation/NuttX.html
parent7d1d964e9691b5d98ed61f08cac61c44f5ba80cb (diff)
downloadnuttx-a054b3e4ed58737eeb38f314ff4f1c2611405bd2.tar.gz
nuttx-a054b3e4ed58737eeb38f314ff4f1c2611405bd2.tar.bz2
nuttx-a054b3e4ed58737eeb38f314ff4f1c2611405bd2.zip
EFM32GG: Add a few files for the starter kit
Diffstat (limited to 'nuttx/Documentation/NuttX.html')
-rw-r--r--nuttx/Documentation/NuttX.html9
1 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 39777f9ab..ca4ebcdac 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -1391,7 +1391,7 @@
<li><a href="#m16c">Renesas M16C/26</a></li>
</ul>
</li>
- <li>Silicon Laboratories
+ <li>Silicon Laboratories, Inc.
<ul>
<li><a href="#efm32g">EFM32 Gecko</a> <small>(ARM Cortex-M3)</small></li>
<li><a href="#emf32gg">EFM32 Giant Gecko</a> <small>(ARM Cortex-M3)</small></li>
@@ -2283,7 +2283,7 @@ nsh>
<td>
<p>
<a name="efm32g"><b>SiLabs EFM32 Gecko</b>.</a>
- This is a port for the Silicon Laboraties EFM32 <i>Gecko</i> family.
+ This is a port for the Silicon Laboratories' EFM32 <i>Gecko</i> family.
Board support is available for the following:
</p>
<ol>
@@ -2352,7 +2352,7 @@ nsh>
<td>
<p>
<a name="efm32gg"><b>SiLabs EFM32 Giant Gecko</b>.</a>
- This is a port for the Silicon Laboraties EFM32 <i>Giant Gecko</i> family.
+ This is a port for the Silicon Laboratories' EFM32 <i>Giant Gecko</i> family.
</p>
<ul>
<p>
@@ -4672,11 +4672,12 @@ if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi
</table>
<ul>
- <li>ARM, ARM7 ARM7TDMI, ARM9, ARM920T, ARM926EJS Cortex-M3 are trademarks of Advanced RISC Machines, Limited.</li>
+ <li>ARM, ARM7 ARM7TDMI, ARM9, ARM920T, ARM926EJS, Cortex-M3 are trademarks of Advanced RISC Machines, Limited.</li>
<li>Cygwin is a trademark of Red Hat, Incorporated.</li>
<li>Linux is a registered trademark of Linus Torvalds.</li>
<li>Eagle-100 is a trademark of <a href=" http://www.micromint.com/">Micromint USA, LLC</a>.
<li>EnergyLite is a trademark of STMicroelectronics.</li>
+ <li>EFM32 is a trademark of Silicon Laboratories, Inc.</li>
<li>LPC2148 is a trademark of NXP Semiconductors.</li>
<li>TI is a tradename of Texas Instruments Incorporated.</li>
<li>UNIX is a registered trademark of The Open Group.</li>