Refresh configurations

2 files changed, 24 insertions, 27 deletions

diff --git a/nuttx/configs/tm4c1294-launchpad/ipv6/defconfig b/nuttx/configs/tm4c1294-launchpad/ipv6/defconfig
index e45b07c55..89c4e3077 100644
--- a/nuttx/configs/tm4c1294-launchpad/ipv6/defconfig
+++ b/nuttx/configs/tm4c1294-launchpad/ipv6/defconfig
@@ -12,15 +12,11 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-# CONFIG_WINDOWS_CYGWIN is not set
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -114,16 +110,10 @@ CONFIG_ARCH_HAVE_FPU=y
 #
 # ARMV7M Configuration Options
 #
-# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
-# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
 
 #
@@ -141,6 +131,9 @@ CONFIG_ARCH_CHIP_TM4C=y
 #
 # Tiva/Stellaris Peripheral Support
 #
+# CONFIG_TIVA_ADC is not set
+CONFIG_TIVA_HAVE_ADC0=y
+CONFIG_TIVA_HAVE_ADC1=y
 CONFIG_TIVA_I2C=y
 CONFIG_TIVA_HAVE_I2C1=y
 CONFIG_TIVA_HAVE_I2C2=y
@@ -163,11 +156,16 @@ CONFIG_TIVA_HAVE_SSI3=y
 CONFIG_TIVA_HAVE_ETHERNET=y
 # CONFIG_TIVA_SSI is not set
 # CONFIG_TIVA_TIMER is not set
+CONFIG_TIVA_HAVE_TIMER0=y
+CONFIG_TIVA_HAVE_TIMER1=y
+CONFIG_TIVA_HAVE_TIMER2=y
 CONFIG_TIVA_HAVE_TIMER3=y
 CONFIG_TIVA_HAVE_TIMER4=y
 CONFIG_TIVA_HAVE_TIMER5=y
 CONFIG_TIVA_HAVE_TIMER6=y
 CONFIG_TIVA_HAVE_TIMER7=y
+# CONFIG_TIVA_ADC0 is not set
+# CONFIG_TIVA_ADC1 is not set
 # CONFIG_TIVA_I2C0 is not set
 # CONFIG_TIVA_I2C1 is not set
 # CONFIG_TIVA_I2C2 is not set
@@ -546,6 +544,7 @@ CONFIG_UART0_2STOP=0
 # System Logging
 #
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_CONSOLE is not set
 
 #
 # Networking Support
@@ -630,6 +629,8 @@ CONFIG_NET_UDP_READAHEAD=y
 CONFIG_NET_ICMPv6=y
 CONFIG_NET_ICMPv6_PING=y
 # CONFIG_NET_ICMPv6_NEIGHBOR is not set
+# CONFIG_NET_ICMPv6_AUTOCONF is not set
+# CONFIG_NET_ICMPv6_ROUTER is not set
 
 #
 # IGMPv2 Client Support
@@ -850,8 +851,6 @@ CONFIG_EXAMPLES_NSH=y
 # Networking Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPC is not set
-# CONFIG_NETUTILS_DHCPD is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
@@ -1119,8 +1118,6 @@ CONFIG_READLINE_ECHO=y
 #
 # Temperature
 #
-# CONFIG_SYSTEM_LM75_FAHRENHEIT is not set
-# CONFIG_SYSTEM_LM75_CENTIGRADE is not set
 
 #
 # VI Work-Alike Editor
diff --git a/nuttx/configs/tm4c1294-launchpad/nsh/defconfig b/nuttx/configs/tm4c1294-launchpad/nsh/defconfig
index d88f5f2dd..5170a9a53 100644
--- a/nuttx/configs/tm4c1294-launchpad/nsh/defconfig
+++ b/nuttx/configs/tm4c1294-launchpad/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -131,6 +131,9 @@ CONFIG_ARCH_CHIP_TM4C=y
 #
 # Tiva/Stellaris Peripheral Support
 #
+# CONFIG_TIVA_ADC is not set
+CONFIG_TIVA_HAVE_ADC0=y
+CONFIG_TIVA_HAVE_ADC1=y
 CONFIG_TIVA_I2C=y
 CONFIG_TIVA_HAVE_I2C1=y
 CONFIG_TIVA_HAVE_I2C2=y
@@ -153,11 +156,16 @@ CONFIG_TIVA_HAVE_SSI3=y
 CONFIG_TIVA_HAVE_ETHERNET=y
 # CONFIG_TIVA_SSI is not set
 # CONFIG_TIVA_TIMER is not set
+CONFIG_TIVA_HAVE_TIMER0=y
+CONFIG_TIVA_HAVE_TIMER1=y
+CONFIG_TIVA_HAVE_TIMER2=y
 CONFIG_TIVA_HAVE_TIMER3=y
 CONFIG_TIVA_HAVE_TIMER4=y
 CONFIG_TIVA_HAVE_TIMER5=y
 CONFIG_TIVA_HAVE_TIMER6=y
 CONFIG_TIVA_HAVE_TIMER7=y
+# CONFIG_TIVA_ADC0 is not set
+# CONFIG_TIVA_ADC1 is not set
 CONFIG_TIVA_I2C0=y
 # CONFIG_TIVA_I2C1 is not set
 # CONFIG_TIVA_I2C2 is not set
@@ -473,12 +481,7 @@ CONFIG_ARCH_PHY_INTERRUPT=y
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
-CONFIG_SENSORS=y
-# CONFIG_LIS331DL is not set
-# CONFIG_SENSORS_ADXL345 is not set
-CONFIG_I2C_LM75=y
-CONFIG_LM75=y
-# CONFIG_QENCODER is not set
+# CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
@@ -541,6 +544,7 @@ CONFIG_UART0_2STOP=0
 # System Logging
 #
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_CONSOLE is not set
 
 #
 # Networking Support
@@ -1109,12 +1113,8 @@ CONFIG_READLINE_ECHO=y
 #
 # Temperature
 #
-CONFIG_SYSTEM_LM75=y
-CONFIG_SYSTEM_LM75_DEVNAME="/dev/temp"
-CONFIG_SYSTEM_LM75_FAHRENHEIT=y
+# CONFIG_SYSTEM_LM75_FAHRENHEIT is not set
 # CONFIG_SYSTEM_LM75_CENTIGRADE is not set
-CONFIG_SYSTEM_LM75_STACKSIZE=1024
-CONFIG_SYSTEM_LM75_PRIORITY=100
 
 #
 # VI Work-Alike Editor