Merged in alinjerpelea/nuttx (pull request #924)
drivers: usbdev: usbmsc: fix usbmsc_exportluns declaration * drivers: usbdev: usbmsc: fix usbmsc_exportluns declaration fixes the following error apps/system/usbmsc/usbmsc_main.c:567: undefined reference to `usbmsc_exportluns' Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com> * configs: spresense: nsh: register the procfs this is a configuration change in sync with the other ones Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com> * configs: spresense: enable READLINE_CMD_HISTORY we are following the default spresense board configuration regarding CMD HISTORY configuration Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com> * configs: spresense: enable by default SPI 4 and 5 we are following the default spresense board configuration regarding SPI configuration Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com> * configs: spresense: add I2C configuration in sync with the default spresense board configuration Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com> Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
parent
478d27455d
commit
5dc1618982
@ -5,6 +5,7 @@
|
||||
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
|
||||
# modifications.
|
||||
#
|
||||
# CONFIG_CXD56_I2C0_SCUSEQ is not set
|
||||
# CONFIG_STANDARD_SERIAL is not set
|
||||
CONFIG_ARCH="arm"
|
||||
CONFIG_ARCH_BOARD="spresense"
|
||||
@ -16,9 +17,15 @@ CONFIG_BOARD_LOOPSPERMSEC=5434
|
||||
CONFIG_BOOT_RUNFROMISRAM=y
|
||||
CONFIG_BUILTIN=y
|
||||
CONFIG_CLOCK_MONOTONIC=y
|
||||
CONFIG_CXD56_I2C0=y
|
||||
CONFIG_CXD56_I2C=y
|
||||
CONFIG_CXD56_SPI4=y
|
||||
CONFIG_CXD56_SPI5=y
|
||||
CONFIG_CXD56_SPI=y
|
||||
CONFIG_DEBUG_FULLOPT=y
|
||||
CONFIG_DEBUG_SYMBOLS=y
|
||||
CONFIG_FS_PROCFS=y
|
||||
CONFIG_FS_PROCFS_REGISTER=y
|
||||
CONFIG_HAVE_CXX=y
|
||||
CONFIG_HAVE_CXXINITIALIZE=y
|
||||
CONFIG_I2C=y
|
||||
@ -34,6 +41,7 @@ CONFIG_PREALLOC_TIMERS=4
|
||||
CONFIG_PREALLOC_WDOGS=16
|
||||
CONFIG_RAM_SIZE=1572864
|
||||
CONFIG_RAM_START=0x0d000000
|
||||
CONFIG_READLINE_CMD_HISTORY=y
|
||||
CONFIG_RR_INTERVAL=200
|
||||
CONFIG_RTC=y
|
||||
CONFIG_RTC_DRIVER=y
|
||||
|
@ -5,6 +5,7 @@
|
||||
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
|
||||
# modifications.
|
||||
#
|
||||
# CONFIG_CXD56_I2C0_SCUSEQ is not set
|
||||
# CONFIG_MMCSD_HAVE_WRITEPROTECT is not set
|
||||
# CONFIG_MMCSD_SPI is not set
|
||||
# CONFIG_STANDARD_SERIAL is not set
|
||||
@ -18,7 +19,12 @@ CONFIG_BOARD_LOOPSPERMSEC=5434
|
||||
CONFIG_BOOT_RUNFROMISRAM=y
|
||||
CONFIG_BUILTIN=y
|
||||
CONFIG_CLOCK_MONOTONIC=y
|
||||
CONFIG_CXD56_I2C0=y
|
||||
CONFIG_CXD56_I2C=y
|
||||
CONFIG_CXD56_SDIO=y
|
||||
CONFIG_CXD56_SPI4=y
|
||||
CONFIG_CXD56_SPI5=y
|
||||
CONFIG_CXD56_SPI=y
|
||||
CONFIG_CXD56_USBDEV=y
|
||||
CONFIG_DEBUG_FULLOPT=y
|
||||
CONFIG_DEBUG_SYMBOLS=y
|
||||
@ -45,6 +51,7 @@ CONFIG_PREALLOC_TIMERS=4
|
||||
CONFIG_PREALLOC_WDOGS=16
|
||||
CONFIG_RAM_SIZE=1572864
|
||||
CONFIG_RAM_START=0x0d000000
|
||||
CONFIG_READLINE_CMD_HISTORY=y
|
||||
CONFIG_RR_INTERVAL=200
|
||||
CONFIG_RTC=y
|
||||
CONFIG_RTC_DRIVER=y
|
||||
|
@ -142,7 +142,7 @@ static void usbmsc_disconnect(FAR struct usbdevclass_driver_s *driver,
|
||||
/* Initialization/Uninitialization ******************************************/
|
||||
|
||||
static void usbmsc_lununinitialize(struct usbmsc_lun_s *lun);
|
||||
#ifdef CONFIG_USBMSC_COMPOSITE
|
||||
#if !defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
|
||||
static int usbmsc_exportluns(FAR void *handle);
|
||||
#endif
|
||||
|
||||
@ -1664,7 +1664,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_USBMSC_COMPOSITE
|
||||
#if !defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
|
||||
static
|
||||
#endif
|
||||
int usbmsc_exportluns(FAR void *handle)
|
||||
|
@ -168,7 +168,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno);
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#if !defined(CONFIG_USBDEV_COMPOSITE) || !defined(CONFIG_USBMSC_COMPOSITE)
|
||||
#if defined(CONFIG_USBDEV_COMPOSITE) || defined(CONFIG_USBMSC_COMPOSITE)
|
||||
int usbmsc_exportluns(FAR void *handle);
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user