sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for clean LPCXpresso NSH build

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3495 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-04-12 19:37:33 +00:00
parent d0682b1d31
commit 7efbac313c
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configs/lpcxpresso-lpc1768/include/board.h
View File

@ -123,6 +123,11 @@
#define CONFIG_LP17_FLASH 1 #define CONFIG_LP17_FLASH 1
#define BOARD_FLASHCFG_VALUE 0x0000303a #define BOARD_FLASHCFG_VALUE 0x0000303a
/* Ethernet configuration */
//#define ETH_MCFG_CLKSEL_DIV ETH_MCFG_CLKSEL_DIV44
#define ETH_MCFG_CLKSEL_DIV ETH_MCFG_CLKSEL_DIV20
/* LED definitions ******************************************************************/ /* LED definitions ******************************************************************/
/* The LPCXpresso LPC1768 board has a single red LED (there are additional LEDs on /* The LPCXpresso LPC1768 board has a single red LED (there are additional LEDs on
* the base board not considered here). * the base board not considered here).

2
configs/lpcxpresso-lpc1768/nsh/defconfig
View File

@ -116,7 +116,7 @@ CONFIG_LPC17_CAN1=n
CONFIG_LPC17_CAN2=n CONFIG_LPC17_CAN2=n
CONFIG_LPC17_SPI=n CONFIG_LPC17_SPI=n
CONFIG_LPC17_SSP0=n CONFIG_LPC17_SSP0=n
CONFIG_LPC17_SSP1=y CONFIG_LPC17_SSP1=n
CONFIG_LPC17_I2C0=n CONFIG_LPC17_I2C0=n
CONFIG_LPC17_I2C1=n CONFIG_LPC17_I2C1=n
CONFIG_LPC17_I2S=n CONFIG_LPC17_I2S=n

25
configs/lpcxpresso-lpc1768/src/up_nsh.c
View File

@ -57,7 +57,20 @@
#ifdef CONFIG_ARCH_BOARD_LPCXPRESSO #ifdef CONFIG_ARCH_BOARD_LPCXPRESSO
# define CONFIG_NSH_HAVEUSBDEV 1 # define CONFIG_NSH_HAVEUSBDEV 1
# define CONFIG_NSH_HAVEMMCSD 1 # ifdef CONFIG_LPC17_SSP0
# define CONFIG_NSH_HAVEMMCSD 1
# else
# undef CONFIG_NSH_HAVEMMCSD
# endif
#else
# error "Unrecognized board"
# undef CONFIG_NSH_HAVEUSBDEV
# undef CONFIG_NSH_HAVEMMCSD
#endif
/* Do we have SPI support for MMC/SD? */
#ifdef CONFIG_NSH_HAVEMMCSD
# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0 # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
# error "The LPCXpresso MMC/SD is on SSP0" # error "The LPCXpresso MMC/SD is on SSP0"
# undef CONFIG_NSH_MMCSDSPIPORTNO # undef CONFIG_NSH_MMCSDSPIPORTNO
@ -68,13 +81,6 @@
# undef CONFIG_NSH_MMCSDSLOTNO # undef CONFIG_NSH_MMCSDSLOTNO
# define CONFIG_NSH_MMCSDSLOTNO 0 # define CONFIG_NSH_MMCSDSLOTNO 0
# endif # endif
# ifndef CONFIG_LPC17_SSP0
# warning "CONFIG_LPC17_SSP0 is not enabled"
# endif
#else
# error "Unrecognized board"
# undef CONFIG_NSH_HAVEUSBDEV
# undef CONFIG_NSH_HAVEMMCSD
#endif #endif
/* Can't support USB device features if USB device is not enabled */ /* Can't support USB device features if USB device is not enabled */
@ -131,6 +137,7 @@
int nsh_archinitialize(void) int nsh_archinitialize(void)
{ {
#ifdef CONFIG_NSH_HAVEMMCSD
FAR struct spi_dev_s *ssp; FAR struct spi_dev_s *ssp;
int ret; int ret;
@ -159,6 +166,6 @@ int nsh_archinitialize(void)
message("Successfuly bound SSP port %d to MMC/SD slot %d\n", message("Successfuly bound SSP port %d to MMC/SD slot %d\n",
CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO); CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
#endif
return OK; return OK;
} }