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

Fix some Olimex LPC1766STK build issues that have crept in due to changes in Kconfig file

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-08 14:43:30 -06:00
parent 6c895c9516
commit 954bf9c60b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/olimex-lpc1766stk/nsh/defconfig
View File

@ -204,8 +204,8 @@ CONFIG_LPC17_SSP1=y
# #
CONFIG_PHY_AUTONEG=y CONFIG_PHY_AUTONEG=y
CONFIG_NET_EMACRAM_SIZE=8192 CONFIG_NET_EMACRAM_SIZE=8192
CONFIG_NET_NTXDESC=7 CONFIG_NET_NTXDESC=6
CONFIG_NET_NRXDESC=7 CONFIG_NET_NRXDESC=6
# CONFIG_NET_WOL is not set # CONFIG_NET_WOL is not set
# CONFIG_NET_HASH is not set # CONFIG_NET_HASH is not set
# CONFIG_NET_MULTICAST is not set # CONFIG_NET_MULTICAST is not set
@ -417,7 +417,7 @@ CONFIG_SPI=y
# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_OWNBUS is not set
# CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_EXCHANGE is not set
# CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CMDDATA is not set
CONFIG_SPI_CALLBACK=y # CONFIG_SPI_CALLBACK is not set
# CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BITBANG is not set
# CONFIG_I2S is not set # CONFIG_I2S is not set

3
configs/olimex-lpc1766stk/src/lpc17_ssp.c
View File

@ -43,6 +43,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <debug.h> #include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#ifdef CONFIG_SPI_CALLBACK #ifdef CONFIG_SPI_CALLBACK
#include <nuttx/irq.h> #include <nuttx/irq.h>
@ -167,6 +168,8 @@ static void ssp_cdirqsetup(int irq, xcpt_t irqhandler)
up_disable_irq(irq); up_disable_irq(irq);
(void)irq_detach(irq); (void)irq_detach(irq);
} }
irqrestore(flags);
} }
#endif #endif