Merge remote-tracking branch 'origin/master' into netiob

1 files changed, 35 insertions, 7 deletions

diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig
index 4c97e0bd6..1120c0571 100644
--- a/nuttx/configs/sama5d4-ek/nsh/defconfig
+++ b/nuttx/configs/sama5d4-ek/nsh/defconfig
@@ -186,7 +186,7 @@ CONFIG_SAMA5_HSMC=y
 # CONFIG_SAMA5_USART2 is not set
 CONFIG_SAMA5_USART3=y
 CONFIG_SAMA5_USART4=y
-# CONFIG_SAMA5_TWI0 is not set
+CONFIG_SAMA5_TWI0=y
 # CONFIG_SAMA5_TWI1 is not set
 # CONFIG_SAMA5_TWI2 is not set
 # CONFIG_SAMA5_TWI3 is not set
@@ -250,6 +250,11 @@ CONFIG_SAMA5_EMAC0_PHYSR_100FD=0x6
 CONFIG_SAMA5_EMAC0_ISETH0=y
 
 #
+# TWI device driver options
+#
+CONFIG_SAMA5_TWI0_FREQUENCY=100000
+
+#
 # HSMCI device driver options
 #
 CONFIG_SAMA5_HSMCI0_XDMAC1=y
@@ -346,8 +351,8 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # Board-Specific Options
 #
 # CONFIG_SAMA5D4EK_384MHZ is not set
-CONFIG_SAMA5D4EK_396MHZ=y
-# CONFIG_SAMA5D4EK_528MHZ is not set
+# CONFIG_SAMA5D4EK_396MHZ is not set
+CONFIG_SAMA5D4EK_528MHZ=y
 CONFIG_SAMA5D4EK_DRAM_BOOT=y
 
 #
@@ -401,7 +406,7 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
-CONFIG_SDCLONE_DISABLE=y
+# CONFIG_SDCLONE_DISABLE is not set
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NAME_MAX=32
@@ -441,7 +446,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 #
 # Device Drivers
 #
-CONFIG_DISABLE_POLL=y
+# CONFIG_DISABLE_POLL is not set
 CONFIG_DEV_NULL=y
 CONFIG_DEV_ZERO=y
 CONFIG_ARCH_HAVE_RNG=y
@@ -452,7 +457,12 @@ CONFIG_DEV_RANDOM=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
-# CONFIG_I2C is not set
+CONFIG_I2C=y
+# CONFIG_I2C_SLAVE is not set
+CONFIG_I2C_TRANSFER=y
+CONFIG_I2C_WRITEREAD=y
+# CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_TRACE is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
 CONFIG_RTC=y
@@ -544,6 +554,7 @@ CONFIG_USART3_ISUART=y
 CONFIG_USART4_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+CONFIG_SERIAL_NPOLLWAITERS=2
 CONFIG_USART3_SERIAL_CONSOLE=y
 # CONFIG_USART4_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -590,6 +601,7 @@ CONFIG_RAMLOG_SYSLOG=y
 CONFIG_RAMLOG_BUFSIZE=16384
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
+CONFIG_RAMLOG_NPOLLWAITERS=4
 
 #
 # Networking Support
@@ -705,7 +717,14 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_FS_ROMFS=y
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
-# CONFIG_FS_PROCFS is not set
+CONFIG_FS_PROCFS=y
+
+#
+# Exclude individual procfs entries
+#
+# CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
+# CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 
 #
 # System Logging
@@ -866,6 +885,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_XMLRPC is not set
 
 #
 # Graphics Support
@@ -971,6 +991,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
+CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=80
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
@@ -1054,6 +1075,13 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 #
 # I2C tool
 #
+CONFIG_SYSTEM_I2CTOOL=y
+CONFIG_I2CTOOL_MINBUS=0
+CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_I2CTOOL_MINADDR=0x03
+CONFIG_I2CTOOL_MAXADDR=0x77
+CONFIG_I2CTOOL_MAXREGADDR=0xff
+CONFIG_I2CTOOL_DEFFREQ=100000
 
 #
 # INI File Parser