Enable network and SD/MMC card support

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3145 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2010-11-28 17:26:08 +00:00
parent f24db4423e
commit cefe2e816a
11 changed files with 129 additions and 110 deletions
+4 -1
View File
@@ -1373,5 +1373,8 @@
re-use any extra Bank0 memory for heap. configs/olimex-lpc1766stk/nettest re-use any extra Bank0 memory for heap. configs/olimex-lpc1766stk/nettest
now uses only 8Kb at the beginning of Bank0; the 8Kb at the end of Bank0 is now uses only 8Kb at the beginning of Bank0; the 8Kb at the end of Bank0 is
included in the heap included in the heap
* arch/arm/src/lpc17xx/lpc17_ssp.c -- Fix compilation errors when SSP1 is
selected.
* configs/olimex-lpc1766stk/nsh -- Enable network and SD/MMC card support in
NSH (not verified on initial check-in)
+63 -59
View File
@@ -785,30 +785,30 @@
This release includes multiple, important bugfixes as well as a new driver for the NXP LPC1766. This release includes multiple, important bugfixes as well as a new driver for the NXP LPC1766.
Important bugfixes include: Important bugfixes include:
<ul> <ul>
<li> <li>
Cortex-M3 Hard Fault. Cortex-M3 Hard Fault.
Fixed a hard fault problem that can occur if certaintypes of interrupts are pending at the time another interrupt returns. Fixed a hard fault problem that can occur if certaintypes of interrupts are pending at the time another interrupt returns.
This problem has only been observed on the LPC1766 (returning from a SYSTICK interrupt with a pending Ethernet interrupt). This problem has only been observed on the LPC1766 (returning from a SYSTICK interrupt with a pending Ethernet interrupt).
However, it is assumed that all Cortex-M3 ports could have this as a latent bug. However, it is assumed that all Cortex-M3 ports could have this as a latent bug.
</li> </li>
<li> <li>
TCP/IP Sequence Number Bug. TCP/IP Sequence Number Bug.
Corrected errors some important logic in the way that sequence numbers are managed when <code>send()</code> sends out packets before a previous packet has been acknowledged. Corrected errors some important logic in the way that sequence numbers are managed when <code>send()</code> sends out packets before a previous packet has been acknowledged.
Some of that send() logic was incompatible with logicin the uIP layer. Some of that send() logic was incompatible with logicin the uIP layer.
Errors seen include: Errors seen include:
(1) The final final packet in a sequence of packets might be too large! (1) The final final packet in a sequence of packets might be too large!
In the THTTPD example, this might leave some garbage at the bottom of the display. In the THTTPD example, this might leave some garbage at the bottom of the display.
Or (2) <code>send()</code> might hang with outstanding, unacknowledged data (and with no re-transmission requests). Or (2) <code>send()</code> might hang with outstanding, unacknowledged data (and with no re-transmission requests).
This was due to differences in sequence number handling in <code>send()</code> and in <code>uip_tcpinput.c</code>; This was due to differences in sequence number handling in <code>send()</code> and in <code>uip_tcpinput.c</code>;
<code>uip_tcpinput.c</code> thought (incorrectly) that all of the bytes were acknowledged; <code>uip_tcpinput.c</code> thought (incorrectly) that all of the bytes were acknowledged;
<code>send.c</code> knew that they were not. <code>send.c</code> knew that they were not.
</li>
<li>
One-Shot POSIX Timer Bug.
Fixed an error in set-up of a one-shot POSIX timer.
It was using the repititive timer value (which is zero in the one-shot case), always resulting in a 10Ms timer!
Found and fixed by Wilton Tong.
</li> </li>
<li>
One-Shot POSIX Timer Bug.
Fixed an error in set-up of a one-shot POSIX timer.
It was using the repititive timer value (which is zero in the one-shot case), always resulting in a 10Ms timer!
Found and fixed by Wilton Tong.
</li>
</ul> </ul>
</p> </p>
<p> <p>
@@ -1926,32 +1926,32 @@ Other memory:
<ul><pre> <ul><pre>
5.14 2010-11-27 Gregory Nutt <spudmonkey@racsa.co.cr> 5.14 2010-11-27 Gregory Nutt <spudmonkey@racsa.co.cr>
* configs/olimex-lpc1766stk/nettest - Add examples/nettest configuration to * configs/olimex-lpc1766stk/nettest - Add examples/nettest configuration to
verify the LPC17xx ethernet driver currently under development. verify the LPC17xx ethernet driver currently under development.
* arch/arm/src/lpc17xx/lpc17xx_ethernet.c/.h - Began development of * arch/arm/src/lpc17xx/lpc17xx_ethernet.c/.h - Began development of
the LPC17xx Ethernet driver. Driver in CVS functional after 2010-11-23. the LPC17xx Ethernet driver. Driver in CVS functional after 2010-11-23.
* sched/timer_settime.c - Fix an error in set-up of a one-shot POSIX timer. It * sched/timer_settime.c - Fix an error in set-up of a one-shot POSIX timer. It
was using the repititive timer value (which is zero in the one-shot case), was using the repititive timer value (which is zero in the one-shot case),
always resulting in a 10Ms timer! Found and fixed by Wilton Tong. always resulting in a 10Ms timer! Found and fixed by Wilton Tong.
* arch/arm/src/lpc17xx/lpc17_vector.S, stm32/stm32_vector.S, lm3s/lm3s_vector.S, * arch/arm/src/lpc17xx/lpc17_vector.S, stm32/stm32_vector.S, lm3s/lm3s_vector.S,
sam3u/sam3u_vector.S -- Fixed a hard fault problem that can occur if certain sam3u/sam3u_vector.S -- Fixed a hard fault problem that can occur if certain
types of interrupts are pending at the time another interrupt returns types of interrupts are pending at the time another interrupt returns
(SYSTICK). This has not been verified on all plaforms, but is a critical (SYSTICK). This has not been verified on all plaforms, but is a critical
fixed that is needed by all Cortex-M3 NuttX users. fixed that is needed by all Cortex-M3 NuttX users.
* configs/olimex-lpc1766stk/thttpd - Add a THTTPD configuration for the * configs/olimex-lpc1766stk/thttpd - Add a THTTPD configuration for the
Olimex LPC2766-STK board. Verified successfully. Olimex LPC2766-STK board. Verified successfully.
* net/uip/uip_tcpappsend.c - Correct an important logic bug in some uIP state * net/uip/uip_tcpappsend.c - Correct an important logic bug in some uIP state
data the is used to manage retransmissions. The uIP logic was incompatible data the is used to manage retransmissions. The uIP logic was incompatible
with the retransmission logic of net/send.c in one place. The final error with the retransmission logic of net/send.c in one place. The final error
was that the final packet in a sequence of packets was too large! In the was that the final packet in a sequence of packets was too large! In the
THTTPD example, this would leave some garbage at the bottom of the display THTTPD example, this would leave some garbage at the bottom of the display
(or worse). I don't know why I haven't see this bug before??? (or worse). I don't know why I haven't see this bug before???
* net/uip/uip_tcpinput.c -- The change to uip_tcpappsend.c unmasked an * net/uip/uip_tcpinput.c -- The change to uip_tcpappsend.c unmasked an
additional error in the TCP sequence number handling. This sympom was that additional error in the TCP sequence number handling. This sympom was that
the send() function would hang with outstanding, unacknowledged data (with the send() function would hang with outstanding, unacknowledged data (with
no re-transmit requests). The was due to differences in sequence number no re-transmit requests). The was due to differences in sequence number
handling in send() and in uip_tcpinput.c; uip_tcpinput.c thought (incorrectly) handling in send() and in uip_tcpinput.c; uip_tcpinput.c thought (incorrectly)
that all of the bytes were acknowledged; send.c knew that they were not. that all of the bytes were acknowledged; send.c knew that they were not.
pascal-2.0 2009-12-21 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt; pascal-2.0 2009-12-21 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
@@ -1983,17 +1983,21 @@ buildroot-1.8 2009-12-21 &lt;spudmonkey@racsa.co.cr&gt;
<ul><pre> <ul><pre>
nuttx-5.15 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt; nuttx-5.15 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* net/uip/uip_tcpaddsend.c and net/send.c -- Another place where the TCP sequence * net/uip/uip_tcpaddsend.c and net/send.c -- Another place where the TCP sequence
number problem "fixed" in 5.14 might occur. number problem "fixed" in 5.14 might occur.
* net/send.c -- Check if the destination IP address is in the ARP table. If * net/send.c -- Check if the destination IP address is in the ARP table. If
not, then don't consider the packet sent. It won't be, an ARP packet will go not, then don't consider the packet sent. It won't be, an ARP packet will go
out instead. out instead.
* arch/arm/src/lpc17xx/lpc17_emacram.h and lpc17_allocateheap.c -- The Ethernet * arch/arm/src/lpc17xx/lpc17_emacram.h and lpc17_allocateheap.c -- The Ethernet
logic was using all of AHB SRAM Bank0 for Ethernet packet buffers (16Kb). An logic was using all of AHB SRAM Bank0 for Ethernet packet buffers (16Kb). An
option was added to limit the amount of SRAM used for packet buffering and to option was added to limit the amount of SRAM used for packet buffering and to
re-use any extra Bank0 memory for heap. configs/olimex-lpc1766stk/nettest re-use any extra Bank0 memory for heap. configs/olimex-lpc1766stk/nettest
now uses only 8Kb at the beginning of Bank0; the 8Kb at the end of Bank0 is now uses only 8Kb at the beginning of Bank0; the 8Kb at the end of Bank0 is
included in the heap included in the heap
* arch/arm/src/lpc17xx/lpc17_ssp.c -- Fix compilation errors when SSP1 is
selected.
* configs/olimex-lpc1766stk/nsh -- Enable network and SD/MMC card support in
NSH (not verified on initial check-in)
pascal-2.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt; pascal-2.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
+1 -1
View File
@@ -746,7 +746,7 @@ static inline FAR struct lpc17_sspdev_s *lpc17_ssp0initialize(void)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_LPC17_SSP1 #ifdef CONFIG_LPC17_SSP1
static inline FAR struct spi_dev_s *lpc17_ssp1initialize(void) static inline FAR struct lpc17_sspdev_s *lpc17_ssp1initialize(void)
{ {
irqstate_t flags; irqstate_t flags;
uint32_t regval; uint32_t regval;
+5 -2
View File
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical) # CONFIG_DRAM_START - The start address of DRAM (physical)
# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_DRAM_END - Last address+1 of installed RAM
# CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
# CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
# stack. If defined, this symbol is the size of the interrupt # stack. If defined, this symbol is the size of the interrupt
# stack in bytes. If not defined, the user task stacks will be # stack in bytes. If not defined, the user task stacks will be
@@ -102,6 +102,7 @@ CONFIG_LPC17_BUILDROOT=y
# #
# Individual subsystems can be enabled: # Individual subsystems can be enabled:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h) # (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
#
CONFIG_LPC17_ETHERNET=y CONFIG_LPC17_ETHERNET=y
CONFIG_LPC17_USBHOST=n CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n CONFIG_LPC17_USBOTG=n
@@ -463,6 +464,7 @@ CONFIG_PREALLOC_TIMERS=8
# CONFIG_FS_FAT - Enable FAT filesystem support # CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size # CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
#
CONFIG_FS_FAT=n CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=n CONFIG_FS_ROMFS=n
@@ -709,6 +711,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask # CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the # CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host) # client side of the test (may be target or host)
#
CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -771,7 +774,7 @@ CONFIG_EXAMPLES_NSH_TELNET=n
CONFIG_EXAMPLES_NSH_ARCHINIT=n CONFIG_EXAMPLES_NSH_ARCHINIT=n
CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
CONFIG_EXAMPLES_NSH_DHCPC=n CONFIG_EXAMPLES_NSH_DHCPC=n
CONFIG_EXAMPLES_NSH_NOMAC=n CONFIG_EXAMPLES_NSH_NOMAC=y
CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0) CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+27 -17
View File
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical) # CONFIG_DRAM_START - The start address of DRAM (physical)
# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_DRAM_END - Last address+1 of installed RAM
# CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
# CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
# stack. If defined, this symbol is the size of the interrupt # stack. If defined, this symbol is the size of the interrupt
# stack in bytes. If not defined, the user task stacks will be # stack in bytes. If not defined, the user task stacks will be
@@ -102,7 +102,8 @@ CONFIG_LPC17_BUILDROOT=y
# #
# Individual subsystems can be enabled: # Individual subsystems can be enabled:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h) # (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
CONFIG_LPC17_ETHERNET=n #
CONFIG_LPC17_ETHERNET=y
CONFIG_LPC17_USBHOST=n CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n CONFIG_LPC17_USBOTG=n
CONFIG_LPC17_USBDEV=n CONFIG_LPC17_USBDEV=n
@@ -113,8 +114,8 @@ CONFIG_LPC17_UART3=n
CONFIG_LPC17_CAN1=n CONFIG_LPC17_CAN1=n
CONFIG_LPC17_CAN2=n CONFIG_LPC17_CAN2=n
CONFIG_LPC17_SPI=n CONFIG_LPC17_SPI=n
CONFIG_LPC17_SSP0=y CONFIG_LPC17_SSP0=n
CONFIG_LPC17_SSP1=n CONFIG_LPC17_SSP1=y
CONFIG_LPC17_I2C0=n CONFIG_LPC17_I2C0=n
CONFIG_LPC17_I2C1=n CONFIG_LPC17_I2C1=n
CONFIG_LPC17_I2S=n CONFIG_LPC17_I2S=n
@@ -194,6 +195,8 @@ CONFIG_UART3_2STOP=0
# CONFIG_NET_PRIORITY - Ethernet interrupt priority. The is default is # CONFIG_NET_PRIORITY - Ethernet interrupt priority. The is default is
# the higest priority. # the higest priority.
# CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). # CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
# CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
# Also needs CONFIG_DEBUG.
# CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs # CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
# CONFIG_DEBUG. # CONFIG_DEBUG.
# CONFIG_NET_HASH - Enable receipt of near-perfect match frames. # CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
@@ -204,6 +207,10 @@ CONFIG_PHY_KS8721=y
CONFIG_PHY_AUTONEG=y CONFIG_PHY_AUTONEG=y
CONFIG_PHY_SPEED100=n CONFIG_PHY_SPEED100=n
CONFIG_PHY_FDUPLEX=y CONFIG_PHY_FDUPLEX=y
CONFIG_NET_EMACRAM_SIZE=8192
CONFIG_NET_NTXDESC=7
CONFIG_NET_NRXDESC=7
CONFIG_NET_REGDEBUG=n
# #
# General build options # General build options
@@ -456,6 +463,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support # CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size # CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
#
CONFIG_FS_FAT=y CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=n CONFIG_FS_ROMFS=n
@@ -525,19 +533,21 @@ CONFIG_MMCSD_HAVECARDDETECT=n
# CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_LLH_LEN - The link level header length
# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
# #
CONFIG_NET=n CONFIG_NET=y
CONFIG_NET_IPv6=n CONFIG_NET_IPv6=n
CONFIG_NSOCKET_DESCRIPTORS=0 CONFIG_NSOCKET_DESCRIPTORS=8
CONFIG_NET_SOCKOPTS=y CONFIG_NET_SOCKOPTS=y
CONFIG_NET_BUFSIZE=420 CONFIG_NET_BUFSIZE=562
CONFIG_NET_TCP=n CONFIG_NET_TCP=y
CONFIG_NET_TCP_CONNS=40 CONFIG_NET_TCP_CONNS=8
CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
CONFIG_NET_UDP=n CONFIG_NET_TCPBACKLOG=n
CONFIG_NET_MAX_LISTENPORTS=8
CONFIG_NET_UDP=y
CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NET_UDP_CHECKSUMS=y
#CONFIG_NET_UDP_CONNS=10 #CONFIG_NET_UDP_CONNS=8
CONFIG_NET_ICMP=n CONFIG_NET_ICMP=y
CONFIG_NET_ICMP_PING=n CONFIG_NET_ICMP_PING=y
#CONFIG_NET_PINGADDRCONF=0 #CONFIG_NET_PINGADDRCONF=0
CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS=y
#CONFIG_NET_RECEIVE_WINDOW= #CONFIG_NET_RECEIVE_WINDOW=
@@ -700,6 +710,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask # CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the # CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host) # client side of the test (may be target or host)
#
CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -708,7 +719,6 @@ CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
#
# #
# Settings for examples/ostest # Settings for examples/ostest
# #
@@ -763,7 +773,7 @@ CONFIG_EXAMPLES_NSH_TELNET=n
CONFIG_EXAMPLES_NSH_ARCHINIT=y CONFIG_EXAMPLES_NSH_ARCHINIT=y
CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
CONFIG_EXAMPLES_NSH_DHCPC=n CONFIG_EXAMPLES_NSH_DHCPC=n
CONFIG_EXAMPLES_NSH_NOMAC=n CONFIG_EXAMPLES_NSH_NOMAC=y
CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0) CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
@@ -779,7 +789,7 @@ CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
# #
# Architecture-specific NSH options # Architecture-specific NSH options
# #
CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0 CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+4 -3
View File
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical) # CONFIG_DRAM_START - The start address of DRAM (physical)
# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_DRAM_END - Last address+1 of installed RAM
# CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
# CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
# stack. If defined, this symbol is the size of the interrupt # stack. If defined, this symbol is the size of the interrupt
# stack in bytes. If not defined, the user task stacks will be # stack in bytes. If not defined, the user task stacks will be
@@ -102,6 +102,7 @@ CONFIG_LPC17_BUILDROOT=y
# #
# Individual subsystems can be enabled: # Individual subsystems can be enabled:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h) # (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
#
CONFIG_LPC17_ETHERNET=n CONFIG_LPC17_ETHERNET=n
CONFIG_LPC17_USBHOST=n CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n CONFIG_LPC17_USBOTG=n
@@ -456,6 +457,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support # CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size # CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
#
CONFIG_FS_FAT=n CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=n CONFIG_FS_ROMFS=n
@@ -700,6 +702,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask # CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the # CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host) # client side of the test (may be target or host)
#
CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -708,8 +711,6 @@ CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
#
# #
# Settings for examples/ostest # Settings for examples/ostest
# #
+5 -13
View File
@@ -56,33 +56,25 @@
/* PORT and SLOT number probably depend on the board configuration */ /* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_LPC1766STK #ifdef CONFIG_ARCH_BOARD_LPC1766STK
# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1 # define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1
# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0 # if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
# error "The LPC1766-STK MMC/SD is on SSP0" # error "The LPC1766-STK MMC/SD is on SSP1"
# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO # undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
# define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0 # define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1
# endif # endif
# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0 # if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
# error "The LPC1766-STK MMC/SD is only one slot (0)" # error "The LPC1766-STK MMC/SD is only one slot (0)"
# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO # undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
# define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0 # define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
# endif # endif
# ifndef CONFIG_LPC17_SSP0 # ifndef CONFIG_LPC17_SSP1
# warning "CONFIG_LPC17_SSP0 is not enabled" # warning "CONFIG_LPC17_SSP1 is not enabled"
# endif # endif
#else #else
# error "Unrecognized board" # error "Unrecognized board"
# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD # undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
#endif #endif
/* Can't support USB features if USB is not enabled */
#ifndef CONFIG_USBDEV
# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
#endif
/* Can't support MMC/SD features if mountpoints are disabled */ /* Can't support MMC/SD features if mountpoints are disabled */
#if defined(CONFIG_DISABLE_MOUNTPOINT) #if defined(CONFIG_DISABLE_MOUNTPOINT)
+3 -5
View File
@@ -52,8 +52,6 @@
#include "lpc17_internal.h" #include "lpc17_internal.h"
#include "lpc1766stk_internal.h" #include "lpc1766stk_internal.h"
/* The LM3S6965 Eval Kit microSD CS is on SSI0 */
#if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
/************************************************************************************ /************************************************************************************
@@ -100,7 +98,7 @@
* Name: lpc17_sspinitialize * Name: lpc17_sspinitialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit. * Called to configure SPI chip select GPIO pins for the LPC1766-STK.
* *
************************************************************************************/ ************************************************************************************/
@@ -157,7 +155,7 @@ void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
/* Assert/de-assert the CS pin to the card */ /* Assert/de-assert the CS pin to the card */
ssp_dumpssp0gpio("lpc17_ssp0select() Entry"); ssp_dumpssp0gpio("lpc17_ssp0select() Entry");
lm3s_gpiowrite(LPC1766STK_LCD_CS, !selected); lpc17_gpiowrite(LPC1766STK_LCD_CS, !selected);
ssp_dumpssp0gpio("lpc17_ssp0select() Exit"); ssp_dumpssp0gpio("lpc17_ssp0select() Exit");
} }
} }
@@ -178,7 +176,7 @@ void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
/* Assert/de-assert the CS pin to the card */ /* Assert/de-assert the CS pin to the card */
ssp_dumpssp1gpio("lpc17_ssp1select() Entry"); ssp_dumpssp1gpio("lpc17_ssp1select() Entry");
lm3s_gpiowrite(LPC1766STK_MMC_CS, !selected); lpc17_gpiowrite(LPC1766STK_MMC_CS, !selected);
ssp_dumpssp1gpio("lpc17_ssp1select() Exit"); ssp_dumpssp1gpio("lpc17_ssp1select() Exit");
} }
} }
+5 -1
View File
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical) # CONFIG_DRAM_START - The start address of DRAM (physical)
# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_DRAM_END - Last address+1 of installed RAM
# CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
# CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
# stack. If defined, this symbol is the size of the interrupt # stack. If defined, this symbol is the size of the interrupt
# stack in bytes. If not defined, the user task stacks will be # stack in bytes. If not defined, the user task stacks will be
@@ -102,6 +102,7 @@ CONFIG_LPC17_BUILDROOT=y
# #
# Individual subsystems can be enabled: # Individual subsystems can be enabled:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h) # (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
#
CONFIG_LPC17_ETHERNET=y CONFIG_LPC17_ETHERNET=y
CONFIG_LPC17_USBHOST=n CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n CONFIG_LPC17_USBOTG=n
@@ -472,6 +473,7 @@ CONFIG_PREALLOC_TIMERS=8
# CONFIG_FS_FAT - Enable FAT filesystem support # CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size # CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
#
CONFIG_FS_FAT=n CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=y CONFIG_FS_ROMFS=y
@@ -753,6 +755,7 @@ CONFIG_USBSTRG_REMOVABLE=y
# CONFIG_THTTPD_GENERATE_INDICES # CONFIG_THTTPD_GENERATE_INDICES
# CONFIG_THTTPD_URLPATTERN - If defined, then it will be used to match # CONFIG_THTTPD_URLPATTERN - If defined, then it will be used to match
# and verify referrers. # and verify referrers.
#
CONFIG_THTTPD_PORT=80 CONFIG_THTTPD_PORT=80
CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2)
CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org" CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org"
@@ -807,6 +810,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask # CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the # CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host) # client side of the test (may be target or host)
#
CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical) # CONFIG_DRAM_START - The start address of DRAM (physical)
# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_DRAM_END - Last address+1 of installed RAM
# CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
# CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
# stack. If defined, this symbol is the size of the interrupt # stack. If defined, this symbol is the size of the interrupt
# stack in bytes. If not defined, the user task stacks will be # stack in bytes. If not defined, the user task stacks will be
@@ -102,6 +102,7 @@ CONFIG_LPC17_BUILDROOT=y
# #
# Individual subsystems can be enabled: # Individual subsystems can be enabled:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h) # (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
#
CONFIG_LPC17_ETHERNET=n CONFIG_LPC17_ETHERNET=n
CONFIG_LPC17_USBHOST=n CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n CONFIG_LPC17_USBOTG=n
@@ -457,6 +458,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support # CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size # CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
#
CONFIG_FS_FAT=n CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=n CONFIG_FS_ROMFS=n
@@ -701,6 +703,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask # CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the # CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host) # client side of the test (may be target or host)
#
CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -709,8 +712,6 @@ CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
#
# #
# Settings for examples/ostest # Settings for examples/ostest
# #
@@ -842,6 +843,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# Show controller events # Show controller events
# CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS # CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS
# Show interrupt-related events. # Show interrupt-related events.
#
CONFIG_EXAMPLES_USBSTRG_NLUNS=1 CONFIG_EXAMPLES_USBSTRG_NLUNS=1
CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0 CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical) # CONFIG_DRAM_START - The start address of DRAM (physical)
# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_DRAM_END - Last address+1 of installed RAM
# CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
# CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
# stack. If defined, this symbol is the size of the interrupt # stack. If defined, this symbol is the size of the interrupt
# stack in bytes. If not defined, the user task stacks will be # stack in bytes. If not defined, the user task stacks will be
@@ -102,6 +102,7 @@ CONFIG_LPC17_BUILDROOT=y
# #
# Individual subsystems can be enabled: # Individual subsystems can be enabled:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h) # (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
#
CONFIG_LPC17_ETHERNET=n CONFIG_LPC17_ETHERNET=n
CONFIG_LPC17_USBHOST=n CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n CONFIG_LPC17_USBOTG=n
@@ -113,8 +114,8 @@ CONFIG_LPC17_UART3=n
CONFIG_LPC17_CAN1=n CONFIG_LPC17_CAN1=n
CONFIG_LPC17_CAN2=n CONFIG_LPC17_CAN2=n
CONFIG_LPC17_SPI=n CONFIG_LPC17_SPI=n
CONFIG_LPC17_SSP0=y CONFIG_LPC17_SSP0=n
CONFIG_LPC17_SSP1=n CONFIG_LPC17_SSP1=y
CONFIG_LPC17_I2C0=n CONFIG_LPC17_I2C0=n
CONFIG_LPC17_I2C1=n CONFIG_LPC17_I2C1=n
CONFIG_LPC17_I2S=n CONFIG_LPC17_I2S=n
@@ -457,6 +458,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support # CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size # CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
#
CONFIG_FS_FAT=n CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=n CONFIG_FS_ROMFS=n
@@ -701,6 +703,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask # CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the # CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host) # client side of the test (may be target or host)
#
CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -709,8 +712,6 @@ CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
#
# #
# Settings for examples/ostest # Settings for examples/ostest
# #
@@ -842,6 +843,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# Show controller events # Show controller events
# CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS # CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS
# Show interrupt-related events. # Show interrupt-related events.
#
CONFIG_EXAMPLES_USBSTRG_NLUNS=1 CONFIG_EXAMPLES_USBSTRG_NLUNS=1
CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0 CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"