summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-13 21:18:54 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-13 21:18:54 +0000
commita4b7d2553cac6f7234d83f6ee6e68a590000fac8 (patch)
treeffd635dd6f22835282a68dd92e5a1f8618d92f60
parentef40b28c14d79fe53c89684f8be4f0c19d76474f (diff)
Fixed ARM.exidx in all Eagle100 linker scripts; Enabled networking in the Eagle100 NSH configuration
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4389 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rw-r--r--nuttx/configs/eagle100/httpd/ld.script16
-rw-r--r--nuttx/configs/eagle100/nettest/defconfig4
-rw-r--r--nuttx/configs/eagle100/nettest/ld.script16
-rw-r--r--nuttx/configs/eagle100/nsh/appconfig13
-rw-r--r--nuttx/configs/eagle100/nsh/defconfig44
-rw-r--r--nuttx/configs/eagle100/nsh/ld.script16
-rw-r--r--nuttx/configs/eagle100/nxflat/ld.script16
-rw-r--r--nuttx/configs/eagle100/ostest/defconfig4
-rw-r--r--nuttx/configs/eagle100/ostest/ld.script16
-rw-r--r--nuttx/configs/eagle100/src/up_nsh.c4
-rw-r--r--nuttx/configs/eagle100/thttpd/defconfig4
-rw-r--r--nuttx/configs/eagle100/thttpd/ld.script16
-rwxr-xr-xnuttx/configs/lm3s6965-ek/README.txt5
13 files changed, 101 insertions, 73 deletions
diff --git a/nuttx/configs/eagle100/httpd/ld.script b/nuttx/configs/eagle100/httpd/ld.script
index 080fb47fb6..24e9c90b72 100644
--- a/nuttx/configs/eagle100/httpd/ld.script
+++ b/nuttx/configs/eagle100/httpd/ld.script
@@ -1,8 +1,8 @@
/****************************************************************************
* configs/eagle100/httpd/ld.script
*
- * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,6 +66,12 @@ SECTIONS
_etext = ABSOLUTE(.);
} > flash
+ __exidx_start = ABSOLUTE(.);
+ .ARM.exidx : {
+ *(.ARM.exidx*)
+ } > flash
+ __exidx_end = ABSOLUTE(.);
+
_eronly = ABSOLUTE(.);
/* The LM3S6918 has 64Kb of SRAM beginning at the following address */
@@ -82,12 +88,6 @@ SECTIONS
*(.ARM.extab*)
} >sram
- __exidx_start = ABSOLUTE(.);
- .ARM.exidx : {
- *(.ARM.exidx*)
- } >sram
- __exidx_end = ABSOLUTE(.);
-
.bss : {
_sbss = ABSOLUTE(.);
*(.bss .bss.*)
diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig
index a21a608cd7..b2772c2a8c 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/configs/eagle100/nettest/defconfig
@@ -1,8 +1,8 @@
############################################################################
# configs/eagle100/nettest/defconfig
#
-# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/eagle100/nettest/ld.script b/nuttx/configs/eagle100/nettest/ld.script
index 8fcc01f422..4997200af6 100644
--- a/nuttx/configs/eagle100/nettest/ld.script
+++ b/nuttx/configs/eagle100/nettest/ld.script
@@ -1,8 +1,8 @@
/****************************************************************************
* configs/eagle100/nettest/ld.script
*
- * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,6 +66,12 @@ SECTIONS
_etext = ABSOLUTE(.);
} > flash
+ __exidx_start = ABSOLUTE(.);
+ .ARM.exidx : {
+ *(.ARM.exidx*)
+ } > flash
+ __exidx_end = ABSOLUTE(.);
+
_eronly = ABSOLUTE(.);
/* The LM3S6918 has 64Kb of SRAM beginning at the following address */
@@ -82,12 +88,6 @@ SECTIONS
*(.ARM.extab*)
} >sram
- __exidx_start = ABSOLUTE(.);
- .ARM.exidx : {
- *(.ARM.exidx*)
- } >sram
- __exidx_end = ABSOLUTE(.);
-
.bss : {
_sbss = ABSOLUTE(.);
*(.bss .bss.*)
diff --git a/nuttx/configs/eagle100/nsh/appconfig b/nuttx/configs/eagle100/nsh/appconfig
index 20f9e8f829..dafc33b8aa 100644
--- a/nuttx/configs/eagle100/nsh/appconfig
+++ b/nuttx/configs/eagle100/nsh/appconfig
@@ -42,3 +42,16 @@ CONFIGURED_APPS += examples/nsh
CONFIGURED_APPS += system/readline
CONFIGURED_APPS += nshlib
+# Networking support
+
+ifeq ($(CONFIG_NET),y)
+CONFIGURED_APPS += netutils/uiplib
+CONFIGURED_APPS += netutils/dhcpc
+CONFIGURED_APPS += netutils/resolv
+CONFIGURED_APPS += netutils/tftpc
+CONFIGURED_APPS += netutils/webclient
+ifeq ($(CONFIG_NSH_TELNET),y)
+CONFIGURED_APPS += netutils/telnetd
+endif
+endif
+
diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index d44f5b4f32..292de0c6b9 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/configs/eagle100/nsh/defconfig
@@ -1,8 +1,8 @@
############################################################################
# configs/eagle100/nsh/defconfig
#
-# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -167,7 +167,7 @@ CONFIG_SSI_POLLWAIT=y
# CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
# CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
#
-CONFIG_LM3S_ETHERNET=n
+CONFIG_LM3S_ETHERNET=y
CONFIG_LM3S_ETHLEDS=n
CONFIG_LM3S_BOARDMAC=y
CONFIG_LM3S_ETHHDUPLEX=n
@@ -272,14 +272,17 @@ CONFIG_HAVE_LIBM=n
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_DEBUG_NET=n
+CONFIG_DEBUG_FS=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_INSTRUMENTATION=n
CONFIG_TASK_NAME_SIZE=0
-CONFIG_START_YEAR=2009
-CONFIG_START_MONTH=5
-CONFIG_START_DAY=6
+CONFIG_START_YEAR=2012
+CONFIG_START_MONTH=2
+CONFIG_START_DAY=13
+CONFIG_GREGORIAN_TIME=n
CONFIG_JULIAN_TIME=n
CONFIG_DEV_CONSOLE=y
CONFIG_DEV_LOWCONSOLE=n
@@ -396,6 +399,7 @@ CONFIG_PREALLOC_TIMERS=4
# CONFIG_FS_FAT - Enable FAT filesystem support
# CONFIG_FAT_SECTORSIZE - Max supported sector size
# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+#
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=n
@@ -439,19 +443,21 @@ CONFIG_MMCSD_SPICLOCK=12500000
# CONFIG_NET_BROADCAST - Broadcast support
# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
#
-CONFIG_NET=n
+CONFIG_NET=y
CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
+CONFIG_NSOCKET_DESCRIPTORS=8
CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
+CONFIG_NET_BUFSIZE=562
+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_UDP=y
CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
+#CONFIG_NET_UDP_CONNS=8
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_PING=y
#CONFIG_NET_PINGADDRCONF=0
CONFIG_NET_STATISTICS=y
#CONFIG_NET_RECEIVE_WINDOW=
@@ -495,6 +501,9 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
#
# Settings for apps/nshlib
#
+# CONFIG_NSH_BUILTIN_APPS - Support external registered,
+# "named" applications that can be executed from the NSH
+# command line (see apps/README.txt for more information).
# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
# CONFIG_NSH_STRERROR - Use strerror(errno)
# CONFIG_NSH_LINELEN - Maximum length of one command line
@@ -525,6 +534,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
#
+CONFIG_NSH_BUILTIN_APPS=n
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_STRERROR=n
CONFIG_NSH_LINELEN=64
@@ -533,7 +543,7 @@ CONFIG_NSH_DISABLESCRIPT=n
CONFIG_NSH_DISABLEBG=n
CONFIG_NSH_ROMFSETC=n
CONFIG_NSH_CONSOLE=y
-CONFIG_NSH_TELNET=n
+CONFIG_NSH_TELNET=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_IOBUFFER_SIZE=512
CONFIG_NSH_DHCPC=n
diff --git a/nuttx/configs/eagle100/nsh/ld.script b/nuttx/configs/eagle100/nsh/ld.script
index d7b6316d56..cdf1a4110d 100644
--- a/nuttx/configs/eagle100/nsh/ld.script
+++ b/nuttx/configs/eagle100/nsh/ld.script
@@ -1,8 +1,8 @@
/****************************************************************************
* configs/eagle100/nsh/ld.script
*
- * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,6 +66,12 @@ SECTIONS
_etext = ABSOLUTE(.);
} > flash
+ __exidx_start = ABSOLUTE(.);
+ .ARM.exidx : {
+ *(.ARM.exidx*)
+ } > flash
+ __exidx_end = ABSOLUTE(.);
+
_eronly = ABSOLUTE(.);
/* The LM3S6918 has 64Kb of SRAM beginning at the following address */
@@ -82,12 +88,6 @@ SECTIONS
*(.ARM.extab*)
} >sram
- __exidx_start = ABSOLUTE(.);
- .ARM.exidx : {
- *(.ARM.exidx*)
- } >sram
- __exidx_end = ABSOLUTE(.);
-
.bss : {
_sbss = ABSOLUTE(.);
*(.bss .bss.*)
diff --git a/nuttx/configs/eagle100/nxflat/ld.script b/nuttx/configs/eagle100/nxflat/ld.script
index aa3a30a62e..153e777b5f 100644
--- a/nuttx/configs/eagle100/nxflat/ld.script
+++ b/nuttx/configs/eagle100/nxflat/ld.script
@@ -1,8 +1,8 @@
/****************************************************************************
* configs/eagle100/nxflat/ld.script
*
- * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,6 +66,12 @@ SECTIONS
_etext = ABSOLUTE(.);
} > flash
+ __exidx_start = ABSOLUTE(.);
+ .ARM.exidx : {
+ *(.ARM.exidx*)
+ } > flash
+ __exidx_end = ABSOLUTE(.);
+
_eronly = ABSOLUTE(.);
/* The LM3S6918 has 64Kb of SRAM beginning at the following address */
@@ -82,12 +88,6 @@ SECTIONS
*(.ARM.extab*)
} >sram
- __exidx_start = ABSOLUTE(.);
- .ARM.exidx : {
- *(.ARM.exidx*)
- } >sram
- __exidx_end = ABSOLUTE(.);
-
.bss : {
_sbss = ABSOLUTE(.);
*(.bss .bss.*)
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 91f6dca425..312f3cd9df 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -1,8 +1,8 @@
############################################################################
# configs/eagle100/ostest/defconfig
#
-# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/eagle100/ostest/ld.script b/nuttx/configs/eagle100/ostest/ld.script
index 747d7c2a03..10c2f0cfad 100644
--- a/nuttx/configs/eagle100/ostest/ld.script
+++ b/nuttx/configs/eagle100/ostest/ld.script
@@ -1,8 +1,8 @@
/****************************************************************************
* configs/eagle100/ostest/ld.script
*
- * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,6 +66,12 @@ SECTIONS
_etext = ABSOLUTE(.);
} > flash
+ __exidx_start = ABSOLUTE(.);
+ .ARM.exidx : {
+ *(.ARM.exidx*)
+ } > flash
+ __exidx_end = ABSOLUTE(.);
+
_eronly = ABSOLUTE(.);
/* The LM3S6918 has 64Kb of SRAM beginning at the following address */
@@ -82,12 +88,6 @@ SECTIONS
*(.ARM.extab*)
} >sram
- __exidx_start = ABSOLUTE(.);
- .ARM.exidx : {
- *(.ARM.exidx*)
- } >sram
- __exidx_end = ABSOLUTE(.);
-
.bss : {
_sbss = ABSOLUTE(.);
*(.bss .bss.*)
diff --git a/nuttx/configs/eagle100/src/up_nsh.c b/nuttx/configs/eagle100/src/up_nsh.c
index 31d9adebd8..e2e6b42f23 100644
--- a/nuttx/configs/eagle100/src/up_nsh.c
+++ b/nuttx/configs/eagle100/src/up_nsh.c
@@ -2,8 +2,8 @@
* config/eagle100/src/up_nsh.c
* arch/arm/src/board/up_nsh.c
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig
index 2f53e4eb4c..60b15ad831 100644
--- a/nuttx/configs/eagle100/thttpd/defconfig
+++ b/nuttx/configs/eagle100/thttpd/defconfig
@@ -1,8 +1,8 @@
############################################################################
# configs/eagle100/thttpd/defconfig
#
-# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/eagle100/thttpd/ld.script b/nuttx/configs/eagle100/thttpd/ld.script
index 282eed92a3..7a1d7c75d8 100644
--- a/nuttx/configs/eagle100/thttpd/ld.script
+++ b/nuttx/configs/eagle100/thttpd/ld.script
@@ -1,8 +1,8 @@
/****************************************************************************
* configs/eagle100/thttpd/ld.script
*
- * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,6 +66,12 @@ SECTIONS
_etext = ABSOLUTE(.);
} > flash
+ __exidx_start = ABSOLUTE(.);
+ .ARM.exidx : {
+ *(.ARM.exidx*)
+ } > flash
+ __exidx_end = ABSOLUTE(.);
+
_eronly = ABSOLUTE(.);
/* The LM3S6918 has 64Kb of SRAM beginning at the following address */
@@ -82,12 +88,6 @@ SECTIONS
*(.ARM.extab*)
} >sram
- __exidx_start = ABSOLUTE(.);
- .ARM.exidx : {
- *(.ARM.exidx*)
- } >sram
- __exidx_end = ABSOLUTE(.);
-
.bss : {
_sbss = ABSOLUTE(.);
*(.bss .bss.*)
diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt
index e383d4046f..122ef816ae 100755
--- a/nuttx/configs/lm3s6965-ek/README.txt
+++ b/nuttx/configs/lm3s6965-ek/README.txt
@@ -175,6 +175,11 @@ GNU Toolchain Options
the paths to Cygwin's /bin and /usr/bin directories appear BEFORE the devkitARM
path or will get the wrong version of make.
+ NOTE 3: I recently (i.e., late 2011) tried building with the CodeSourcery Windows
+ toolchain. The code worked but required 40 seconds to boot (or even until the
+ status LED illuminates)!! Know idea why. With the buildroot tools, boot time is
+ a couple of seconds.
+
IDEs
^^^^