diff --git a/Documentation/README.html b/Documentation/README.html index 95102a004f4..4d87f55a673 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -265,16 +265,15 @@ | `- README.txt |- NxWidgets/ | `- README.txt - |- system/ - | |- i2c/README.txt - | |- free/README.txt - | `- install/README.txt - `- vsn/ - |- poweroff/README.txt - |- ramtron/README.txt - |- sdcard/README.txt - |- sysinfo/README.txt - `- README.txt + `- system/ + |- i2c/README.txt + |- free/README.txt + |- install/README.txt + |- poweroff/README.txt + |- ramtron/README.txt + |- sdcard/README.txt + |- sysinfo/README.txt + `- README.txt diff --git a/README.txt b/README.txt index 7477e0a2457..d60da2d8896 100644 --- a/README.txt +++ b/README.txt @@ -853,9 +853,8 @@ apps |- system/ | |- i2c/README.txt | |- free/README.txt - | `- install - | `- README.txt - |- vsn/ + | |- install + | | `- README.txt | |- poweroff | | `- README.txt | |- ramtron diff --git a/configs/compal_e88/nsh_highram/appconfig b/configs/compal_e88/nsh_highram/appconfig index 00921c3614a..4d12335c714 100644 --- a/configs/compal_e88/nsh_highram/appconfig +++ b/configs/compal_e88/nsh_highram/appconfig @@ -40,4 +40,4 @@ CONFIGURED_APPS += nshlib # Path to example in apps/examples CONFIGURED_APPS += examples/hello -CONFIGURED_APPS += vsn/poweroff +CONFIGURED_APPS += system/poweroff diff --git a/configs/compal_e99/nsh_compalram/appconfig b/configs/compal_e99/nsh_compalram/appconfig index 8df90adb0a6..e351d336662 100644 --- a/configs/compal_e99/nsh_compalram/appconfig +++ b/configs/compal_e99/nsh_compalram/appconfig @@ -40,4 +40,4 @@ CONFIGURED_APPS += examples/nsh # Path to example in apps/examples CONFIGURED_APPS += examples/hello -CONFIGURED_APPS += vsn/poweroff +CONFIGURED_APPS += system/poweroff diff --git a/configs/compal_e99/nsh_highram/appconfig b/configs/compal_e99/nsh_highram/appconfig index 241253f8cd1..db5e61236d9 100644 --- a/configs/compal_e99/nsh_highram/appconfig +++ b/configs/compal_e99/nsh_highram/appconfig @@ -41,7 +41,7 @@ CONFIGURED_APPS += nshlib # Path to example in apps/examples #CONFIGURED_APPS += examples/hello #fails not finding hello_main despite of good config -CONFIGURED_APPS += vsn/poweroff +CONFIGURED_APPS += system/poweroff CONFIGURED_APPS += examples/ostest CONFIGURED_APPS += examples/nxtext CONFIGURED_APPS += examples/nxhello diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig index d6aaae05a27..25e782dfeda 100644 --- a/configs/fire-stm32v2/nsh/defconfig +++ b/configs/fire-stm32v2/nsh/defconfig @@ -133,7 +133,6 @@ CONFIG_STM32_PWR=y CONFIG_STM32_SDIO=y CONFIG_STM32_SPI1=y # CONFIG_STM32_SPI2 is not set -# CONFIG_STM32_SPI4 is not set # CONFIG_STM32_TIM1 is not set # CONFIG_STM32_TIM2 is not set # CONFIG_STM32_TIM3 is not set @@ -189,11 +188,6 @@ CONFIG_SDIO_PRI=128 CONFIG_SDIO_DMAPRIO=0x00001000 # CONFIG_SDIO_WIDTH_D1_ONLY is not set -# -# Ethernet MAC configuration -# -CONFIG_STM32_PHYADDR=1 - # # USB Host Configuration # @@ -496,6 +490,11 @@ CONFIG_FAT_MAXFNAME=32 # # CONFIG_SYSLOG is not set +# +# Graphics Support +# +# CONFIG_NX is not set + # # Memory Management # @@ -974,12 +973,16 @@ CONFIG_NSH_DRIPADDR=0x0a000001 CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_NOMAC=y +# +# NxWidgets/NxWM +# + # # System NSH Add-Ons # # -# Custom free memory command +# Custom Free Memory Command # # CONFIG_SYSTEM_FREE is not set @@ -1001,19 +1004,27 @@ CONFIG_I2CTOOL_DEFFREQ=100000 # CONFIG_SYSTEM_INSTALL is not set # -# readline() support +# readline() # CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y # -# VSN board Add-Ons +# Power Off # +# CONFIG_SYSTEM_POWEROFF is not set # -# VSN board add-ons +# RAMTRON # -# CONFIG_VSN_POWEROFF is not set -# CONFIG_VSN_RAMTRON is not set -# CONFIG_VSN_SDCARD is not set -# CONFIG_VSN_SYSINFO is not set +# CONFIG_SYSTEM_RAMTRON is not set + +# +# SD Card +# +# CONFIG_SYSTEM_SDCARD is not set + +# +# Sysinfo +# +# CONFIG_SYSTEM_SYSINFO is not set diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig index 706881cc035..21b7fcf9060 100644 --- a/configs/shenzhou/nsh/defconfig +++ b/configs/shenzhou/nsh/defconfig @@ -132,7 +132,7 @@ CONFIG_STM32_ETHMAC=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y # CONFIG_STM32_SPI2 is not set -# CONFIG_STM32_SPI4 is not set +# CONFIG_STM32_SPI3 is not set # CONFIG_STM32_TIM1 is not set # CONFIG_STM32_TIM2 is not set # CONFIG_STM32_TIM3 is not set @@ -433,6 +433,11 @@ CONFIG_FAT_MAXFNAME=32 # # CONFIG_SYSLOG is not set +# +# Graphics Support +# +# CONFIG_NX is not set + # # Memory Management # @@ -895,12 +900,16 @@ CONFIG_NSH_DRIPADDR=0x0a000001 CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_NOMAC=y +# +# NxWidgets/NxWM +# + # # System NSH Add-Ons # # -# Custom free memory command +# Custom Free Memory Command # # CONFIG_SYSTEM_FREE is not set @@ -914,19 +923,27 @@ CONFIG_NSH_NOMAC=y # CONFIG_SYSTEM_INSTALL is not set # -# readline() support +# readline() # CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y # -# VSN board Add-Ons +# Power Off # +# CONFIG_SYSTEM_POWEROFF is not set # -# VSN board add-ons +# RAMTRON # -# CONFIG_VSN_POWEROFF is not set -# CONFIG_VSN_RAMTRON is not set -# CONFIG_VSN_SDCARD is not set -# CONFIG_VSN_SYSINFO is not set +# CONFIG_SYSTEM_RAMTRON is not set + +# +# SD Card +# +# CONFIG_SYSTEM_SDCARD is not set + +# +# Sysinfo +# +# CONFIG_SYSTEM_SYSINFO is not set diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index 1b21fbd1ba0..0bdc9f45c9d 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -1159,7 +1159,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5 # # -# Custom free memory command +# Custom Free Memory Command # # CONFIG_SYSTEM_FREE is not set @@ -1173,19 +1173,27 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5 # CONFIG_SYSTEM_INSTALL is not set # -# readline() support +# readline() # CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y # -# VSN board Add-Ons +# Power Off # +# CONFIG_SYSTEM_POWEROFF is not set # -# VSN board add-ons +# RAMTRON # -# CONFIG_VSN_POWEROFF is not set -# CONFIG_VSN_RAMTRON is not set -# CONFIG_VSN_SDCARD is not set -# CONFIG_VSN_SYSINFO is not set +# CONFIG_SYSTEM_RAMTRON is not set + +# +# SD Card +# +# CONFIG_SYSTEM_SDCARD is not set + +# +# Sysinfo +# +# CONFIG_SYSTEM_SYSINFO is not set diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig index 71dce1028bb..12075b89154 100644 --- a/configs/stm3240g-eval/discover/defconfig +++ b/configs/stm3240g-eval/discover/defconfig @@ -36,17 +36,22 @@ CONFIG_RAW_BINARY=y CONFIG_DEBUG=y # CONFIG_DEBUG_VERBOSE is not set # CONFIG_DEBUG_ENABLE is not set + +# +# Subsystem Debug Options +# # CONFIG_DEBUG_SCHED is not set # CONFIG_DEBUG_MM is not set CONFIG_DEBUG_NET=y -# CONFIG_DEBUG_USB is not set # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_LIB is not set # CONFIG_DEBUG_BINFMT is not set # CONFIG_DEBUG_GRAPHICS is not set + +# +# Driver Debug Options +# # CONFIG_DEBUG_I2C is not set -# CONFIG_DEBUG_SPI is not set -# CONFIG_DEBUG_WATCHDOG is not set # CONFIG_DEBUG_SYMBOLS is not set # @@ -179,6 +184,7 @@ CONFIG_STM32_USART3=y # CONFIG_STM32_UART5 is not set # CONFIG_STM32_USART6 is not set # CONFIG_STM32_WWDG is not set +CONFIG_STM32_I2C=y # # Alternate Pin Mapping @@ -191,6 +197,15 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set # CONFIG_STM32_CCMEXCLUDE is not set +# +# I2C Configuration +# +# CONFIG_STM32_I2C_DYNTIMEO is not set +CONFIG_STM32_I2CTIMEOSEC=0 +CONFIG_STM32_I2CTIMEOMS=500 +CONFIG_STM32_I2CTIMEOTICKS=500 +# CONFIG_STM32_I2C_DUTY16_9 is not set + # # Ethernet MAC configuration # @@ -198,13 +213,16 @@ CONFIG_STM32_PHYADDR=1 CONFIG_STM32_MII=y CONFIG_STM32_MII_MCO1=y # CONFIG_STM32_MII_MCO2 is not set +# CONFIG_STM32_MII_EXTCLK is not set CONFIG_STM32_AUTONEG=y CONFIG_STM32_PHYSR=16 +# CONFIG_STM32_PHYSR_ALTCONFIG is not set CONFIG_STM32_PHYSR_SPEED=0x0002 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 # CONFIG_STM32_ETH_PTP is not set +# CONFIG_STM32_ETHMAC_REGDEBUG is not set # # USB Host Configuration @@ -223,7 +241,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_SIZE=196608 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y -# CONFIG_ARCH_INTERRUPTSTACK is not set +CONFIG_ARCH_INTERRUPTSTACK=0 # # Boot options @@ -326,6 +344,8 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_WRITEREAD is not set CONFIG_I2C_POLLED=y # CONFIG_I2C_TRACE is not set +CONFIG_ARCH_HAVE_I2CRESET=y +# CONFIG_I2C_RESET is not set # CONFIG_SPI is not set # CONFIG_RTC is not set # CONFIG_WATCHDOG is not set @@ -377,6 +397,11 @@ CONFIG_USART3_2STOP=0 # Networking Support # CONFIG_NET=y +CONFIG_ARCH_HAVE_PHY=y +# CONFIG_PHY_KS8721 is not set +CONFIG_PHY_DP83848C=y +# CONFIG_PHY_LAN8720 is not set +# CONFIG_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set @@ -388,7 +413,7 @@ CONFIG_NET_BUFSIZE=650 CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_MAX_LISTENPORTS=40 -# CONFIG_NET_TCP_READAHEAD_BUFSIZE=562 +# CONFIG_NET_TCP_READAHEAD_BUFSIZE=650 CONFIG_NET_NTCP_READAHEAD_BUFFERS=16 CONFIG_NET_TCP_RECVDELAY=0 CONFIG_NET_TCPBACKLOG=y @@ -401,7 +426,7 @@ CONFIG_NET_ICMP_PING=y # CONFIG_NET_PINGADDRCONF is not set # CONFIG_NET_IGMP is not set CONFIG_NET_STATISTICS=y -# CONFIG_NET_RECEIVE_WINDOW=562 +# CONFIG_NET_RECEIVE_WINDOW=650 CONFIG_NET_ARPTAB_SIZE=16 CONFIG_NET_ARP_IPIN=y @@ -428,6 +453,11 @@ CONFIG_FAT_MAXFNAME=32 # # CONFIG_SYSLOG is not set +# +# Graphics Support +# +# CONFIG_NX is not set + # # Memory Management # @@ -725,6 +755,10 @@ CONFIG_EXAMPLE_DISCOVER_NETMASK=0xffffff00 # # CONFIG_EXAMPLES_WLAN is not set +# +# XML RPC Example +# + # # Interpreters # @@ -815,6 +849,11 @@ CONFIG_DISCOVER_INTERFACE="eth0" CONFIG_DISCOVER_DEVICE_CLASS=0xff CONFIG_CONFIG_DISCOVER_DESCR="STM3240G-EVAL" +# +# XML-RPC library +# +# CONFIG_NETUTILS_XMLRPC is not set + # # ModBus # @@ -829,12 +868,16 @@ CONFIG_CONFIG_DISCOVER_DESCR="STM3240G-EVAL" # # CONFIG_NSH_LIBRARY is not set +# +# NxWidgets/NxWM +# + # # System NSH Add-Ons # # -# Custom free memory command +# Custom Free Memory Command # # CONFIG_SYSTEM_FREE is not set @@ -849,18 +892,26 @@ CONFIG_CONFIG_DISCOVER_DESCR="STM3240G-EVAL" # CONFIG_SYSTEM_INSTALL is not set # -# readline() support +# readline() # # CONFIG_SYSTEM_READLINE is not set # -# VSN board Add-Ons +# Power Off # +# CONFIG_SYSTEM_POWEROFF is not set # -# VSN board add-ons +# RAMTRON # -# CONFIG_VSN_POWEROFF is not set -# CONFIG_VSN_RAMTRON is not set -# CONFIG_VSN_SDCARD is not set -# CONFIG_VSN_SYSINFO is not set +# CONFIG_SYSTEM_RAMTRON is not set + +# +# SD Card +# +# CONFIG_SYSTEM_SDCARD is not set + +# +# Sysinfo +# +# CONFIG_SYSTEM_SYSINFO is not set diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig index cd80ea618db..c2ba860fa41 100644 --- a/configs/stm3240g-eval/xmlrpc/defconfig +++ b/configs/stm3240g-eval/xmlrpc/defconfig @@ -36,17 +36,22 @@ CONFIG_RAW_BINARY=y CONFIG_DEBUG=y # CONFIG_DEBUG_VERBOSE is not set # CONFIG_DEBUG_ENABLE is not set + +# +# Subsystem Debug Options +# # CONFIG_DEBUG_SCHED is not set # CONFIG_DEBUG_MM is not set CONFIG_DEBUG_NET=y -# CONFIG_DEBUG_USB is not set # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_LIB is not set # CONFIG_DEBUG_BINFMT is not set # CONFIG_DEBUG_GRAPHICS is not set + +# +# Driver Debug Options +# # CONFIG_DEBUG_I2C is not set -# CONFIG_DEBUG_SPI is not set -# CONFIG_DEBUG_WATCHDOG is not set # CONFIG_DEBUG_SYMBOLS is not set # @@ -179,6 +184,7 @@ CONFIG_STM32_USART3=y # CONFIG_STM32_UART5 is not set # CONFIG_STM32_USART6 is not set # CONFIG_STM32_WWDG is not set +CONFIG_STM32_I2C=y # # Alternate Pin Mapping @@ -191,6 +197,15 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set # CONFIG_STM32_CCMEXCLUDE is not set +# +# I2C Configuration +# +# CONFIG_STM32_I2C_DYNTIMEO is not set +CONFIG_STM32_I2CTIMEOSEC=0 +CONFIG_STM32_I2CTIMEOMS=500 +CONFIG_STM32_I2CTIMEOTICKS=500 +# CONFIG_STM32_I2C_DUTY16_9 is not set + # # Ethernet MAC configuration # @@ -201,11 +216,13 @@ CONFIG_STM32_MII_MCO1=y # CONFIG_STM32_MII_EXTCLK is not set CONFIG_STM32_AUTONEG=y CONFIG_STM32_PHYSR=16 +# CONFIG_STM32_PHYSR_ALTCONFIG is not set CONFIG_STM32_PHYSR_SPEED=0x0002 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 # CONFIG_STM32_ETH_PTP is not set +# CONFIG_STM32_ETHMAC_REGDEBUG is not set # # USB Host Configuration @@ -224,7 +241,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_SIZE=196608 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y -# CONFIG_ARCH_INTERRUPTSTACK is not set +CONFIG_ARCH_INTERRUPTSTACK=0 # # Boot options @@ -319,6 +336,8 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_WRITEREAD is not set CONFIG_I2C_POLLED=y # CONFIG_I2C_TRACE is not set +CONFIG_ARCH_HAVE_I2CRESET=y +# CONFIG_I2C_RESET is not set # CONFIG_SPI is not set # CONFIG_RTC is not set # CONFIG_WATCHDOG is not set @@ -371,6 +390,11 @@ CONFIG_USART3_2STOP=0 # Networking Support # CONFIG_NET=y +CONFIG_ARCH_HAVE_PHY=y +# CONFIG_PHY_KS8721 is not set +CONFIG_PHY_DP83848C=y +# CONFIG_PHY_LAN8720 is not set +# CONFIG_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set @@ -382,7 +406,7 @@ CONFIG_NET_BUFSIZE=650 CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_MAX_LISTENPORTS=40 -# CONFIG_NET_TCP_READAHEAD_BUFSIZE=562 +# CONFIG_NET_TCP_READAHEAD_BUFSIZE=650 CONFIG_NET_NTCP_READAHEAD_BUFFERS=16 CONFIG_NET_TCP_RECVDELAY=0 CONFIG_NET_TCPBACKLOG=y @@ -395,7 +419,7 @@ CONFIG_NET_ICMP_PING=y # CONFIG_NET_PINGADDRCONF is not set # CONFIG_NET_IGMP is not set CONFIG_NET_STATISTICS=y -# CONFIG_NET_RECEIVE_WINDOW=562 +# CONFIG_NET_RECEIVE_WINDOW=650 CONFIG_NET_ARPTAB_SIZE=16 CONFIG_NET_ARP_IPIN=y @@ -422,6 +446,11 @@ CONFIG_FAT_MAXFNAME=32 # # CONFIG_SYSLOG is not set +# +# Graphics Support +# +# CONFIG_NX is not set + # # Memory Management # @@ -829,12 +858,16 @@ CONFIG_XMLRPC_STRINGSIZE=64 # # CONFIG_NSH_LIBRARY is not set +# +# NxWidgets/NxWM +# + # # System NSH Add-Ons # # -# Custom free memory command +# Custom Free Memory Command # # CONFIG_SYSTEM_FREE is not set @@ -849,18 +882,26 @@ CONFIG_XMLRPC_STRINGSIZE=64 # CONFIG_SYSTEM_INSTALL is not set # -# readline() support +# readline() # # CONFIG_SYSTEM_READLINE is not set # -# VSN board Add-Ons +# Power Off # +# CONFIG_SYSTEM_POWEROFF is not set # -# VSN board add-ons +# RAMTRON # -# CONFIG_VSN_POWEROFF is not set -# CONFIG_VSN_RAMTRON is not set -# CONFIG_VSN_SDCARD is not set -# CONFIG_VSN_SYSINFO is not set +# CONFIG_SYSTEM_RAMTRON is not set + +# +# SD Card +# +# CONFIG_SYSTEM_SDCARD is not set + +# +# Sysinfo +# +# CONFIG_SYSTEM_SYSINFO is not set diff --git a/configs/vsn/nsh/appconfig b/configs/vsn/nsh/appconfig index a070590790e..9b1e72bd449 100755 --- a/configs/vsn/nsh/appconfig +++ b/configs/vsn/nsh/appconfig @@ -53,19 +53,19 @@ CONFIGURED_APPS += nshlib # Individual selection of built-in applications: # Provide poweroff command to switch off the board -CONFIGURED_APPS += vsn/poweroff +CONFIGURED_APPS += system/poweroff # Provide SDcard tool -CONFIGURED_APPS += vsn/sdcard +CONFIGURED_APPS += system/sdcard # Provide RAMTRON tool -CONFIGURED_APPS += vsn/ramtron +CONFIGURED_APPS += system/ramtron # Provide System Information Utilityu -CONFIGURED_APPS += vsn/sysinfo +CONFIGURED_APPS += system/sysinfo # Provide JAVA Virtual Machine (the Darjeeling JVM) -#CONFIGURED_APPS += vsn/jvm +#CONFIGURED_APPS += system/jvm # Provide UNIX style free CONFIGURED_APPS += system/free