mirror of
https://github.com/apache/nuttx.git
synced 2026-05-22 22:20:01 +08:00
Add LM3S6965 NSH configuration + Prep for 5.5 release
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2659 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
@@ -1097,7 +1097,7 @@
|
||||
board.
|
||||
* configs/sam3u-ek/nx - NX graphics configuration for the SAM3U-EK
|
||||
|
||||
5.5 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
5.5 2010-05-09 Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
* drivers/net/enc28j60.c - Microchip ENC28J60 SPI ethernet chip driver.
|
||||
(untested on original check-in).
|
||||
@@ -1113,10 +1113,15 @@
|
||||
* arch/arm/src/lm3s and arch/arm/include/lm3s - Add definitions for
|
||||
LM3S6965
|
||||
* configs/lm3s6965-ek - Add configuration for Stellaris LM3S6965
|
||||
Evaluation Kit.
|
||||
Evaluation Kit (including basic examples/ostest configuration)
|
||||
* lib/lib_dtoa.c and lib/lib_dtoa.c - printf will not printf floating
|
||||
point values if you select CONFIG_LIBC_FLOATINGPOINT in your
|
||||
configuration file. Contributed by Yolande Cates. NOTE: these
|
||||
floating point operations have not been well tested and may not
|
||||
be portable to all floating point implementations.
|
||||
* configs/lm3s6965-ek/nsh - Added NuttShell (NSH) configuration for
|
||||
the LM3S6965 Evaluation Kit. Includes both serial and telnet
|
||||
interfaces.
|
||||
* net/net_close.c - Correct a UDP reference counting error
|
||||
|
||||
5.6 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
+73
-52
@@ -8,7 +8,7 @@
|
||||
<tr align="center" bgcolor="#e4e4e4">
|
||||
<td>
|
||||
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
|
||||
<p>Last Updated: May 7, 2010</p>
|
||||
<p>Last Updated: May 9, 2010</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -729,39 +729,51 @@
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<p><b>nuttx-5.4 Release Notes</b>:
|
||||
<p><b>nuttx-5.5 Release Notes</b>:
|
||||
|
||||
<p>
|
||||
This 51<sup>st</sup> release of NuttX was made on April 23, 2010 and is available for download from the
|
||||
This 52<sup>nd</sup> release of NuttX was made on May 9, 2010 and is available for download from the
|
||||
<a href="http://sourceforge.net/project/showfiles.php?group_id=189573">SourceForge</a> website.
|
||||
The change log associated with the release is available <a href="#currentrelease">here</a>.
|
||||
Unreleased changes after this release are available in CVS.
|
||||
These unreleased changes are listed <a href="#pendingchanges">here</a>.
|
||||
</p>
|
||||
<p>
|
||||
This release includes one new, important extension to the
|
||||
<a href="http://www.nuttx.org/NXGraphicsSubsystem.html">NX graphics system</a>:
|
||||
This relese includes one new port, some new drivers and some important bugfixes:
|
||||
<ul>
|
||||
<p>
|
||||
NX was develop a couple years back on hardware that supported only framebuffer
|
||||
devices, that is, video hardware with video memory directly converts the memroy
|
||||
content to video. However, most MCUs that NuttX focuses on do not support such
|
||||
video memory; rather, that typically only support LCDs via parallel or serial
|
||||
interfaces.
|
||||
<li><p>
|
||||
NuttX was ported to the Luminary/TI LM3S6965 Ethernet Evaluation Kit.
|
||||
At present, that port includes an OS test configuration and a NuttShell
|
||||
(NSH) configuration with telnet support.
|
||||
</p>
|
||||
<p>
|
||||
This release of NuttX extends NX so that now renders directly to the LCD device
|
||||
via its serial or parallel interface. No in-memory copy of the screen memory
|
||||
need be maintained so this solution should also work in MCUs with very limited
|
||||
SRAM.
|
||||
</p>
|
||||
MMC/SD and Networking support are provided but not thoroughly verified
|
||||
in this release: Current development efforts are focused on porting the
|
||||
NuttX window system (NX) to work with the Evaluation Kits OLED display.
|
||||
</p></li>
|
||||
<li><p>
|
||||
A NuttX Ethernet driver for the Microchip ENC28J60 SPI Ethernet chip is
|
||||
available in the source tree (but has not yet been fully verified because
|
||||
I haven't properly connected it to hardware yet).
|
||||
</p></li>
|
||||
<li><p>
|
||||
The Olimex STR-P711 NuttX port was extended to support the ENC28J60 and
|
||||
some new networking configurations were added. The ENC28J60 has not
|
||||
been tested on the STR-P711, however, because of hardware issues (I don't
|
||||
think the USB powered board provides enough power for the ENC28J60 and
|
||||
I don't have the right wall wart yet).
|
||||
</p></li>
|
||||
<li><p>
|
||||
Along the way, external interrupt support (XTI) was added to the STMicro
|
||||
STR-P711 port and some important bugs were fixed in the STR-P711 SPI
|
||||
driver.
|
||||
</p></li>
|
||||
<li><p>
|
||||
Corrected an important UDP reference counting error. It was not a serious
|
||||
error, but it trigger an assertion was IS a serious error.
|
||||
</p></li>
|
||||
</ul>
|
||||
</p>
|
||||
<p>
|
||||
This initial release of this feature includes the verified NX extensions plus
|
||||
a driver for the HX8347, 16-bit parallel LCD. This LCD supports 16-bit RGB
|
||||
(5:6:5).
|
||||
</p>
|
||||
|
||||
<table width ="100%">
|
||||
<tr bgcolor="#e4e4e4">
|
||||
@@ -1030,16 +1042,27 @@
|
||||
<td>
|
||||
<p>
|
||||
<b>Luminary/TI LM3S6965</b>.
|
||||
This port uses the Stellaris LM3S6965 Evalution Kit with a GNU arm-elf toolchain*
|
||||
This port uses the Stellaris LM3S6965 Ethernet Evalution Kit with a GNU arm-elf toolchain*
|
||||
under either Linux or Cygwin.
|
||||
</p>
|
||||
<ul>
|
||||
<p>
|
||||
<b>STATUS:</b>
|
||||
This port is available in the source tree, but is still under development.
|
||||
This port was released in NuttX 5.5.
|
||||
Features are the same as with the Eagle-100 LM3S6918 described above.
|
||||
The examples/ostest configuration has been successfully verified and an
|
||||
NSH configuration with telnet support is available.
|
||||
MMC/SD and Networking support was not been thoroughly verified:
|
||||
Current development efforts are focused on porting the NuttX window system (NX)
|
||||
to work with the Evaluation Kits OLED display.
|
||||
</p>
|
||||
<p><small>
|
||||
<b>NOTE</b>: As it is configured now, you MUST have a network connected.
|
||||
Otherwise, the NSH prompt will not come up because the Ethernet
|
||||
driver is waiting for the network to come up.
|
||||
</small></p>
|
||||
<p>
|
||||
<b>Development Environments:</b> See the Eagle-100 above.
|
||||
<b>Development Environments:</b> See the Eagle-100 LM3S6918 above.
|
||||
</p>
|
||||
</ul>
|
||||
</td>
|
||||
@@ -1669,13 +1692,32 @@ Other memory:
|
||||
</table>
|
||||
|
||||
<ul><pre>
|
||||
nuttx-5.4 2010-04-23 Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
nuttx-5.5 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
* include/nuttx/lcd.h - Defines an LCD interface.
|
||||
* graphics/nxglib/fb and lcd - Support LCD and framebuffer rasterizers for NX.
|
||||
* configs/sam3u-ek/src/up_lcd.c - LCD driver for LCD on SAM3U-EK development
|
||||
board.
|
||||
* configs/sam3u-ek/nx - NX graphics configuration for the SAM3U-EK
|
||||
* drivers/net/enc28j60.c - Microchip ENC28J60 SPI ethernet chip driver.
|
||||
(untested on original check-in).
|
||||
* configs/olimex-str7p11/nettest - examples/nettest configuration using
|
||||
the ENC28J60 driver on the Olimex STMicro STR-P711.
|
||||
(unverified on original check-in)
|
||||
* configs/olimex-str7p11/src/up_enc28j60.c - Add ENC28J60 initialization
|
||||
logic.
|
||||
* configs/olimex-str7p11/src/up_spi.c - Fixed some bugs; added support
|
||||
for ENC28J60.
|
||||
* arch/arm/src/str7x/str7x_xti.c - Add basic XTI support (external
|
||||
interrupts).
|
||||
* arch/arm/src/lm3s and arch/arm/include/lm3s - Add definitions for
|
||||
LM3S6965
|
||||
* configs/lm3s6965-ek - Add configuration for Stellaris LM3S6965
|
||||
Evaluation Kit (including basic examples/ostest configuration)
|
||||
* lib/lib_dtoa.c and lib/lib_dtoa.c - printf will not printf floating
|
||||
point values if you select CONFIG_LIBC_FLOATINGPOINT in your
|
||||
configuration file. Contributed by Yolande Cates. NOTE: these
|
||||
floating point operations have not been well tested and may not
|
||||
be portable to all floating point implementations.
|
||||
* configs/lm3s6965-ek/nsh - Added NuttShell (NSH) configuration for
|
||||
the LM3S6965 Evaluation Kit. Includes both serial and telnet
|
||||
interfaces.
|
||||
* net/net_close.c - Correct a UDP reference counting error
|
||||
|
||||
pascal-2.0 2010-12-21 Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
@@ -1705,28 +1747,7 @@ buildroot-1.8 2009-12-21 <spudmonkey@racsa.co.cr>
|
||||
</table>
|
||||
|
||||
<ul><pre>
|
||||
nuttx-5.5 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
* drivers/net/enc28j60.c - Microchip ENC28J60 SPI ethernet chip driver.
|
||||
(untested on original check-in).
|
||||
* configs/olimex-str7p11/nettest - examples/nettest configuration using
|
||||
the ENC28J60 driver on the Olimex STMicro STR-P711.
|
||||
(unverified on original check-in)
|
||||
* configs/olimex-str7p11/src/up_enc28j60.c - Add ENC28J60 initialization
|
||||
logic.
|
||||
* configs/olimex-str7p11/src/up_spi.c - Fixed some bugs; added support
|
||||
for ENC28J60.
|
||||
* arch/arm/src/str7x/str7x_xti.c - Add basic XTI support (external
|
||||
interrupts).
|
||||
* arch/arm/src/lm3s and arch/arm/include/lm3s - Add definitions for
|
||||
LM3S6965
|
||||
* configs/lm3s6965-ek - Add configuration for Stellaris LM3S6965
|
||||
Evaluation Kit.
|
||||
* lib/lib_dtoa.c and lib/lib_dtoa.c - printf will not printf floating
|
||||
point values if you select CONFIG_LIBC_FLOATINGPOINT in your
|
||||
configuration file. Contributed by Yolande Cates. NOTE: these
|
||||
floating point operations have not been well tested and may not
|
||||
be portable to all floating point implementations.
|
||||
nuttx-5.6 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
pascal-2.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<tr align="center" bgcolor="#e4e4e4">
|
||||
<td>
|
||||
<h1><big><font color="#3c34ec"><i>NuttX README Files</i></font></big></h1>
|
||||
<p>Last Updated: Aprill 11, 2009</p>
|
||||
<p>Last Updated: May 8, 2010</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -66,6 +66,10 @@
|
||||
| | |- <a href="configs/ez80f910200zco/ostest/README.txt">ostest/README.txt</a>
|
||||
| | |- <a href="configs/ez80f910200zco/poll/README.txt">poll/README.txt</a>
|
||||
| | `- <a href="configs/ez80f910200zco/README.txt"><b><i>README.txt</i></b></a>
|
||||
| |- lm3s6965-ek/
|
||||
| | |- <a href="configs/lm3s6965-ek/include/README.txt">include/README.txt</a>
|
||||
| | |- <a href="configs/lm3s6965-ek/src/README.txt">src/README.txt</a>
|
||||
| | `- <a href="configs/lm3s6965-ek/README.txt"><b><i>README.txt</i></b></a>
|
||||
| |- m68332evb/
|
||||
| | |- <a href="configs/m68332evb/include/README.txt">include/README.txt</a>
|
||||
| | `- <a href="configs/m68332evb/src/README.txt">src/README.txt</a>
|
||||
|
||||
@@ -157,6 +157,10 @@ Below is a guide to the available README files in the NuttX source tree:
|
||||
| | |- ostest/README.txt
|
||||
| | |- poll/README.txt
|
||||
| | `- README.txt
|
||||
| |- lm3s5965-ek/
|
||||
| | |- include/README.txt
|
||||
| | |- src/README.txt
|
||||
| | `- README.txt
|
||||
| |- m68332evb/
|
||||
| | |- include/README.txt
|
||||
| | `- src/README.txt
|
||||
|
||||
+29
-4
@@ -1221,8 +1221,33 @@ This initial release of this feature includes the verified NX extensions plus
|
||||
a driver for the HX8347, 16-bit parallel LCD. This LCD supports 16-bit RGB
|
||||
(5:6:5).
|
||||
|
||||
nuttx-5.5
|
||||
^^^^^^^^^
|
||||
|
||||
* include/nuttx/lcd.h - Defines an LCD interface.
|
||||
* graphics/nxglib/fb and lcd - Support LCD and framebuffer rasterizers for NX.
|
||||
* configs/sam3u-ek/src/up_lcd.c - LCD driver for LCD on SAM3U-EK development
|
||||
board.
|
||||
This is the 52nd release of NuttX. This release includes one new port, some
|
||||
new drivers and some important bugfixes:
|
||||
|
||||
* NuttX was ported to the Luminary/TI LM3S6965 Ethernet Evaluation Kit.
|
||||
At present, that port includes an OS test configuration and a NuttShell
|
||||
(NSH) configuration with telnet support.
|
||||
|
||||
MMC/SD and Networking support are provided but not thoroughly verified
|
||||
in this release: Current development efforts are focused on porting the
|
||||
NuttX window system (NX) to work with the Evaluation Kits OLED display.
|
||||
|
||||
* A NuttX Ethernet driver for the Microchip ENC28J60 SPI Ethernet chip is
|
||||
available in the source tree (but has not yet been fully verified because
|
||||
I haven't properly connected it to hardware yet).
|
||||
|
||||
* The Olimex STR-P711 NuttX port was extended to support the ENC28J60 and
|
||||
some new networking configurations were added. The ENC28J60 has not
|
||||
been tested on the STR-P711, however, because of hardware issues (I don't
|
||||
think the USB powered board provides enough power for the ENC28J60 and
|
||||
I don't have the right wall wart yet).
|
||||
|
||||
Along the way, external interrupt support (XTI) was added to the STMicro
|
||||
STR-P711 port and some important bugs were fixed in the STR-P711 SPI
|
||||
driver.
|
||||
|
||||
* Corrected an important UDP reference counting error. It was not a serious
|
||||
error, but it trigger an assertion was IS a serious error.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
NuttX TODO List (Last updated May 4, 2010)
|
||||
NuttX TODO List (Last updated May 8, 2010)
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
(5) Task/Scheduler (sched/)
|
||||
@@ -7,7 +7,7 @@ NuttX TODO List (Last updated May 4, 2010)
|
||||
(1) pthreads (sched/)
|
||||
(1) C++ Support
|
||||
(5) Binary loaders (binfmt/)
|
||||
(16) Network (net/, drivers/net)
|
||||
(15) Network (net/, drivers/net)
|
||||
(5) Network Utilities (netutils/)
|
||||
(1) USB (drivers/usbdev)
|
||||
(5) Libraries (lib/)
|
||||
@@ -484,7 +484,8 @@ o Build system
|
||||
older compilers. My work around for now is to use an older compiler
|
||||
for the CPP definition in the configuration Make.defs file, do
|
||||
make context, restore the original Make.defs, and then make.
|
||||
Status: Open
|
||||
Status: Open. This may not be a real issue. I have not seen this
|
||||
happen lately so it may have nothing to do with GCC.
|
||||
Priority: High if you are using NX and a newer compiler.
|
||||
|
||||
|
||||
|
||||
@@ -51,7 +51,9 @@
|
||||
#include <nuttx/irq.h>
|
||||
#include <nuttx/arch.h>
|
||||
#include <nuttx/serial.h>
|
||||
|
||||
#include <arch/serial.h>
|
||||
#include <arch/board/board.h>
|
||||
|
||||
#include "chip.h"
|
||||
#include "up_arch.h"
|
||||
|
||||
@@ -340,7 +340,9 @@ Where <subdir> is one of the following:
|
||||
|
||||
nsh:
|
||||
Configures the NuttShell (nsh) located at examples/nsh. The
|
||||
Configuration enables both the serial and telnetd NSH interfaces.
|
||||
Configuration enables only the serial NSH interfaces (the telnet
|
||||
interface should also be functional, but is not enabled in this
|
||||
configuration).
|
||||
|
||||
ostest:
|
||||
This configuration directory, performs a simple OS test using
|
||||
|
||||
@@ -12,6 +12,7 @@ Contents
|
||||
IDEs
|
||||
NuttX buildroot Toolchain
|
||||
USB Device Controller Functions
|
||||
OLED
|
||||
Stellaris LM3S6965 Evaluation Kit Configuration Options
|
||||
Configurations
|
||||
|
||||
@@ -77,6 +78,24 @@ PIN SIGNAL EVB Function
|
||||
47 PF0/PWM0 User LED
|
||||
23 PC6/CCP3 Enable +15 V
|
||||
|
||||
OLED
|
||||
^^^^
|
||||
|
||||
The Evaluation Kit includes an OLED graphics display. Features:
|
||||
|
||||
- RiT P14201 series display (www.ritekdisplay.com).
|
||||
- 128 columns by 96rows
|
||||
- High-contrast (typ. 500:1)
|
||||
- Excellent brightness (120 cd/m2)
|
||||
- Fast 10 us response with 128 x 96 pixel resolution.
|
||||
|
||||
The OLED display has a built-in controller IC with synchronous serial and
|
||||
parallel interfaces. Synchronous serial (SSI) is used on the EVB. The SSI
|
||||
port is shared with the microSD card slot.
|
||||
|
||||
- PC7: OLED display data/control select (D/Cn)
|
||||
- PA3: OLED display chip select (CSn)
|
||||
|
||||
Development Environment
|
||||
^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
@@ -378,6 +397,15 @@ sudirectory and can be selected as follow:
|
||||
|
||||
Where <subdir> is one of the following:
|
||||
|
||||
nsh:
|
||||
Configures the NuttShell (nsh) located at examples/nsh. The
|
||||
Configuration enables both the serial and telnetd NSH interfaces.
|
||||
|
||||
NOTE: As it is configured now, you MUST have a network connected.
|
||||
Otherwise, the NSH prompt will not come up because the Ethernet
|
||||
driver is waiting for the network to come up. That is probably
|
||||
a bug in the Ethernet driver behavior!
|
||||
|
||||
ostest:
|
||||
This configuration directory, performs a simple OS test using
|
||||
examples/ostest.
|
||||
|
||||
Executable
+168
@@ -0,0 +1,168 @@
|
||||
############################################################################
|
||||
# configs/lm3s6965-ek/nsh/Make.defs
|
||||
#
|
||||
# Copyright (C) 2010 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
||||
# used to endorse or promote products derived from this software
|
||||
# without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################################
|
||||
|
||||
include ${TOPDIR}/.config
|
||||
|
||||
# Setup for the selected toolchain
|
||||
|
||||
ifeq ($(CONFIG_LM3S_CODESOURCERYW),y)
|
||||
# CodeSourcery under Windows
|
||||
CROSSDEV = arm-none-eabi-
|
||||
WINTOOL = y
|
||||
ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
|
||||
endif
|
||||
ifeq ($(CONFIG_LM3S_CODESOURCERYL),y)
|
||||
# CodeSourcery under Linux
|
||||
CROSSDEV = arm-none-eabi-
|
||||
ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
|
||||
MAXOPTIMIZATION = -O2
|
||||
endif
|
||||
ifeq ($(CONFIG_LM3S_DEVKITARM),y)
|
||||
# devkitARM under Windows
|
||||
CROSSDEV = arm-eabi-
|
||||
WINTOOL = y
|
||||
ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
|
||||
endif
|
||||
ifeq ($(CONFIG_LM3S_RAISONANCE),y)
|
||||
# Raisonance RIDE7 under Windows
|
||||
CROSSDEV = arm-none-eabi-
|
||||
WINTOOL = y
|
||||
ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
|
||||
endif
|
||||
ifeq ($(CONFIG_LM3S_BUILDROOT),y)
|
||||
# NuttX buildroot under Linux or Cygwin
|
||||
CROSSDEV = arm-elf-
|
||||
ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
|
||||
MAXOPTIMIZATION = -Os
|
||||
endif
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
# Windows-native toolchains
|
||||
DIRLINK = $(TOPDIR)/tools/winlink.sh
|
||||
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
|
||||
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
|
||||
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
|
||||
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
|
||||
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}"
|
||||
MAXOPTIMIZATION = -O2
|
||||
else
|
||||
# Linux/Cygwin-native toolchain
|
||||
MKDEP = $(TOPDIR)/tools/mkdeps.sh
|
||||
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
|
||||
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
|
||||
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
|
||||
endif
|
||||
|
||||
CC = $(CROSSDEV)gcc
|
||||
CXX = $(CROSSDEV)g++
|
||||
CPP = $(CROSSDEV)gcc -E
|
||||
LD = $(CROSSDEV)ld
|
||||
AR = $(CROSSDEV)ar rcs
|
||||
NM = $(CROSSDEV)nm
|
||||
OBJCOPY = $(CROSSDEV)objcopy
|
||||
OBJDUMP = $(CROSSDEV)objdump
|
||||
|
||||
ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
|
||||
ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
|
||||
|
||||
ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
|
||||
ARCHOPTIMIZATION = -g
|
||||
else
|
||||
ARCHOPTIMIZATION = $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
|
||||
endif
|
||||
|
||||
ARCHCFLAGS = -fno-builtin
|
||||
ARCHCXXFLAGS = -fno-builtin -fno-exceptions
|
||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
|
||||
ARCHWARNINGSXX = -Wall -Wshadow
|
||||
ARCHDEFINES =
|
||||
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
|
||||
|
||||
CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe
|
||||
CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
|
||||
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) -pipe
|
||||
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
|
||||
CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES)
|
||||
AFLAGS = $(CFLAGS) -D__ASSEMBLY__
|
||||
|
||||
NXFLATLDFLAGS1 = -r -d -warn-common
|
||||
NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
|
||||
LDNXFLATFLAGS = -e main -s 2048
|
||||
|
||||
OBJEXT = .o
|
||||
LIBEXT = .a
|
||||
EXEEXT =
|
||||
|
||||
ifneq ($(CROSSDEV),arm-elf-)
|
||||
LDFLAGS += -nostartfiles -nodefaultlibs
|
||||
endif
|
||||
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
|
||||
LDFLAGS += -g
|
||||
endif
|
||||
|
||||
define PREPROCESS
|
||||
@echo "CPP: $1->$2"
|
||||
@$(CPP) $(CPPFLAGS) $1 -o $2
|
||||
endef
|
||||
|
||||
define COMPILE
|
||||
@echo "CC: $1"
|
||||
@$(CC) -c $(CFLAGS) $1 -o $2
|
||||
endef
|
||||
|
||||
define COMPILEXX
|
||||
@echo "CXX: $1"
|
||||
@$(CXX) -c $(CXXFLAGS) $1 -o $2
|
||||
endef
|
||||
|
||||
define ASSEMBLE
|
||||
@echo "AS: $1"
|
||||
@$(CC) -c $(AFLAGS) $1 -o $2
|
||||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo "AR: $2"; \
|
||||
$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
|
||||
endef
|
||||
|
||||
define CLEAN
|
||||
@rm -f *.o *.a
|
||||
endef
|
||||
|
||||
HOSTCC = gcc
|
||||
HOSTINCLUDES = -I.
|
||||
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
|
||||
HOSTLDFLAGS =
|
||||
|
||||
Executable
+610
File diff suppressed because it is too large
Load Diff
Executable
+108
@@ -0,0 +1,108 @@
|
||||
/****************************************************************************
|
||||
* configs/lm3s6965-ek/nsh/ld.script
|
||||
*
|
||||
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/* The LM3S6965 has 256Kb of FLASH beginning at address 0x0000:0000 and 64Kb
|
||||
* of SRAM beginning at 0x2000:0000.
|
||||
*/
|
||||
|
||||
MEMORY
|
||||
{
|
||||
flash (rx) : ORIGIN = 0x00000000, LENGTH = 256K
|
||||
sram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
|
||||
}
|
||||
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_stext)
|
||||
SECTIONS
|
||||
{
|
||||
.text : {
|
||||
_stext = ABSOLUTE(.);
|
||||
*(.vectors)
|
||||
*(.text .text.*)
|
||||
*(.fixup)
|
||||
*(.gnu.warning)
|
||||
*(.rodata .rodata.*)
|
||||
*(.gnu.linkonce.t.*)
|
||||
*(.glue_7)
|
||||
*(.glue_7t)
|
||||
*(.got)
|
||||
*(.gcc_except_table)
|
||||
*(.gnu.linkonce.r.*)
|
||||
_etext = ABSOLUTE(.);
|
||||
} > flash
|
||||
|
||||
_eronly = ABSOLUTE(.); /* See below */
|
||||
|
||||
/* The LM3S6918 has 64Kb of SRAM beginning at the following address */
|
||||
|
||||
.data : {
|
||||
_sdata = ABSOLUTE(.);
|
||||
*(.data .data.*)
|
||||
*(.gnu.linkonce.d.*)
|
||||
CONSTRUCTORS
|
||||
_edata = ABSOLUTE(.);
|
||||
} > sram AT > flash
|
||||
|
||||
.ARM.extab : {
|
||||
*(.ARM.extab*)
|
||||
} >sram
|
||||
|
||||
.ARM.exidx : {
|
||||
__exidx_start = ABSOLUTE(.);
|
||||
*(.ARM.exidx*)
|
||||
__exidx_end = ABSOLUTE(.);
|
||||
} >sram
|
||||
|
||||
.bss : { /* BSS */
|
||||
_sbss = ABSOLUTE(.);
|
||||
*(.bss .bss.*)
|
||||
*(.gnu.linkonce.b.*)
|
||||
*(COMMON)
|
||||
_ebss = ABSOLUTE(.);
|
||||
} > sram
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
}
|
||||
Executable
+46
@@ -0,0 +1,46 @@
|
||||
#!/bin/bash
|
||||
# configs/lm3s6965-ek/nsh/setenv.sh
|
||||
#
|
||||
# Copyright (C) 2010 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
||||
# used to endorse or promote products derived from this software
|
||||
# without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
if [ "$(basename $0)" = "setenv.sh" ] ; then
|
||||
echo "You must source this script, not run it!" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
|
||||
|
||||
WD=`pwd`
|
||||
export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
|
||||
export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
|
||||
|
||||
echo "PATH : ${PATH}"
|
||||
@@ -87,11 +87,28 @@
|
||||
* 23 PC6/CCP3 Enable +15 V
|
||||
*/
|
||||
|
||||
/* GPIO for microSD card chip select */
|
||||
/* GPIO for microSD card chip select:
|
||||
* - PD0: SD card chip select (CARDCSn)
|
||||
*/
|
||||
|
||||
#define SDCCS_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
|
||||
GPIO_VALUE_ONE | GPIO_PORTD | 0)
|
||||
#define LED_GPIO (GPIO_FUNC_OUTPUT | GPIO_VALUE_ONE | GPIO_PORTF | 0)
|
||||
#define SDCCS_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
|
||||
GPIO_VALUE_ONE | GPIO_PORTD | 0)
|
||||
|
||||
/* GPIO for single LED:
|
||||
* - PF0: User LED
|
||||
*/
|
||||
|
||||
#define LED_GPIO (GPIO_FUNC_OUTPUT | GPIO_VALUE_ONE | GPIO_PORTF | 0)
|
||||
|
||||
/* GPIOs for OLED:
|
||||
* - PC7: OLED display data/control select (D/Cn)
|
||||
* - PA3: OLED display chip select (CSn)
|
||||
*/
|
||||
|
||||
#define OLEDDC_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
|
||||
GPIO_VALUE_ONE | GPIO_PORTC | 7)
|
||||
#define OLEDCS_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
|
||||
GPIO_VALUE_ONE | GPIO_PORTA | 3)
|
||||
|
||||
/************************************************************************************
|
||||
* Public Functions
|
||||
|
||||
@@ -145,7 +145,6 @@ void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
|
||||
|
||||
uint8_t lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
|
||||
{
|
||||
#warning "Need to check schematic"
|
||||
ssidbg("Returning SPI_STATUS_PRESENT\n");
|
||||
return SPI_STATUS_PRESENT;
|
||||
}
|
||||
|
||||
+2
-1
@@ -307,7 +307,8 @@ enum spi_dev_e
|
||||
SPIDEV_NONE = 0, /* Not a valid value */
|
||||
SPIDEV_MMCSD, /* Select SPI MMC/SD device */
|
||||
SPIDEV_FLASH, /* Select SPI FLASH device */
|
||||
SPIDEV_ETHERNET /* Select SPI ethernet device */
|
||||
SPIDEV_ETHERNET, /* Select SPI ethernet device */
|
||||
SPIDEV_DISPLAY /* Select SPI LCD/OLED display device */
|
||||
};
|
||||
|
||||
/* Certain SPI devices may required differnt clocking modes */
|
||||
|
||||
+3
-2
@@ -1,7 +1,7 @@
|
||||
/****************************************************************************
|
||||
* net/net_close.c
|
||||
*
|
||||
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
|
||||
* Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -277,7 +277,8 @@ int net_closesocket(FAR struct socket *psock)
|
||||
{
|
||||
/* Yes... free the connection structure */
|
||||
|
||||
uip_udpfree(psock->s_conn); /* Free uIP resources */
|
||||
conn->crefs = 0; /* No more references on the connection */
|
||||
uip_udpfree(psock->s_conn); /* Free uIP resources */
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user