diff --git a/configs/detron/wlan/defconfig b/configs/detron/wlan/defconfig index d173298caa2..3e6f6017719 100755 --- a/configs/detron/wlan/defconfig +++ b/configs/detron/wlan/defconfig @@ -53,7 +53,7 @@ # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) # CONFIG_DRAM_END - Last address+1 of installed RAM -# CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization +# CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt # stack in bytes. If not defined, the user task stacks will be @@ -208,6 +208,7 @@ CONFIG_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y +CONFIG_NET_REGDEBUG=n # # General build options @@ -333,9 +334,9 @@ CONFIG_ARCH_LOWPUTC=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_INSTRUMENTATION=n CONFIG_TASK_NAME_SIZE=0 -CONFIG_START_YEAR=2010 -CONFIG_START_MONTH=12 -CONFIG_START_DAY=22 +CONFIG_START_YEAR=2011 +CONFIG_START_MONTH=3 +CONFIG_START_DAY=6 CONFIG_GREGORIAN_TIME=n CONFIG_JULIAN_TIME=n CONFIG_DEV_CONSOLE=y @@ -530,16 +531,17 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_BROADCAST - Broadcast support # CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET_WLAN - Enable or disable WLAN network interface # -CONFIG_NET=n +CONFIG_NET=y CONFIG_NET_IPv6=n -CONFIG_NSOCKET_DESCRIPTORS=0 +CONFIG_NSOCKET_DESCRIPTORS=2 CONFIG_NET_SOCKOPTS=y CONFIG_NET_BUFSIZE=420 -CONFIG_NET_TCP=n +CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_UDP=n +CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y #CONFIG_NET_UDP_CONNS=10 CONFIG_NET_ICMP=n @@ -551,6 +553,7 @@ CONFIG_NET_STATISTICS=y CONFIG_NET_BROADCAST=n #CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 +CONFIG_NET_WLAN=y # # UIP Network Utilities diff --git a/configs/olimex-lpc1766stk/wlan/defconfig b/configs/olimex-lpc1766stk/wlan/defconfig index 33d869bf119..e676a66ca12 100755 --- a/configs/olimex-lpc1766stk/wlan/defconfig +++ b/configs/olimex-lpc1766stk/wlan/defconfig @@ -207,9 +207,6 @@ CONFIG_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y -CONFIG_NET_EMACRAM_SIZE=8192 -CONFIG_NET_NTXDESC=7 -CONFIG_NET_NRXDESC=7 CONFIG_NET_REGDEBUG=n # @@ -336,9 +333,9 @@ CONFIG_ARCH_LOWPUTC=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_INSTRUMENTATION=n CONFIG_TASK_NAME_SIZE=0 -CONFIG_START_YEAR=2010 -CONFIG_START_MONTH=11 -CONFIG_START_DAY=10 +CONFIG_START_YEAR=2011 +CONFIG_START_MONTH=3 +CONFIG_START_DAY=6 CONFIG_GREGORIAN_TIME=n CONFIG_JULIAN_TIME=n CONFIG_DEV_CONSOLE=y @@ -533,22 +530,21 @@ CONFIG_MMCSD_HAVECARDDETECT=n # CONFIG_NET_BROADCAST - Broadcast support # CONFIG_NET_LLH_LEN - The link level header length # CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates +# CONFIG_NET_WLAN - Enable or disable WLAN network interface # -CONFIG_NET=n +CONFIG_NET=y CONFIG_NET_IPv6=n -CONFIG_NSOCKET_DESCRIPTORS=8 +CONFIG_NSOCKET_DESCRIPTORS=2 CONFIG_NET_SOCKOPTS=y -CONFIG_NET_BUFSIZE=562 +CONFIG_NET_BUFSIZE=420 CONFIG_NET_TCP=y -CONFIG_NET_TCP_CONNS=8 -CONFIG_NET_NTCP_READAHEAD_BUFFERS=16 -CONFIG_NET_TCPBACKLOG=n -CONFIG_NET_MAX_LISTENPORTS=8 +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -#CONFIG_NET_UDP_CONNS=8 -CONFIG_NET_ICMP=y -CONFIG_NET_ICMP_PING=y +#CONFIG_NET_UDP_CONNS=10 +CONFIG_NET_ICMP=n +CONFIG_NET_ICMP_PING=n #CONFIG_NET_PINGADDRCONF=0 CONFIG_NET_STATISTICS=y #CONFIG_NET_RECEIVE_WINDOW= @@ -556,6 +552,7 @@ CONFIG_NET_STATISTICS=y CONFIG_NET_BROADCAST=n #CONFIG_NET_LLH_LEN=14 #CONFIG_NET_FWCACHE_SIZE=2 +CONFIG_NET_WLAN=y # # UIP Network Utilities @@ -657,7 +654,7 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0 # CONFIG_USBHOST_OHCIRAM_SIZE=1536 CONFIG_USBHOST_NEDS=2 -CONFIG_USBHOST_NTDS=3 +CONFIG_USBHOST_NTDS=2 CONFIG_USBHOST_TDBUFFERS=3 CONFIG_USBHOST_TDBUFSIZE=128 CONFIG_USBHOST_IOBUFSIZE=512 @@ -761,11 +758,11 @@ CONFIG_EXAMPLE_UIP_DHCPC=n # CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n -CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_NOMAC=n +CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) # # Settings for examples/ostest @@ -817,11 +814,11 @@ CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n CONFIG_EXAMPLES_NSH_DISABLEBG=n CONFIG_EXAMPLES_NSH_ROMFSETC=n CONFIG_EXAMPLES_NSH_CONSOLE=y -CONFIG_EXAMPLES_NSH_TELNET=y +CONFIG_EXAMPLES_NSH_TELNET=n CONFIG_EXAMPLES_NSH_ARCHINIT=y CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512 CONFIG_EXAMPLES_NSH_DHCPC=n -CONFIG_EXAMPLES_NSH_NOMAC=y +CONFIG_EXAMPLES_NSH_NOMAC=n CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0) @@ -837,7 +834,7 @@ CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp # # Architecture-specific NSH options # -CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1 +CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0 CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 diff --git a/configs/qemu-i486/README.txt b/configs/qemu-i486/README.txt index d4c418ed884..32cbfa76f44 100644 --- a/configs/qemu-i486/README.txt +++ b/configs/qemu-i486/README.txt @@ -4,6 +4,53 @@ README This README file describes the contents of the build configurations available for the NuttX QEMU i486 port. +Contents +^^^^^^^^ + + * QEMU + * Configurations + +QEMU +^^^^ + +QEMU is a generic and open source machine emulator and virtualizer. Here are +some links (which are mostly outdated by the time your read this): + + Home Page: http://wiki.qemu.org/Main_Page + Downloads: http://wiki.qemu.org/Download + Documentation: http://wiki.qemu.org/Manual + Usage: qemu -nographic -kernel nuttx.elf + +Building QEMU: + + tar zxf qemu-0.14.0.tar.gz + cd qemu-0.14.0 + ./configure + make + make install + +Cygwin build problems: + + Error: + + "gcc: The -mno-cygwin flag has been removed; use a mingw-targeted cross-compiler." + + Workaround: + + None known. It does not seem possible to build QEMU using the Cygwin gcc. + I tried editing configure. Removing the following line will allow QEMU to + configure: + + QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS" + + However, it then fails later during the compilation phase. + + Recommendation: + + 1. Google for "qemu windows download" and download some pre-built QEMU + binaries. I found 0.14.0 here: http://dietpc.org/windows/qemu/, or + 2. Try building QEMU with MingGW + Configurations ^^^^^^^^^^^^^^ diff --git a/configs/qemu-i486/ostest/ld.script b/configs/qemu-i486/ostest/ld.script index 209a0089ac1..cf4e40cb0ce 100755 --- a/configs/qemu-i486/ostest/ld.script +++ b/configs/qemu-i486/ostest/ld.script @@ -48,6 +48,7 @@ SECTIONS .text ALIGN (0x1000) : { _srodata = ABSOLUTE(.); *(.rodata .rodata.*) + *(.rdata .rdata.*) *(.fixup) *(.gnu.warning) *(.glue_7)