summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nuttx/ChangeLog5
-rw-r--r--nuttx/Documentation/NuttX.html122
-rwxr-xr-xnuttx/arch/arm/src/lpc17xx/lpc17_ssp.c2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nettest/defconfig7
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nsh/defconfig44
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ostest/defconfig7
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/src/up_nsh.c18
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/src/up_ssp.c8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/thttpd/defconfig6
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbserial/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbstorage/defconfig12
11 files changed, 129 insertions, 110 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 2fad0a5f7..fb7cea4f5 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -1373,5 +1373,8 @@
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
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)
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 9709a8fd8..25797e2a0 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -785,30 +785,30 @@
This release includes multiple, important bugfixes as well as a new driver for the NXP LPC1766.
Important bugfixes include:
<ul>
- <li>
- Cortex-M3 Hard Fault.
- 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).
- However, it is assumed that all Cortex-M3 ports could have this as a latent bug.
+ <li>
+ Cortex-M3 Hard Fault.
+ 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).
+ However, it is assumed that all Cortex-M3 ports could have this as a latent bug.
</li>
- <li>
- 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.
- Some of that send() logic was incompatible with logicin the uIP layer.
- Errors seen include:
- (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.
- 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>;
- <code>uip_tcpinput.c</code> thought (incorrectly) that all of the bytes were acknowledged;
- <code>send.c</code> knew that they were not.
+ <li>
+ 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.
+ Some of that send() logic was incompatible with logicin the uIP layer.
+ Errors seen include:
+ (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.
+ 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>;
+ <code>uip_tcpinput.c</code> thought (incorrectly) that all of the bytes were acknowledged;
+ <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>
- 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>
</p>
<p>
@@ -1926,32 +1926,32 @@ Other memory:
<ul><pre>
5.14 2010-11-27 Gregory Nutt <spudmonkey@racsa.co.cr>
- * configs/olimex-lpc1766stk/nettest - Add examples/nettest configuration to
- verify the LPC17xx ethernet driver currently under development.
- * arch/arm/src/lpc17xx/lpc17xx_ethernet.c/.h - Began development of
- 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
- 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.
- * 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
- types of interrupts are pending at the time another interrupt returns
- (SYSTICK). This has not been verified on all plaforms, but is a critical
- fixed that is needed by all Cortex-M3 NuttX users.
- * configs/olimex-lpc1766stk/thttpd - Add a THTTPD configuration for the
- Olimex LPC2766-STK board. Verified successfully.
- * 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
- 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
- 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???
- * 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
- the send() function would hang with outstanding, unacknowledged data (with
- 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)
- that all of the bytes were acknowledged; send.c knew that they were not.
+ * configs/olimex-lpc1766stk/nettest - Add examples/nettest configuration to
+ verify the LPC17xx ethernet driver currently under development.
+ * arch/arm/src/lpc17xx/lpc17xx_ethernet.c/.h - Began development of
+ 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
+ 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.
+ * 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
+ types of interrupts are pending at the time another interrupt returns
+ (SYSTICK). This has not been verified on all plaforms, but is a critical
+ fixed that is needed by all Cortex-M3 NuttX users.
+ * configs/olimex-lpc1766stk/thttpd - Add a THTTPD configuration for the
+ Olimex LPC2766-STK board. Verified successfully.
+ * 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
+ 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
+ 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???
+ * 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
+ the send() function would hang with outstanding, unacknowledged data (with
+ 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)
+ 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;
@@ -1983,17 +1983,21 @@ buildroot-1.8 2009-12-21 &lt;spudmonkey@racsa.co.cr&gt;
<ul><pre>
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
- number problem "fixed" in 5.14 might occur.
- * 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
- out instead.
- * 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
- 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
- now uses only 8Kb at the beginning of Bank0; the 8Kb at the end of Bank0 is
- included in the heap
+ * net/uip/uip_tcpaddsend.c and net/send.c -- Another place where the TCP sequence
+ number problem "fixed" in 5.14 might occur.
+ * 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
+ out instead.
+ * 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
+ 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
+ now uses only 8Kb at the beginning of Bank0; the 8Kb at the end of Bank0 is
+ 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;
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
index a4ead4c20..a148fe8c9 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -746,7 +746,7 @@ static inline FAR struct lpc17_sspdev_s *lpc17_ssp0initialize(void)
****************************************************************************/
#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;
uint32_t regval;
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
index 2520b4737..9da6d0b8f 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical)
# 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
# stack. If defined, this symbol is the size of the interrupt
# 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:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
+#
CONFIG_LPC17_ETHERNET=y
CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n
@@ -463,6 +464,7 @@ CONFIG_PREALLOC_TIMERS=8
# CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+#
CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=n
@@ -709,6 +711,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host)
+#
CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -771,7 +774,7 @@ CONFIG_EXAMPLES_NSH_TELNET=n
CONFIG_EXAMPLES_NSH_ARCHINIT=n
CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
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_DRIPADDR=(10<<24|0<<16|0<<8|1)
CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index d8dcf573a..260d10e08 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical)
# 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
# stack. If defined, this symbol is the size of the interrupt
# 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:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
-CONFIG_LPC17_ETHERNET=n
+#
+CONFIG_LPC17_ETHERNET=y
CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n
CONFIG_LPC17_USBDEV=n
@@ -113,8 +114,8 @@ CONFIG_LPC17_UART3=n
CONFIG_LPC17_CAN1=n
CONFIG_LPC17_CAN2=n
CONFIG_LPC17_SPI=n
-CONFIG_LPC17_SSP0=y
-CONFIG_LPC17_SSP1=n
+CONFIG_LPC17_SSP0=n
+CONFIG_LPC17_SSP1=y
CONFIG_LPC17_I2C0=n
CONFIG_LPC17_I2C1=n
CONFIG_LPC17_I2S=n
@@ -194,6 +195,8 @@ CONFIG_UART3_2STOP=0
# CONFIG_NET_PRIORITY - Ethernet interrupt priority. The is default is
# the higest priority.
# 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_DEBUG.
# CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
@@ -204,6 +207,10 @@ CONFIG_PHY_KS8721=y
CONFIG_PHY_AUTONEG=y
CONFIG_PHY_SPEED100=n
CONFIG_PHY_FDUPLEX=y
+CONFIG_NET_EMACRAM_SIZE=8192
+CONFIG_NET_NTXDESC=7
+CONFIG_NET_NRXDESC=7
+CONFIG_NET_REGDEBUG=n
#
# General build options
@@ -456,6 +463,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+#
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=n
@@ -525,19 +533,21 @@ CONFIG_MMCSD_HAVECARDDETECT=n
# CONFIG_NET_LLH_LEN - The link level header length
# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
#
-CONFIG_NET=n
+CONFIG_NET=y
CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
+CONFIG_NSOCKET_DESCRIPTORS=8
CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
+CONFIG_NET_BUFSIZE=562
+CONFIG_NET_TCP=y
+CONFIG_NET_TCP_CONNS=8
+CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
+CONFIG_NET_TCPBACKLOG=n
+CONFIG_NET_MAX_LISTENPORTS=8
+CONFIG_NET_UDP=y
CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
+#CONFIG_NET_UDP_CONNS=8
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_PING=y
#CONFIG_NET_PINGADDRCONF=0
CONFIG_NET_STATISTICS=y
#CONFIG_NET_RECEIVE_WINDOW=
@@ -700,6 +710,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host)
+#
CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -709,7 +720,6 @@ CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
#
-#
# Settings for examples/ostest
#
CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -763,7 +773,7 @@ CONFIG_EXAMPLES_NSH_TELNET=n
CONFIG_EXAMPLES_NSH_ARCHINIT=y
CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
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_DRIPADDR=(10<<24|0<<16|0<<8|1)
CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
@@ -779,7 +789,7 @@ CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
#
# Architecture-specific NSH options
#
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
+CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
index 3b9eb5384..fc502222c 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical)
# 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
# stack. If defined, this symbol is the size of the interrupt
# 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:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
+#
CONFIG_LPC17_ETHERNET=n
CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n
@@ -456,6 +457,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+#
CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=n
@@ -700,6 +702,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host)
+#
CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -709,8 +712,6 @@ CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
#
-
-#
# Settings for examples/ostest
#
CONFIG_EXAMPLES_OSTEST_LOOPS=1
diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
index 16a687b07..3c76d96f1 100755
--- a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
@@ -56,33 +56,25 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_LPC1766STK
-# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1
-# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
-# error "The LPC1766-STK MMC/SD is on SSP0"
+# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+# error "The LPC1766-STK MMC/SD is on SSP1"
# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-# define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+# define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1
# endif
# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
# error "The LPC1766-STK MMC/SD is only one slot (0)"
# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
# define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
# endif
-# ifndef CONFIG_LPC17_SSP0
-# warning "CONFIG_LPC17_SSP0 is not enabled"
+# ifndef CONFIG_LPC17_SSP1
+# warning "CONFIG_LPC17_SSP1 is not enabled"
# endif
#else
# error "Unrecognized board"
-# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
#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 */
#if defined(CONFIG_DISABLE_MOUNTPOINT)
diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
index 9ae27e0af..9a1e72aad 100755
--- a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
+++ b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
@@ -52,8 +52,6 @@
#include "lpc17_internal.h"
#include "lpc1766stk_internal.h"
-/* The LM3S6965 Eval Kit microSD CS is on SSI0 */
-
#if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
/************************************************************************************
@@ -100,7 +98,7 @@
* Name: lpc17_sspinitialize
*
* 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 */
ssp_dumpssp0gpio("lpc17_ssp0select() Entry");
- lm3s_gpiowrite(LPC1766STK_LCD_CS, !selected);
+ lpc17_gpiowrite(LPC1766STK_LCD_CS, !selected);
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 */
ssp_dumpssp1gpio("lpc17_ssp1select() Entry");
- lm3s_gpiowrite(LPC1766STK_MMC_CS, !selected);
+ lpc17_gpiowrite(LPC1766STK_MMC_CS, !selected);
ssp_dumpssp1gpio("lpc17_ssp1select() Exit");
}
}
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
index f8eebba35..d85afadc0 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical)
# 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
# stack. If defined, this symbol is the size of the interrupt
# 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:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
+#
CONFIG_LPC17_ETHERNET=y
CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n
@@ -472,6 +473,7 @@ CONFIG_PREALLOC_TIMERS=8
# CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+#
CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=y
@@ -753,6 +755,7 @@ CONFIG_USBSTRG_REMOVABLE=y
# CONFIG_THTTPD_GENERATE_INDICES
# CONFIG_THTTPD_URLPATTERN - If defined, then it will be used to match
# and verify referrers.
+#
CONFIG_THTTPD_PORT=80
CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2)
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_CLIENTIP - IP address of the
# client side of the test (may be target or host)
+#
CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
index 29b78e72b..175da804e 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical)
# 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
# stack. If defined, this symbol is the size of the interrupt
# 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:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
+#
CONFIG_LPC17_ETHERNET=n
CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n
@@ -457,6 +458,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+#
CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=n
@@ -701,6 +703,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host)
+#
CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -710,8 +713,6 @@ CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
#
-
-#
# Settings for examples/ostest
#
CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -842,6 +843,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# Show controller events
# CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS
# Show interrupt-related events.
+#
CONFIG_EXAMPLES_USBSTRG_NLUNS=1
CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
index 99619b98a..d070a247a 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -52,7 +52,7 @@
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_DRAM_START - The start address of DRAM (physical)
# 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
# stack. If defined, this symbol is the size of the interrupt
# 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:
# (MAINOSC, PLL0, PLL1 and FLASH are controlled in board.h)
+#
CONFIG_LPC17_ETHERNET=n
CONFIG_LPC17_USBHOST=n
CONFIG_LPC17_USBOTG=n
@@ -113,8 +114,8 @@ CONFIG_LPC17_UART3=n
CONFIG_LPC17_CAN1=n
CONFIG_LPC17_CAN2=n
CONFIG_LPC17_SPI=n
-CONFIG_LPC17_SSP0=y
-CONFIG_LPC17_SSP1=n
+CONFIG_LPC17_SSP0=n
+CONFIG_LPC17_SSP1=y
CONFIG_LPC17_I2C0=n
CONFIG_LPC17_I2C1=n
CONFIG_LPC17_I2S=n
@@ -457,6 +458,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+#
CONFIG_FS_FAT=n
CONFIG_FS_ROMFS=n
@@ -701,6 +703,7 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
# CONFIG_EXAMPLE_NETTEST_NETMASK - Network mask
# CONFIG_EXAMPLE_NETTEST_CLIENTIP - IP address of the
# client side of the test (may be target or host)
+#
CONFIG_EXAMPLE_NETTEST_SERVER=n
CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
CONFIG_EXAMPLE_NETTEST_NOMAC=y
@@ -710,8 +713,6 @@ CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
#
-
-#
# Settings for examples/ostest
#
CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -842,6 +843,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# Show controller events
# CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS
# Show interrupt-related events.
+#
CONFIG_EXAMPLES_USBSTRG_NLUNS=1
CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 17:01:47 +0000