diff --git a/ChangeLog b/ChangeLog index fb7cea4f586..91aa689d653 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1376,5 +1376,9 @@ * 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) + NSH. Networking and telnetd interface functional. Still testing SPI-based + SD/MMC. + * examples/nsh/nsh_netinit.c -- Fix NSH bug. If CONFIG_NET is selected, but + CONFIG_EXAMPLES_NSH_TELNETD is not selected, then the network is never + initialized and bad things happen if you try to ping. diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 25797e2a013..beb581b9e97 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -8,7 +8,7 @@

NuttX RTOS

-

Last Updated: November 28, 2010

+

Last Updated: November 29, 2010

@@ -1997,7 +1997,11 @@ nuttx-5.15 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * 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) + NSH. Networking and telnetd interface functional. Still testing SPI-based + SD/MMC. + * examples/nsh/nsh_netinit.c -- Fix NSH bug. If CONFIG_NET is selected, but + CONFIG_EXAMPLES_NSH_TELNETD is not selected, then the network is never + initialized and bad things happen if you try to ping. pascal-2.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c index a148fe8c99b..e0331f09ea9 100755 --- a/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/arch/arm/src/lpc17xx/lpc17_ssp.c @@ -65,20 +65,21 @@ * Definitions ****************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG too) */ +/* The following enable debug output from this file (needs CONFIG_DEBUG too). + * + * CONFIG_SSP_DEBUG - Define to enable basic SSP debug + * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug + */ -#undef SSP_DEBUG /* Define to enable debug */ -#undef SSP_VERBOSE /* Define to enable verbose debug */ - -#ifdef SSP_DEBUG +#ifdef CONFIG_SSP_DEBUG # define sspdbg lldbg -# ifdef SSP_VERBOSE +# ifdef CONFIG_SSP_VERBOSE # define spivdbg lldbg # else # define spivdbg(x...) # endif #else -# undef SSP_VERBOSE +# undef CONFIG_SSP_VERBOSE # define sspdbg(x...) # define spivdbg(x...) #endif @@ -96,6 +97,10 @@ * use the CCLK undivided to get the SSP_CLOCK. */ +#if LPC17_CCLK > 100000000 +# error "CCLK <= 100,000,000 assumed" +#endif + #define SSP_PCLKSET_DIV SYSCON_PCLKSEL_CCLK #define SSP_CLOCK LPC17_CCLK diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt index 65264b770be..7fab1335b97 100755 --- a/configs/olimex-lpc1766stk/README.txt +++ b/configs/olimex-lpc1766stk/README.txt @@ -653,7 +653,9 @@ Where is one of the following: nsh: Configures the NuttShell (nsh) located at examples/nsh. The - Configuration enables only the serial NSH interfaces. + Configuration enables both the serial and telnet NSH interfaces. + Support for the board's SPI-based MicroSD card is included + (but not passing tests as of this writing). ostest: This configuration directory, performs a simple OS test using diff --git a/configs/olimex-lpc1766stk/src/up_ssp.c b/configs/olimex-lpc1766stk/src/up_ssp.c index 9a1e72aad99..be5b81222f9 100755 --- a/configs/olimex-lpc1766stk/src/up_ssp.c +++ b/configs/olimex-lpc1766stk/src/up_ssp.c @@ -58,27 +58,28 @@ * Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG too) */ +/* The following enable debug output from this file (needs CONFIG_DEBUG too). + * + * CONFIG_SSP_DEBUG - Define to enable basic SSP debug + * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug + */ -#undef SSP_DEBUG /* Define to enable debug */ -#undef SSP_VERBOSE /* Define to enable verbose debug */ - -#ifdef SSP_DEBUG +#ifdef CONFIG_SSP_DEBUG # define sspdbg lldbg -# ifdef SSP_VERBOSE +# ifdef CONFIG_SSP_VERBOSE # define sspvdbg lldbg # else # define sspvdbg(x...) # endif #else -# undef SSP_VERBOSE +# undef CONFIG_SSP_VERBOSE # define sspdbg(x...) # define sspvdbg(x...) #endif /* Dump GPIO registers */ -#ifdef SSP_VERBOSE +#ifdef CONFIG_SSP_VERBOSE # define ssp_dumpssp0gpio(m) lpc17_dumpgpio(LPC1766STK_LCD_CS, m) # define ssp_dumpssp1gpio(m) lpc17_dumpgpio(LPC1766STK_MMC_CS, m) #else