From ce9b97b8f5847d93162f67562197292504593013 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 26 Aug 2012 23:29:37 +0000 Subject: [PATCH 1/5] More patches/bugfixes from Kate git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5056 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- apps/ChangeLog.txt | 2 ++ apps/nshlib/nsh_parse.c | 2 +- nuttx/ChangeLog | 8 ++++++++ nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 20 ++++++++++++++++++++ nuttx/sched/sched_setuptaskfiles.c | 4 ++-- nuttx/syscall/syscall.csv | 4 ++-- 6 files changed, 35 insertions(+), 5 deletions(-) diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 6c151ae50f..0f60338a49 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -283,4 +283,6 @@ * apps/netutils/thttpd/thttpd_cgi.c: Missing NULL in argv[] list (contributed by Kate). + * apps/nshlib/nsh_parse.c: CONFIG_NSH_DISABLE_WGET not CONFIG_NSH_DISABLE_GET + in one location (found by Kate). diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c index 165f842fc3..ba597a0628 100644 --- a/apps/nshlib/nsh_parse.c +++ b/apps/nshlib/nsh_parse.c @@ -370,7 +370,7 @@ static const struct cmdmap_s g_cmdmap[] = #endif #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_NSH_DISABLE_GET +# ifndef CONFIG_NSH_DISABLE_WGET { "wget", cmd_wget, 2, 4, "[-o ] " }, # endif #endif diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index cb7f4079df..c4e914658e 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3185,3 +3185,11 @@ This list handling was probably causing errors reported by Mike Smith * sched/sched_waitpid.c: Fix a possible issue with logic logic that should be brought into a critical section (suggested by Mike Smith) + * sched/sched_setuptaskfiles.c: Should be 'struct socket' not + 'struct sockets'. How did this compile before? (found by Kate) + * syscall/syscall.csv: Fix prototype for usleep() and prctl() (also + from Kate). + * arch/arm/src/lpc17xx/lpc17_ethernet.c: Conditionally elide setting PHY + speed/duplex. This does not work for certain PHYs. Still some unresolved + issues (also from Kate). + diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index a3bc9d9515..6d927892bb 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -2100,9 +2100,29 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv) /* Disable auto-configuration. Set the fixed speed/duplex mode. * (probably more than little redundant). + * + * REVISIT: Revisit the following CONFIG_PHY_CEMENT_DISABLE work-around: + * + * "... I found this using a LPC1768 dev board with a DP83848I PHY. I'm + * using CONFIG_PHY_DP83848C for that ... I found that a static + * configuration for the PHY gave errors. I didn't investigate why. + * + * "My problem however was that autonegotiation seemingly failed - + * however on debugging I saw the calls for autonegotation were actually + * successful. I tracked the code down to [the following logic] and + * I saw that after the negotation completes, those negotiated + * parameters are then used to set a fixed speed and duplex, "just + * in case". It was that setting of a static configuration which + * failed for me." + * + * "I'm not sure if that's required for other situations or not, so I + * added a #define to optionally elide the call to cement the + * configuration. My PHY appears to be happy with this for the moment." */ +#ifndef CONFIG_PHY_CEMENT_DISABLE ret = lpc17_phymode(phyaddr, priv->lp_mode); +#endif lpc17_showmii(phyaddr, "After final configuration"); return ret; } diff --git a/nuttx/sched/sched_setuptaskfiles.c b/nuttx/sched/sched_setuptaskfiles.c index 7f754e1514..fe0b14143d 100644 --- a/nuttx/sched/sched_setuptaskfiles.c +++ b/nuttx/sched/sched_setuptaskfiles.c @@ -148,8 +148,8 @@ static inline void sched_dupsockets(FAR _TCB *tcb) /* The parent task is the one at the head of the ready-to-run list */ FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; - FAR struct sockets *parent; - FAR struct sockets *child; + FAR struct socket *parent; + FAR struct socket *child; int i; /* Duplicate the socket descriptors of all sockets opened by the parent diff --git a/nuttx/syscall/syscall.csv b/nuttx/syscall/syscall.csv index 22b45df9da..4ccd53f9d6 100644 --- a/nuttx/syscall/syscall.csv +++ b/nuttx/syscall/syscall.csv @@ -40,7 +40,7 @@ "open","fcntl.h","CONFIG_NFILE_DESCRIPTORS > 0","int","const char*","int","..." "opendir","dirent.h","CONFIG_NFILE_DESCRIPTORS > 0","FAR DIR*","FAR const char*" "pipe","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int [2]|int*" -"prctl", sys/prctl.h, "CONFIG_TASK_NAME_SIZE > 0","int","int","..." +"prctl","sys/prctl.h", "CONFIG_TASK_NAME_SIZE > 0","int","int","..." "clock_systimer","nuttx/clock.h","!defined(CONFIG_DISABLE_CLOCK)","uint32_t" "poll","poll.h","!defined(CONFIG_DISABLE_POLL) && (CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0)","int","FAR struct pollfd*","nfds_t","int" "pthread_barrier_destroy","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_barrier_t*" @@ -135,7 +135,7 @@ #"up_assert","assert.h","","void" "up_assert_code","assert.h","","void","FAR const uint8_t*","int","int" #"up_assert_code","assert.h","","void","int" -"usleep","unistd.h","!defined(CONFIG_DISABLE_SIGNALS)","void","useconds_t" +"usleep","unistd.h","!defined(CONFIG_DISABLE_SIGNALS)","int","useconds_t" #"wait","sys/wait.h","","pid_t","int*" #"waitid","sys/wait.h","","int","idtype_t","id_t id","siginfo_t*","int" "waitpid","sys/wait.h","defined(CONFIG_SCHED_WAITPID)","pid_t","pid_t","int*","int" From ba1adb705f9548c38be2964ae1c1b05cd463c68e Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 27 Aug 2012 14:07:17 +0000 Subject: [PATCH 2/5] Dequote Kconfig strings that may be used as components of a path git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5057 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/Makefile | 1 + nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 21 ++-------- nuttx/configs/amber/hello/Make.defs | 1 + nuttx/configs/avr32dev1/nsh/Make.defs | 1 + nuttx/configs/avr32dev1/ostest/Make.defs | 1 + nuttx/configs/c5471evm/httpd/Make.defs | 1 + nuttx/configs/c5471evm/nettest/Make.defs | 1 + nuttx/configs/c5471evm/nsh/Make.defs | 1 + nuttx/configs/c5471evm/ostest/Make.defs | 1 + .../configs/compal_e88/nsh_highram/Make.defs | 1 + .../compal_e99/nsh_compalram/Make.defs | 1 + .../configs/compal_e99/nsh_highram/Make.defs | 1 + nuttx/configs/demo9s12ne64/ostest/Make.defs | 1 + nuttx/configs/ea3131/nsh/Make.defs | 1 + nuttx/configs/ea3131/ostest/Make.defs | 1 + nuttx/configs/ea3131/pgnsh/Make.defs | 1 + nuttx/configs/ea3131/usbserial/Make.defs | 1 + nuttx/configs/ea3131/usbstorage/Make.defs | 1 + nuttx/configs/ea3152/ostest/Make.defs | 1 + nuttx/configs/eagle100/httpd/Make.defs | 1 + nuttx/configs/eagle100/nettest/Make.defs | 1 + nuttx/configs/eagle100/nsh/Make.defs | 1 + nuttx/configs/eagle100/nxflat/Make.defs | 1 + nuttx/configs/eagle100/ostest/Make.defs | 1 + nuttx/configs/eagle100/thttpd/Make.defs | 1 + nuttx/configs/ekk-lm3s9b96/nsh/Make.defs | 1 + nuttx/configs/ekk-lm3s9b96/ostest/Make.defs | 1 + .../configs/ez80f910200kitg/ostest/Make.defs | 1 + nuttx/configs/ez80f910200zco/dhcpd/Make.defs | 1 + nuttx/configs/ez80f910200zco/httpd/Make.defs | 1 + .../configs/ez80f910200zco/nettest/Make.defs | 1 + nuttx/configs/ez80f910200zco/nsh/Make.defs | 1 + nuttx/configs/ez80f910200zco/ostest/Make.defs | 1 + nuttx/configs/ez80f910200zco/poll/Make.defs | 1 + nuttx/configs/hymini-stm32v/buttons/Make.defs | 1 + nuttx/configs/hymini-stm32v/nsh/Make.defs | 1 + nuttx/configs/hymini-stm32v/nsh2/Make.defs | 1 + nuttx/configs/hymini-stm32v/nx/Make.defs | 1 + nuttx/configs/hymini-stm32v/nxlines/Make.defs | 1 + .../configs/hymini-stm32v/usbserial/Make.defs | 1 + .../hymini-stm32v/usbstorage/Make.defs | 1 + nuttx/configs/kwikstik-k40/ostest/Make.defs | 1 + nuttx/configs/lincoln60/nsh/Make.defs | 1 + nuttx/configs/lincoln60/ostest/Make.defs | 1 + nuttx/configs/lm3s6432-s2e/nsh/Make.defs | 1 + nuttx/configs/lm3s6432-s2e/ostest/Make.defs | 1 + nuttx/configs/lm3s6965-ek/nsh/Make.defs | 1 + nuttx/configs/lm3s6965-ek/nx/Make.defs | 1 + nuttx/configs/lm3s6965-ek/ostest/Make.defs | 1 + nuttx/configs/lm3s8962-ek/nsh/Make.defs | 1 + nuttx/configs/lm3s8962-ek/nx/Make.defs | 1 + nuttx/configs/lm3s8962-ek/ostest/Make.defs | 1 + nuttx/configs/lpc4330-xplorer/nsh/Make.defs | 1 + .../configs/lpc4330-xplorer/ostest/Make.defs | 1 + .../lpcxpresso-lpc1768/dhcpd/Make.defs | 1 + .../configs/lpcxpresso-lpc1768/nsh/Make.defs | 1 + nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs | 1 + .../lpcxpresso-lpc1768/ostest/Make.defs | 1 + .../lpcxpresso-lpc1768/thttpd/Make.defs | 1 + .../lpcxpresso-lpc1768/usbstorage/Make.defs | 1 + nuttx/configs/m68332evb/Make.defs | 1 + nuttx/configs/mbed/hidkbd/Make.defs | 1 + nuttx/configs/mbed/nsh/Make.defs | 1 + .../mcu123-lpc214x/composite/Make.defs | 1 + nuttx/configs/mcu123-lpc214x/nsh/Make.defs | 1 + nuttx/configs/mcu123-lpc214x/ostest/Make.defs | 1 + .../mcu123-lpc214x/usbserial/Make.defs | 1 + .../mcu123-lpc214x/usbstorage/Make.defs | 1 + nuttx/configs/micropendous3/hello/Make.defs | 1 + nuttx/configs/mirtoo/nsh/Make.defs | 1 + nuttx/configs/mirtoo/nxffs/Make.defs | 1 + nuttx/configs/mirtoo/ostest/Make.defs | 1 + nuttx/configs/mx1ads/ostest/Make.defs | 1 + nuttx/configs/ne64badge/ostest/Make.defs | 1 + nuttx/configs/ntosd-dm320/nettest/Make.defs | 1 + nuttx/configs/ntosd-dm320/nsh/Make.defs | 1 + nuttx/configs/ntosd-dm320/ostest/Make.defs | 1 + nuttx/configs/ntosd-dm320/poll/Make.defs | 1 + nuttx/configs/ntosd-dm320/thttpd/Make.defs | 1 + nuttx/configs/ntosd-dm320/udp/Make.defs | 1 + nuttx/configs/ntosd-dm320/uip/Make.defs | 1 + nuttx/configs/nucleus2g/nsh/Make.defs | 1 + nuttx/configs/nucleus2g/ostest/Make.defs | 1 + nuttx/configs/nucleus2g/usbserial/Make.defs | 1 + nuttx/configs/nucleus2g/usbstorage/Make.defs | 1 + .../configs/olimex-lpc1766stk/ftpc/Make.defs | 1 + .../olimex-lpc1766stk/hidkbd/Make.defs | 1 + .../olimex-lpc1766stk/nettest/Make.defs | 1 + nuttx/configs/olimex-lpc1766stk/nsh/Make.defs | 1 + nuttx/configs/olimex-lpc1766stk/nx/Make.defs | 1 + .../olimex-lpc1766stk/ostest/Make.defs | 1 + .../olimex-lpc1766stk/slip-httpd/Make.defs | 1 + .../olimex-lpc1766stk/thttpd/Make.defs | 1 + .../olimex-lpc1766stk/usbserial/Make.defs | 1 + .../olimex-lpc1766stk/usbstorage/Make.defs | 1 + .../configs/olimex-lpc1766stk/wlan/Make.defs | 1 + nuttx/configs/olimex-lpc2378/nsh/Make.defs | 1 + nuttx/configs/olimex-lpc2378/ostest/Make.defs | 1 + nuttx/configs/olimex-stm32-p107/nsh/Make.defs | 1 + .../olimex-stm32-p107/ostest/Make.defs | 1 + .../configs/olimex-strp711/nettest/Make.defs | 1 + nuttx/configs/olimex-strp711/nsh/Make.defs | 1 + nuttx/configs/olimex-strp711/ostest/Make.defs | 1 + nuttx/configs/pcblogic-pic32mx/nsh/Make.defs | 1 + .../configs/pcblogic-pic32mx/ostest/Make.defs | 1 + nuttx/configs/pic32-starterkit/nsh/Make.defs | 1 + nuttx/configs/pic32-starterkit/nsh2/Make.defs | 1 + .../configs/pic32-starterkit/ostest/Make.defs | 1 + nuttx/configs/pic32mx7mmb/nsh/Make.defs | 1 + nuttx/configs/pic32mx7mmb/ostest/Make.defs | 1 + nuttx/configs/pjrc-8051/Make.defs | 1 + nuttx/configs/qemu-i486/nsh/Make.defs | 1 + nuttx/configs/qemu-i486/ostest/Make.defs | 1 + nuttx/configs/rgmp/arm/default/Make.defs | 1 + nuttx/configs/rgmp/arm/nsh/Make.defs | 1 + nuttx/configs/rgmp/x86/default/Make.defs | 1 + nuttx/configs/rgmp/x86/nsh/Make.defs | 1 + nuttx/configs/sam3u-ek/knsh/Make.defs | 1 + nuttx/configs/sam3u-ek/nsh/Make.defs | 1 + nuttx/configs/sam3u-ek/nx/Make.defs | 1 + nuttx/configs/sam3u-ek/ostest/Make.defs | 1 + nuttx/configs/sam3u-ek/touchscreen/Make.defs | 1 + nuttx/configs/sim/mount/Make.defs | 1 + nuttx/configs/sim/nettest/Make.defs | 1 + nuttx/configs/sim/nsh/Make.defs | 1 + nuttx/configs/sim/nsh2/Make.defs | 1 + nuttx/configs/sim/nx/Make.defs | 1 + nuttx/configs/sim/nx11/Make.defs | 1 + nuttx/configs/sim/nxffs/Make.defs | 1 + nuttx/configs/sim/nxwm/Make.defs | 1 + nuttx/configs/sim/ostest/Make.defs | 1 + nuttx/configs/sim/pashello/Make.defs | 1 + nuttx/configs/sim/touchscreen/Make.defs | 1 + nuttx/configs/skp16c26/ostest/Make.defs | 1 + nuttx/configs/stm3210e-eval/RIDE/Make.defs | 1 + nuttx/configs/stm3210e-eval/buttons/Make.defs | 1 + .../configs/stm3210e-eval/composite/Make.defs | 1 + nuttx/configs/stm3210e-eval/nsh/Make.defs | 1 + nuttx/configs/stm3210e-eval/nsh2/Make.defs | 1 + nuttx/configs/stm3210e-eval/nx/Make.defs | 1 + .../configs/stm3210e-eval/nxconsole/Make.defs | 1 + nuttx/configs/stm3210e-eval/nxlines/Make.defs | 1 + nuttx/configs/stm3210e-eval/nxtext/Make.defs | 1 + nuttx/configs/stm3210e-eval/ostest/Make.defs | 1 + nuttx/configs/stm3210e-eval/pm/Make.defs | 1 + .../configs/stm3210e-eval/usbserial/Make.defs | 1 + .../stm3210e-eval/usbstorage/Make.defs | 1 + nuttx/configs/stm3220g-eval/dhcpd/Make.defs | 1 + nuttx/configs/stm3220g-eval/nettest/Make.defs | 1 + nuttx/configs/stm3220g-eval/nsh/Make.defs | 1 + nuttx/configs/stm3220g-eval/nsh2/Make.defs | 1 + nuttx/configs/stm3220g-eval/nxwm/Make.defs | 1 + nuttx/configs/stm3220g-eval/ostest/Make.defs | 1 + nuttx/configs/stm3220g-eval/telnetd/Make.defs | 1 + nuttx/configs/stm3240g-eval/dhcpd/Make.defs | 1 + nuttx/configs/stm3240g-eval/nettest/Make.defs | 1 + nuttx/configs/stm3240g-eval/nsh/Make.defs | 1 + nuttx/configs/stm3240g-eval/nsh2/Make.defs | 1 + .../configs/stm3240g-eval/nxconsole/Make.defs | 1 + nuttx/configs/stm3240g-eval/nxwm/Make.defs | 1 + nuttx/configs/stm3240g-eval/ostest/Make.defs | 1 + nuttx/configs/stm3240g-eval/telnetd/Make.defs | 1 + nuttx/configs/stm32f4discovery/nsh/Make.defs | 1 + .../stm32f4discovery/nxlines/Make.defs | 1 + .../configs/stm32f4discovery/ostest/Make.defs | 1 + nuttx/configs/stm32f4discovery/pm/Make.defs | 1 + nuttx/configs/sure-pic32mx/nsh/Make.defs | 1 + nuttx/configs/sure-pic32mx/ostest/Make.defs | 1 + nuttx/configs/sure-pic32mx/usbnsh/Make.defs | 1 + nuttx/configs/teensy/hello/Make.defs | 1 + nuttx/configs/teensy/nsh/Make.defs | 1 + nuttx/configs/teensy/usbstorage/Make.defs | 1 + nuttx/configs/twr-k60n512/nsh/Make.defs | 1 + nuttx/configs/twr-k60n512/ostest/Make.defs | 1 + nuttx/configs/ubw32/nsh/Make.defs | 1 + nuttx/configs/ubw32/ostest/Make.defs | 1 + nuttx/configs/us7032evb1/nsh/Make.defs | 1 + nuttx/configs/us7032evb1/ostest/Make.defs | 1 + nuttx/configs/vsn/nsh/Make.defs | 1 + nuttx/configs/xtrs/nsh/Make.defs | 1 + nuttx/configs/xtrs/ostest/Make.defs | 1 + nuttx/configs/xtrs/pashello/Make.defs | 1 + .../configs/z16f2800100zcog/ostest/Make.defs | 1 + .../z16f2800100zcog/pashello/Make.defs | 1 + nuttx/configs/z80sim/nsh/Make.defs | 1 + nuttx/configs/z80sim/ostest/Make.defs | 1 + nuttx/configs/z80sim/pashello/Make.defs | 1 + nuttx/configs/z8encore000zco/ostest/Make.defs | 1 + nuttx/configs/z8f64200100kit/ostest/Make.defs | 1 + nuttx/tools/Config.mk | 38 +++++++++++++++++++ 190 files changed, 230 insertions(+), 17 deletions(-) create mode 100644 nuttx/tools/Config.mk diff --git a/nuttx/Makefile b/nuttx/Makefile index b0a17efd25..1a51ca09b5 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -35,6 +35,7 @@ TOPDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include ${TOPDIR}/.config +-include ${TOPDIR}/tools/Config.mk -include ${TOPDIR}/Make.defs # Default tools diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index 6d927892bb..47a22ec2ed 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -2101,23 +2101,10 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv) /* Disable auto-configuration. Set the fixed speed/duplex mode. * (probably more than little redundant). * - * REVISIT: Revisit the following CONFIG_PHY_CEMENT_DISABLE work-around: - * - * "... I found this using a LPC1768 dev board with a DP83848I PHY. I'm - * using CONFIG_PHY_DP83848C for that ... I found that a static - * configuration for the PHY gave errors. I didn't investigate why. - * - * "My problem however was that autonegotiation seemingly failed - - * however on debugging I saw the calls for autonegotation were actually - * successful. I tracked the code down to [the following logic] and - * I saw that after the negotation completes, those negotiated - * parameters are then used to set a fixed speed and duplex, "just - * in case". It was that setting of a static configuration which - * failed for me." - * - * "I'm not sure if that's required for other situations or not, so I - * added a #define to optionally elide the call to cement the - * configuration. My PHY appears to be happy with this for the moment." + * REVISIT: Revisit the following CONFIG_PHY_CEMENT_DISABLE work-around. + * It is should not needed if CONFIG_PHY_AUTONEG is defined and is known + * cause a problem for at least one PHY (DP83848I PHY). It might be + * safe just to remove this elided coded for all PHYs. */ #ifndef CONFIG_PHY_CEMENT_DISABLE diff --git a/nuttx/configs/amber/hello/Make.defs b/nuttx/configs/amber/hello/Make.defs index af09d9c51d..bcf8951520 100644 --- a/nuttx/configs/amber/hello/Make.defs +++ b/nuttx/configs/amber/hello/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/avr32dev1/nsh/Make.defs b/nuttx/configs/avr32dev1/nsh/Make.defs index 9a20bf281f..6be28bc8a8 100755 --- a/nuttx/configs/avr32dev1/nsh/Make.defs +++ b/nuttx/configs/avr32dev1/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/avr32dev1/ostest/Make.defs b/nuttx/configs/avr32dev1/ostest/Make.defs index 1c1abe0954..29e82fcd4e 100755 --- a/nuttx/configs/avr32dev1/ostest/Make.defs +++ b/nuttx/configs/avr32dev1/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/c5471evm/httpd/Make.defs b/nuttx/configs/c5471evm/httpd/Make.defs index 4bf9c41a96..549f98cd61 100644 --- a/nuttx/configs/c5471evm/httpd/Make.defs +++ b/nuttx/configs/c5471evm/httpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk CROSSDEV = arm-elf- CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/c5471evm/nettest/Make.defs b/nuttx/configs/c5471evm/nettest/Make.defs index 9d859dbe38..0acc3af47d 100644 --- a/nuttx/configs/c5471evm/nettest/Make.defs +++ b/nuttx/configs/c5471evm/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk CROSSDEV = arm-elf- CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/c5471evm/nsh/Make.defs b/nuttx/configs/c5471evm/nsh/Make.defs index dbea5cf338..d5e4d54ac8 100644 --- a/nuttx/configs/c5471evm/nsh/Make.defs +++ b/nuttx/configs/c5471evm/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk CROSSDEV = arm-elf- CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/c5471evm/ostest/Make.defs b/nuttx/configs/c5471evm/ostest/Make.defs index a9f3cc5851..7d147c9de3 100644 --- a/nuttx/configs/c5471evm/ostest/Make.defs +++ b/nuttx/configs/c5471evm/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk CROSSDEV = arm-elf- CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/compal_e88/nsh_highram/Make.defs b/nuttx/configs/compal_e88/nsh_highram/Make.defs index 1679a13fbb..4a9b3d200f 100644 --- a/nuttx/configs/compal_e88/nsh_highram/Make.defs +++ b/nuttx/configs/compal_e88/nsh_highram/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_SERCOMM_CONSOLE}","y") OSMODIR = $(TOPDIR)/../../osmocom-bb diff --git a/nuttx/configs/compal_e99/nsh_compalram/Make.defs b/nuttx/configs/compal_e99/nsh_compalram/Make.defs index 9ff9a66ca1..7a99f90bf5 100644 --- a/nuttx/configs/compal_e99/nsh_compalram/Make.defs +++ b/nuttx/configs/compal_e99/nsh_compalram/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_SERCOMM_CONSOLE}","y") OSMODIR = $(TOPDIR)/../../osmocom-bb diff --git a/nuttx/configs/compal_e99/nsh_highram/Make.defs b/nuttx/configs/compal_e99/nsh_highram/Make.defs index 1679a13fbb..4a9b3d200f 100644 --- a/nuttx/configs/compal_e99/nsh_highram/Make.defs +++ b/nuttx/configs/compal_e99/nsh_highram/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_SERCOMM_CONSOLE}","y") OSMODIR = $(TOPDIR)/../../osmocom-bb diff --git a/nuttx/configs/demo9s12ne64/ostest/Make.defs b/nuttx/configs/demo9s12ne64/ostest/Make.defs index 2cdba512d5..1ae7b5f394 100755 --- a/nuttx/configs/demo9s12ne64/ostest/Make.defs +++ b/nuttx/configs/demo9s12ne64/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain # NuttX buildroot under Linux or Cygwin diff --git a/nuttx/configs/ea3131/nsh/Make.defs b/nuttx/configs/ea3131/nsh/Make.defs index 247cb6ebd4..e17d3c674d 100644 --- a/nuttx/configs/ea3131/nsh/Make.defs +++ b/nuttx/configs/ea3131/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ea3131/ostest/Make.defs b/nuttx/configs/ea3131/ostest/Make.defs index fd72ded9df..cb0fcaff4b 100644 --- a/nuttx/configs/ea3131/ostest/Make.defs +++ b/nuttx/configs/ea3131/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ea3131/pgnsh/Make.defs b/nuttx/configs/ea3131/pgnsh/Make.defs index 81edc73fae..cf712d2964 100644 --- a/nuttx/configs/ea3131/pgnsh/Make.defs +++ b/nuttx/configs/ea3131/pgnsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ea3131/usbserial/Make.defs b/nuttx/configs/ea3131/usbserial/Make.defs index b1e236df86..17c111af29 100644 --- a/nuttx/configs/ea3131/usbserial/Make.defs +++ b/nuttx/configs/ea3131/usbserial/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ea3131/usbstorage/Make.defs b/nuttx/configs/ea3131/usbstorage/Make.defs index 6838c9d690..017c9b97fb 100644 --- a/nuttx/configs/ea3131/usbstorage/Make.defs +++ b/nuttx/configs/ea3131/usbstorage/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ea3152/ostest/Make.defs b/nuttx/configs/ea3152/ostest/Make.defs index 44d28fcac7..62d7bae6f8 100644 --- a/nuttx/configs/ea3152/ostest/Make.defs +++ b/nuttx/configs/ea3152/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/eagle100/httpd/Make.defs b/nuttx/configs/eagle100/httpd/Make.defs index c96a29c9cc..b19de75472 100644 --- a/nuttx/configs/eagle100/httpd/Make.defs +++ b/nuttx/configs/eagle100/httpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the devkitARM toolchain diff --git a/nuttx/configs/eagle100/nettest/Make.defs b/nuttx/configs/eagle100/nettest/Make.defs index 9814f12630..295d0b0cc9 100644 --- a/nuttx/configs/eagle100/nettest/Make.defs +++ b/nuttx/configs/eagle100/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the devkitARM toolchain diff --git a/nuttx/configs/eagle100/nsh/Make.defs b/nuttx/configs/eagle100/nsh/Make.defs index d0cf300af7..7fbd738f5d 100644 --- a/nuttx/configs/eagle100/nsh/Make.defs +++ b/nuttx/configs/eagle100/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the devkitARM toolchain diff --git a/nuttx/configs/eagle100/nxflat/Make.defs b/nuttx/configs/eagle100/nxflat/Make.defs index 674a74066f..2c7ef95838 100644 --- a/nuttx/configs/eagle100/nxflat/Make.defs +++ b/nuttx/configs/eagle100/nxflat/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the devkitARM toolchain diff --git a/nuttx/configs/eagle100/ostest/Make.defs b/nuttx/configs/eagle100/ostest/Make.defs index 7f1b6f32be..edc1afd19a 100644 --- a/nuttx/configs/eagle100/ostest/Make.defs +++ b/nuttx/configs/eagle100/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the devkitARM toolchain diff --git a/nuttx/configs/eagle100/thttpd/Make.defs b/nuttx/configs/eagle100/thttpd/Make.defs index e3d2c9c3c3..f984d3a8de 100644 --- a/nuttx/configs/eagle100/thttpd/Make.defs +++ b/nuttx/configs/eagle100/thttpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the devkitARM toolchain diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs index 9c6facef8d..50b4142894 100644 --- a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs +++ b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs @@ -35,6 +35,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs b/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs index 1f316b7e1b..ac45c9baba 100644 --- a/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs +++ b/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs @@ -35,6 +35,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ez80f910200kitg/ostest/Make.defs b/nuttx/configs/ez80f910200kitg/ostest/Make.defs index 7e5b802603..8ac31611c1 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/Make.defs +++ b/nuttx/configs/ez80f910200kitg/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/configs/ez80f910200zco/dhcpd/Make.defs b/nuttx/configs/ez80f910200zco/dhcpd/Make.defs index 06b08c2e4f..cf69788f59 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/Make.defs +++ b/nuttx/configs/ez80f910200zco/dhcpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/configs/ez80f910200zco/httpd/Make.defs b/nuttx/configs/ez80f910200zco/httpd/Make.defs index 08979608a7..37aac8fed7 100644 --- a/nuttx/configs/ez80f910200zco/httpd/Make.defs +++ b/nuttx/configs/ez80f910200zco/httpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/configs/ez80f910200zco/nettest/Make.defs b/nuttx/configs/ez80f910200zco/nettest/Make.defs index 5111f8f05c..51a9ababb0 100644 --- a/nuttx/configs/ez80f910200zco/nettest/Make.defs +++ b/nuttx/configs/ez80f910200zco/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/configs/ez80f910200zco/nsh/Make.defs b/nuttx/configs/ez80f910200zco/nsh/Make.defs index 1d935f7811..fb9b40ab56 100644 --- a/nuttx/configs/ez80f910200zco/nsh/Make.defs +++ b/nuttx/configs/ez80f910200zco/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/configs/ez80f910200zco/ostest/Make.defs b/nuttx/configs/ez80f910200zco/ostest/Make.defs index 5fcc43c4b1..36cfdc191c 100644 --- a/nuttx/configs/ez80f910200zco/ostest/Make.defs +++ b/nuttx/configs/ez80f910200zco/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/configs/ez80f910200zco/poll/Make.defs b/nuttx/configs/ez80f910200zco/poll/Make.defs index ca7de28ca8..085700d047 100644 --- a/nuttx/configs/ez80f910200zco/poll/Make.defs +++ b/nuttx/configs/ez80f910200zco/poll/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/configs/hymini-stm32v/buttons/Make.defs b/nuttx/configs/hymini-stm32v/buttons/Make.defs index 7bef1d2289..7956afb108 100644 --- a/nuttx/configs/hymini-stm32v/buttons/Make.defs +++ b/nuttx/configs/hymini-stm32v/buttons/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/hymini-stm32v/nsh/Make.defs b/nuttx/configs/hymini-stm32v/nsh/Make.defs index 9b6c0b426f..442eb29744 100644 --- a/nuttx/configs/hymini-stm32v/nsh/Make.defs +++ b/nuttx/configs/hymini-stm32v/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/hymini-stm32v/nsh2/Make.defs b/nuttx/configs/hymini-stm32v/nsh2/Make.defs index 63c6317ef2..5742300673 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/Make.defs +++ b/nuttx/configs/hymini-stm32v/nsh2/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/hymini-stm32v/nx/Make.defs b/nuttx/configs/hymini-stm32v/nx/Make.defs index 4edd1231fa..53533cfcc9 100644 --- a/nuttx/configs/hymini-stm32v/nx/Make.defs +++ b/nuttx/configs/hymini-stm32v/nx/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/hymini-stm32v/nxlines/Make.defs b/nuttx/configs/hymini-stm32v/nxlines/Make.defs index 213e8fbefa..764bea986b 100644 --- a/nuttx/configs/hymini-stm32v/nxlines/Make.defs +++ b/nuttx/configs/hymini-stm32v/nxlines/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/hymini-stm32v/usbserial/Make.defs b/nuttx/configs/hymini-stm32v/usbserial/Make.defs index 33863f9f10..2109c48d88 100644 --- a/nuttx/configs/hymini-stm32v/usbserial/Make.defs +++ b/nuttx/configs/hymini-stm32v/usbserial/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs b/nuttx/configs/hymini-stm32v/usbstorage/Make.defs index 5583f97c60..91a677d473 100755 --- a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs +++ b/nuttx/configs/hymini-stm32v/usbstorage/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/kwikstik-k40/ostest/Make.defs b/nuttx/configs/kwikstik-k40/ostest/Make.defs index ef478d80ad..c6d3bb651b 100644 --- a/nuttx/configs/kwikstik-k40/ostest/Make.defs +++ b/nuttx/configs/kwikstik-k40/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lincoln60/nsh/Make.defs b/nuttx/configs/lincoln60/nsh/Make.defs index 61c5d281a6..343c2dcc6f 100644 --- a/nuttx/configs/lincoln60/nsh/Make.defs +++ b/nuttx/configs/lincoln60/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lincoln60/ostest/Make.defs b/nuttx/configs/lincoln60/ostest/Make.defs index 44d3ded238..de45b59dfd 100644 --- a/nuttx/configs/lincoln60/ostest/Make.defs +++ b/nuttx/configs/lincoln60/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs index 7efa910063..36b463c5c5 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs +++ b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lm3s6432-s2e/ostest/Make.defs b/nuttx/configs/lm3s6432-s2e/ostest/Make.defs index 60868f2fb8..c59ee3adb7 100644 --- a/nuttx/configs/lm3s6432-s2e/ostest/Make.defs +++ b/nuttx/configs/lm3s6432-s2e/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lm3s6965-ek/nsh/Make.defs b/nuttx/configs/lm3s6965-ek/nsh/Make.defs index e3deb5e654..555d188437 100755 --- a/nuttx/configs/lm3s6965-ek/nsh/Make.defs +++ b/nuttx/configs/lm3s6965-ek/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lm3s6965-ek/nx/Make.defs b/nuttx/configs/lm3s6965-ek/nx/Make.defs index 3d4f5ed544..a9756cb36e 100755 --- a/nuttx/configs/lm3s6965-ek/nx/Make.defs +++ b/nuttx/configs/lm3s6965-ek/nx/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lm3s6965-ek/ostest/Make.defs b/nuttx/configs/lm3s6965-ek/ostest/Make.defs index 2b7f1d243c..4233287a4b 100755 --- a/nuttx/configs/lm3s6965-ek/ostest/Make.defs +++ b/nuttx/configs/lm3s6965-ek/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lm3s8962-ek/nsh/Make.defs b/nuttx/configs/lm3s8962-ek/nsh/Make.defs index 5de3c28a6d..ed81aa0964 100755 --- a/nuttx/configs/lm3s8962-ek/nsh/Make.defs +++ b/nuttx/configs/lm3s8962-ek/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lm3s8962-ek/nx/Make.defs b/nuttx/configs/lm3s8962-ek/nx/Make.defs index e5dbb0279b..8f1b3837df 100755 --- a/nuttx/configs/lm3s8962-ek/nx/Make.defs +++ b/nuttx/configs/lm3s8962-ek/nx/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lm3s8962-ek/ostest/Make.defs b/nuttx/configs/lm3s8962-ek/ostest/Make.defs index a9448e682a..d10957130b 100755 --- a/nuttx/configs/lm3s8962-ek/ostest/Make.defs +++ b/nuttx/configs/lm3s8962-ek/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs index 5952d8ef6a..22c48c57e9 100644 --- a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs +++ b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs index 5952d8ef6a..22c48c57e9 100644 --- a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs +++ b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs index e02b4f8768..6c583c2d1c 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs index 2e8a9b12a3..c902e94f77 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs index 8ed3bff991..ce07973f24 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs index 2dfabcdaa7..e7350094ee 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs index 7e3bd6771f..730638bbca 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs index 268a69e723..9033e3e2e5 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/m68332evb/Make.defs b/nuttx/configs/m68332evb/Make.defs index d49480ec4b..897fb74da3 100644 --- a/nuttx/configs/m68332evb/Make.defs +++ b/nuttx/configs/m68332evb/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = -g diff --git a/nuttx/configs/mbed/hidkbd/Make.defs b/nuttx/configs/mbed/hidkbd/Make.defs index 94ba508f09..16725d3d28 100644 --- a/nuttx/configs/mbed/hidkbd/Make.defs +++ b/nuttx/configs/mbed/hidkbd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/mbed/nsh/Make.defs b/nuttx/configs/mbed/nsh/Make.defs index a10a99db78..044361af4b 100755 --- a/nuttx/configs/mbed/nsh/Make.defs +++ b/nuttx/configs/mbed/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/mcu123-lpc214x/composite/Make.defs b/nuttx/configs/mcu123-lpc214x/composite/Make.defs index 6ebb014c9e..9ebd1646e6 100644 --- a/nuttx/configs/mcu123-lpc214x/composite/Make.defs +++ b/nuttx/configs/mcu123-lpc214x/composite/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the CodeSourcery toolchain diff --git a/nuttx/configs/mcu123-lpc214x/nsh/Make.defs b/nuttx/configs/mcu123-lpc214x/nsh/Make.defs index ab701fbcbd..b883cf06f8 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/Make.defs +++ b/nuttx/configs/mcu123-lpc214x/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the NuttX buildroot toolchain diff --git a/nuttx/configs/mcu123-lpc214x/ostest/Make.defs b/nuttx/configs/mcu123-lpc214x/ostest/Make.defs index 3810834291..c3da596abb 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/Make.defs +++ b/nuttx/configs/mcu123-lpc214x/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the NuttX buildroot toolchain diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs b/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs index 99851d9c44..20fb8b55d1 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs +++ b/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the NuttX buildroot toolchain diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs b/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs index 459b3cb258..421af0ba30 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs +++ b/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the NuttX buildroot toolchain diff --git a/nuttx/configs/micropendous3/hello/Make.defs b/nuttx/configs/micropendous3/hello/Make.defs index 2a3cc78667..b974894ed0 100644 --- a/nuttx/configs/micropendous3/hello/Make.defs +++ b/nuttx/configs/micropendous3/hello/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/mirtoo/nsh/Make.defs b/nuttx/configs/mirtoo/nsh/Make.defs index 3acbb72882..3b88576136 100644 --- a/nuttx/configs/mirtoo/nsh/Make.defs +++ b/nuttx/configs/mirtoo/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/mirtoo/nxffs/Make.defs b/nuttx/configs/mirtoo/nxffs/Make.defs index e9456a6b2a..bf5f066986 100644 --- a/nuttx/configs/mirtoo/nxffs/Make.defs +++ b/nuttx/configs/mirtoo/nxffs/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/mirtoo/ostest/Make.defs b/nuttx/configs/mirtoo/ostest/Make.defs index e502afe6ce..9956d7fb00 100644 --- a/nuttx/configs/mirtoo/ostest/Make.defs +++ b/nuttx/configs/mirtoo/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/mx1ads/ostest/Make.defs b/nuttx/configs/mx1ads/ostest/Make.defs index 8dd58a51aa..4eba91c3f5 100644 --- a/nuttx/configs/mx1ads/ostest/Make.defs +++ b/nuttx/configs/mx1ads/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk CROSSDEV = arm-elf- CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/ne64badge/ostest/Make.defs b/nuttx/configs/ne64badge/ostest/Make.defs index 0557ab5227..d72a137592 100755 --- a/nuttx/configs/ne64badge/ostest/Make.defs +++ b/nuttx/configs/ne64badge/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain # NuttX buildroot under Linux or Cygwin diff --git a/nuttx/configs/ntosd-dm320/nettest/Make.defs b/nuttx/configs/ntosd-dm320/nettest/Make.defs index b72efc7f55..bc44d04875 100644 --- a/nuttx/configs/ntosd-dm320/nettest/Make.defs +++ b/nuttx/configs/ntosd-dm320/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ntosd-dm320/nsh/Make.defs b/nuttx/configs/ntosd-dm320/nsh/Make.defs index 385700f4e5..00a4ae2b2a 100644 --- a/nuttx/configs/ntosd-dm320/nsh/Make.defs +++ b/nuttx/configs/ntosd-dm320/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ntosd-dm320/ostest/Make.defs b/nuttx/configs/ntosd-dm320/ostest/Make.defs index 5da85ef6af..7e12a8c70d 100644 --- a/nuttx/configs/ntosd-dm320/ostest/Make.defs +++ b/nuttx/configs/ntosd-dm320/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ntosd-dm320/poll/Make.defs b/nuttx/configs/ntosd-dm320/poll/Make.defs index 84b01c1b25..7ec6c0aad0 100644 --- a/nuttx/configs/ntosd-dm320/poll/Make.defs +++ b/nuttx/configs/ntosd-dm320/poll/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ntosd-dm320/thttpd/Make.defs b/nuttx/configs/ntosd-dm320/thttpd/Make.defs index d35e16216a..ec5581bbba 100644 --- a/nuttx/configs/ntosd-dm320/thttpd/Make.defs +++ b/nuttx/configs/ntosd-dm320/thttpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ntosd-dm320/udp/Make.defs b/nuttx/configs/ntosd-dm320/udp/Make.defs index c8c3c2c18a..54df969e0a 100644 --- a/nuttx/configs/ntosd-dm320/udp/Make.defs +++ b/nuttx/configs/ntosd-dm320/udp/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ntosd-dm320/uip/Make.defs b/nuttx/configs/ntosd-dm320/uip/Make.defs index ab01c74a29..40394e77b4 100644 --- a/nuttx/configs/ntosd-dm320/uip/Make.defs +++ b/nuttx/configs/ntosd-dm320/uip/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/nucleus2g/nsh/Make.defs b/nuttx/configs/nucleus2g/nsh/Make.defs index dff86e1d92..5bce696517 100755 --- a/nuttx/configs/nucleus2g/nsh/Make.defs +++ b/nuttx/configs/nucleus2g/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/nucleus2g/ostest/Make.defs b/nuttx/configs/nucleus2g/ostest/Make.defs index 472f22f792..359c012f84 100755 --- a/nuttx/configs/nucleus2g/ostest/Make.defs +++ b/nuttx/configs/nucleus2g/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/nucleus2g/usbserial/Make.defs b/nuttx/configs/nucleus2g/usbserial/Make.defs index 2c8ae58d62..f711eac39d 100755 --- a/nuttx/configs/nucleus2g/usbserial/Make.defs +++ b/nuttx/configs/nucleus2g/usbserial/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/nucleus2g/usbstorage/Make.defs b/nuttx/configs/nucleus2g/usbstorage/Make.defs index 937d092a57..272bdd88c2 100755 --- a/nuttx/configs/nucleus2g/usbstorage/Make.defs +++ b/nuttx/configs/nucleus2g/usbstorage/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs index b1d7396aa8..255d832540 100755 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs index 1c9091be71..036e5f40b8 100755 --- a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs index ab92128418..a9764339a2 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs index 321ed5e8c1..fcabaa38fa 100755 --- a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs index 4f851011bd..5ca7cb0ea6 100755 --- a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs b/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs index 5329d9d18c..f8a169db7a 100755 --- a/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs index 58b173e831..db632f4e2c 100755 --- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs index dfa86ee121..312bceb2e6 100755 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs index 6ca970ac01..deb7525fab 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs index cf807d775f..6b719602d7 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs b/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs index 5bd04a9f3d..0ae00ae6c2 100755 --- a/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc2378/nsh/Make.defs b/nuttx/configs/olimex-lpc2378/nsh/Make.defs index cdfb330920..956c7a1027 100755 --- a/nuttx/configs/olimex-lpc2378/nsh/Make.defs +++ b/nuttx/configs/olimex-lpc2378/nsh/Make.defs @@ -39,6 +39,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-lpc2378/ostest/Make.defs b/nuttx/configs/olimex-lpc2378/ostest/Make.defs index 2c0c292b01..4e1aa9d0de 100755 --- a/nuttx/configs/olimex-lpc2378/ostest/Make.defs +++ b/nuttx/configs/olimex-lpc2378/ostest/Make.defs @@ -39,6 +39,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs index 3f1f87431d..422d48fb7b 100644 --- a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs +++ b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs index 0c3f7461d6..36f9d83be7 100644 --- a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs +++ b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/olimex-strp711/nettest/Make.defs b/nuttx/configs/olimex-strp711/nettest/Make.defs index b3de44a84a..6e6680dff0 100755 --- a/nuttx/configs/olimex-strp711/nettest/Make.defs +++ b/nuttx/configs/olimex-strp711/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the NuttX buildroot toolchain diff --git a/nuttx/configs/olimex-strp711/nsh/Make.defs b/nuttx/configs/olimex-strp711/nsh/Make.defs index b62c610f23..8dd122bcbe 100644 --- a/nuttx/configs/olimex-strp711/nsh/Make.defs +++ b/nuttx/configs/olimex-strp711/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the NuttX buildroot toolchain diff --git a/nuttx/configs/olimex-strp711/ostest/Make.defs b/nuttx/configs/olimex-strp711/ostest/Make.defs index ee3acde8aa..f126151b15 100644 --- a/nuttx/configs/olimex-strp711/ostest/Make.defs +++ b/nuttx/configs/olimex-strp711/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # The default value for CROSSDEV can be overridden from the make command line: # make -- Will build for the NuttX buildroot toolchain diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs b/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs index 182a18016e..e6362ee874 100644 --- a/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs +++ b/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/Make.defs b/nuttx/configs/pcblogic-pic32mx/ostest/Make.defs index 8e51ab6b3b..488e7d4de7 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/Make.defs +++ b/nuttx/configs/pcblogic-pic32mx/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/pic32-starterkit/nsh/Make.defs b/nuttx/configs/pic32-starterkit/nsh/Make.defs index a951be9170..cb2a34816c 100644 --- a/nuttx/configs/pic32-starterkit/nsh/Make.defs +++ b/nuttx/configs/pic32-starterkit/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/pic32-starterkit/nsh2/Make.defs b/nuttx/configs/pic32-starterkit/nsh2/Make.defs index 8c031f3154..e4f4672a25 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/Make.defs +++ b/nuttx/configs/pic32-starterkit/nsh2/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/pic32-starterkit/ostest/Make.defs b/nuttx/configs/pic32-starterkit/ostest/Make.defs index 586135a3e2..d82af28b90 100644 --- a/nuttx/configs/pic32-starterkit/ostest/Make.defs +++ b/nuttx/configs/pic32-starterkit/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/pic32mx7mmb/nsh/Make.defs b/nuttx/configs/pic32mx7mmb/nsh/Make.defs index 7a0543c0cd..cfb6b9af34 100644 --- a/nuttx/configs/pic32mx7mmb/nsh/Make.defs +++ b/nuttx/configs/pic32mx7mmb/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/pic32mx7mmb/ostest/Make.defs b/nuttx/configs/pic32mx7mmb/ostest/Make.defs index 68bc5e02dd..f0f0066e2a 100644 --- a/nuttx/configs/pic32mx7mmb/ostest/Make.defs +++ b/nuttx/configs/pic32mx7mmb/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/pjrc-8051/Make.defs b/nuttx/configs/pjrc-8051/Make.defs index a1443723e7..b5c86d7f57 100644 --- a/nuttx/configs/pjrc-8051/Make.defs +++ b/nuttx/configs/pjrc-8051/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = --debug diff --git a/nuttx/configs/qemu-i486/nsh/Make.defs b/nuttx/configs/qemu-i486/nsh/Make.defs index ff8d3dd6b7..043c072bea 100644 --- a/nuttx/configs/qemu-i486/nsh/Make.defs +++ b/nuttx/configs/qemu-i486/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/qemu-i486/ostest/Make.defs b/nuttx/configs/qemu-i486/ostest/Make.defs index 4a2d3bf083..1221a83d47 100644 --- a/nuttx/configs/qemu-i486/ostest/Make.defs +++ b/nuttx/configs/qemu-i486/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/rgmp/arm/default/Make.defs b/nuttx/configs/rgmp/arm/default/Make.defs index 19d643cc37..981872363c 100644 --- a/nuttx/configs/rgmp/arm/default/Make.defs +++ b/nuttx/configs/rgmp/arm/default/Make.defs @@ -36,6 +36,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk RGMPLIBDIR := $(RGMP_INST_DIR)/lib RGMPINCDIR := $(RGMP_INST_DIR)/include diff --git a/nuttx/configs/rgmp/arm/nsh/Make.defs b/nuttx/configs/rgmp/arm/nsh/Make.defs index 3bb764a1cc..8ee0aad634 100644 --- a/nuttx/configs/rgmp/arm/nsh/Make.defs +++ b/nuttx/configs/rgmp/arm/nsh/Make.defs @@ -36,6 +36,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk RGMPLIBDIR := $(RGMP_INST_DIR)/lib RGMPINCDIR := $(RGMP_INST_DIR)/include diff --git a/nuttx/configs/rgmp/x86/default/Make.defs b/nuttx/configs/rgmp/x86/default/Make.defs index c5e7c532fb..9f970a1980 100644 --- a/nuttx/configs/rgmp/x86/default/Make.defs +++ b/nuttx/configs/rgmp/x86/default/Make.defs @@ -36,6 +36,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk RGMPLIBDIR := $(RGMP_INST_DIR)/lib RGMPINCDIR := $(RGMP_INST_DIR)/include diff --git a/nuttx/configs/rgmp/x86/nsh/Make.defs b/nuttx/configs/rgmp/x86/nsh/Make.defs index 22d29c35a8..22ad89da98 100644 --- a/nuttx/configs/rgmp/x86/nsh/Make.defs +++ b/nuttx/configs/rgmp/x86/nsh/Make.defs @@ -36,6 +36,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk RGMPLIBDIR := $(RGMP_INST_DIR)/lib RGMPINCDIR := $(RGMP_INST_DIR)/include diff --git a/nuttx/configs/sam3u-ek/knsh/Make.defs b/nuttx/configs/sam3u-ek/knsh/Make.defs index c717c64f31..16a292c295 100755 --- a/nuttx/configs/sam3u-ek/knsh/Make.defs +++ b/nuttx/configs/sam3u-ek/knsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/sam3u-ek/nsh/Make.defs b/nuttx/configs/sam3u-ek/nsh/Make.defs index 1c62a98da0..467e8298f4 100755 --- a/nuttx/configs/sam3u-ek/nsh/Make.defs +++ b/nuttx/configs/sam3u-ek/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/sam3u-ek/nx/Make.defs b/nuttx/configs/sam3u-ek/nx/Make.defs index def9112537..a4eb888759 100755 --- a/nuttx/configs/sam3u-ek/nx/Make.defs +++ b/nuttx/configs/sam3u-ek/nx/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/sam3u-ek/ostest/Make.defs b/nuttx/configs/sam3u-ek/ostest/Make.defs index 809d082ec8..dc8bfca283 100755 --- a/nuttx/configs/sam3u-ek/ostest/Make.defs +++ b/nuttx/configs/sam3u-ek/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/sam3u-ek/touchscreen/Make.defs b/nuttx/configs/sam3u-ek/touchscreen/Make.defs index 8391d4a4be..07ba9085d6 100755 --- a/nuttx/configs/sam3u-ek/touchscreen/Make.defs +++ b/nuttx/configs/sam3u-ek/touchscreen/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/sim/mount/Make.defs b/nuttx/configs/sim/mount/Make.defs index e3e1a8576a..4c1af7fb16 100644 --- a/nuttx/configs/sim/mount/Make.defs +++ b/nuttx/configs/sim/mount/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/nettest/Make.defs b/nuttx/configs/sim/nettest/Make.defs index a1052492a4..285a5d1394 100644 --- a/nuttx/configs/sim/nettest/Make.defs +++ b/nuttx/configs/sim/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/nsh/Make.defs b/nuttx/configs/sim/nsh/Make.defs index 83bc35d76b..cd3d31813e 100644 --- a/nuttx/configs/sim/nsh/Make.defs +++ b/nuttx/configs/sim/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/nsh2/Make.defs b/nuttx/configs/sim/nsh2/Make.defs index 7fba83b726..ad166f93c9 100644 --- a/nuttx/configs/sim/nsh2/Make.defs +++ b/nuttx/configs/sim/nsh2/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/nx/Make.defs b/nuttx/configs/sim/nx/Make.defs index 91e42acedf..8d541214fa 100644 --- a/nuttx/configs/sim/nx/Make.defs +++ b/nuttx/configs/sim/nx/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/nx11/Make.defs b/nuttx/configs/sim/nx11/Make.defs index d385d823be..1386f4b361 100644 --- a/nuttx/configs/sim/nx11/Make.defs +++ b/nuttx/configs/sim/nx11/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/nxffs/Make.defs b/nuttx/configs/sim/nxffs/Make.defs index e7d5b6d50f..f664ff777b 100644 --- a/nuttx/configs/sim/nxffs/Make.defs +++ b/nuttx/configs/sim/nxffs/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/nxwm/Make.defs b/nuttx/configs/sim/nxwm/Make.defs index 958ded466c..1f4dd97965 100644 --- a/nuttx/configs/sim/nxwm/Make.defs +++ b/nuttx/configs/sim/nxwm/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/ostest/Make.defs b/nuttx/configs/sim/ostest/Make.defs index a1052492a4..285a5d1394 100644 --- a/nuttx/configs/sim/ostest/Make.defs +++ b/nuttx/configs/sim/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/pashello/Make.defs b/nuttx/configs/sim/pashello/Make.defs index 6f662adc03..2a19ff38a2 100644 --- a/nuttx/configs/sim/pashello/Make.defs +++ b/nuttx/configs/sim/pashello/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/sim/touchscreen/Make.defs b/nuttx/configs/sim/touchscreen/Make.defs index 2ea9a3c890..112f6def70 100644 --- a/nuttx/configs/sim/touchscreen/Make.defs +++ b/nuttx/configs/sim/touchscreen/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} diff --git a/nuttx/configs/skp16c26/ostest/Make.defs b/nuttx/configs/skp16c26/ostest/Make.defs index ab500fbad8..22cee90f63 100644 --- a/nuttx/configs/skp16c26/ostest/Make.defs +++ b/nuttx/configs/skp16c26/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk CROSSDEV = m32c-elf- CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/stm3210e-eval/RIDE/Make.defs b/nuttx/configs/stm3210e-eval/RIDE/Make.defs index c6a1ed0fb7..021119c018 100644 --- a/nuttx/configs/stm3210e-eval/RIDE/Make.defs +++ b/nuttx/configs/stm3210e-eval/RIDE/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/buttons/Make.defs b/nuttx/configs/stm3210e-eval/buttons/Make.defs index 40ea698c4d..f8d135853c 100644 --- a/nuttx/configs/stm3210e-eval/buttons/Make.defs +++ b/nuttx/configs/stm3210e-eval/buttons/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/composite/Make.defs b/nuttx/configs/stm3210e-eval/composite/Make.defs index b20f69e452..8c768324ce 100755 --- a/nuttx/configs/stm3210e-eval/composite/Make.defs +++ b/nuttx/configs/stm3210e-eval/composite/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/nsh/Make.defs b/nuttx/configs/stm3210e-eval/nsh/Make.defs index c6009b93d3..30e18eb8f8 100644 --- a/nuttx/configs/stm3210e-eval/nsh/Make.defs +++ b/nuttx/configs/stm3210e-eval/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/nsh2/Make.defs b/nuttx/configs/stm3210e-eval/nsh2/Make.defs index 113c2a2b54..2fdadbb032 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/Make.defs +++ b/nuttx/configs/stm3210e-eval/nsh2/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/nx/Make.defs b/nuttx/configs/stm3210e-eval/nx/Make.defs index 4c8b24b5a4..7a8934d3c3 100644 --- a/nuttx/configs/stm3210e-eval/nx/Make.defs +++ b/nuttx/configs/stm3210e-eval/nx/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs index 91aab08b4b..6d14a23787 100644 --- a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs +++ b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/nxlines/Make.defs b/nuttx/configs/stm3210e-eval/nxlines/Make.defs index 7976394f67..3814187861 100644 --- a/nuttx/configs/stm3210e-eval/nxlines/Make.defs +++ b/nuttx/configs/stm3210e-eval/nxlines/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/nxtext/Make.defs b/nuttx/configs/stm3210e-eval/nxtext/Make.defs index 9bf88c0d89..30e630766b 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/Make.defs +++ b/nuttx/configs/stm3210e-eval/nxtext/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/ostest/Make.defs b/nuttx/configs/stm3210e-eval/ostest/Make.defs index 6e346b92f2..ceabfc0459 100644 --- a/nuttx/configs/stm3210e-eval/ostest/Make.defs +++ b/nuttx/configs/stm3210e-eval/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/pm/Make.defs b/nuttx/configs/stm3210e-eval/pm/Make.defs index b153f99104..354a4f47dc 100644 --- a/nuttx/configs/stm3210e-eval/pm/Make.defs +++ b/nuttx/configs/stm3210e-eval/pm/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/usbserial/Make.defs b/nuttx/configs/stm3210e-eval/usbserial/Make.defs index d7f8f538c1..368d73e6f9 100644 --- a/nuttx/configs/stm3210e-eval/usbserial/Make.defs +++ b/nuttx/configs/stm3210e-eval/usbserial/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs index da26d309da..9af081cd1e 100755 --- a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs +++ b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs index 3fc1e4ac80..f6ba36cf97 100644 --- a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs +++ b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3220g-eval/nettest/Make.defs b/nuttx/configs/stm3220g-eval/nettest/Make.defs index 1d7a5bbd2f..e5b86254ca 100644 --- a/nuttx/configs/stm3220g-eval/nettest/Make.defs +++ b/nuttx/configs/stm3220g-eval/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3220g-eval/nsh/Make.defs b/nuttx/configs/stm3220g-eval/nsh/Make.defs index 3645875f7f..c83aefd524 100644 --- a/nuttx/configs/stm3220g-eval/nsh/Make.defs +++ b/nuttx/configs/stm3220g-eval/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3220g-eval/nsh2/Make.defs b/nuttx/configs/stm3220g-eval/nsh2/Make.defs index 3a096c752b..d11f404bdd 100644 --- a/nuttx/configs/stm3220g-eval/nsh2/Make.defs +++ b/nuttx/configs/stm3220g-eval/nsh2/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3220g-eval/nxwm/Make.defs b/nuttx/configs/stm3220g-eval/nxwm/Make.defs index 60ed44a2b3..9223fb76c4 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/Make.defs +++ b/nuttx/configs/stm3220g-eval/nxwm/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3220g-eval/ostest/Make.defs b/nuttx/configs/stm3220g-eval/ostest/Make.defs index f071746e24..f02aa927a1 100644 --- a/nuttx/configs/stm3220g-eval/ostest/Make.defs +++ b/nuttx/configs/stm3220g-eval/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3220g-eval/telnetd/Make.defs b/nuttx/configs/stm3220g-eval/telnetd/Make.defs index fae89d569b..a57ff55094 100644 --- a/nuttx/configs/stm3220g-eval/telnetd/Make.defs +++ b/nuttx/configs/stm3220g-eval/telnetd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs index ed57ad4969..e1c06d5143 100644 --- a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs +++ b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3240g-eval/nettest/Make.defs b/nuttx/configs/stm3240g-eval/nettest/Make.defs index a813997878..5063f511c2 100644 --- a/nuttx/configs/stm3240g-eval/nettest/Make.defs +++ b/nuttx/configs/stm3240g-eval/nettest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3240g-eval/nsh/Make.defs b/nuttx/configs/stm3240g-eval/nsh/Make.defs index b99670c073..af9b9a8cb9 100644 --- a/nuttx/configs/stm3240g-eval/nsh/Make.defs +++ b/nuttx/configs/stm3240g-eval/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3240g-eval/nsh2/Make.defs b/nuttx/configs/stm3240g-eval/nsh2/Make.defs index 19dd3ee399..ef5f2f5686 100644 --- a/nuttx/configs/stm3240g-eval/nsh2/Make.defs +++ b/nuttx/configs/stm3240g-eval/nsh2/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs index 4af1917ec7..4f66b1c9fa 100644 --- a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs +++ b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3240g-eval/nxwm/Make.defs b/nuttx/configs/stm3240g-eval/nxwm/Make.defs index e607304dfa..9d110ef195 100644 --- a/nuttx/configs/stm3240g-eval/nxwm/Make.defs +++ b/nuttx/configs/stm3240g-eval/nxwm/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3240g-eval/ostest/Make.defs b/nuttx/configs/stm3240g-eval/ostest/Make.defs index c261d4ec32..b854fac0e9 100644 --- a/nuttx/configs/stm3240g-eval/ostest/Make.defs +++ b/nuttx/configs/stm3240g-eval/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm3240g-eval/telnetd/Make.defs b/nuttx/configs/stm3240g-eval/telnetd/Make.defs index 509bc165f3..ccad685f0b 100644 --- a/nuttx/configs/stm3240g-eval/telnetd/Make.defs +++ b/nuttx/configs/stm3240g-eval/telnetd/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm32f4discovery/nsh/Make.defs b/nuttx/configs/stm32f4discovery/nsh/Make.defs index 80c1a8d8f8..daf3851c83 100644 --- a/nuttx/configs/stm32f4discovery/nsh/Make.defs +++ b/nuttx/configs/stm32f4discovery/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm32f4discovery/nxlines/Make.defs b/nuttx/configs/stm32f4discovery/nxlines/Make.defs index 3a252c5445..4f2052ecc2 100644 --- a/nuttx/configs/stm32f4discovery/nxlines/Make.defs +++ b/nuttx/configs/stm32f4discovery/nxlines/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm32f4discovery/ostest/Make.defs b/nuttx/configs/stm32f4discovery/ostest/Make.defs index b4d79bd49d..6b1ed2ff1b 100644 --- a/nuttx/configs/stm32f4discovery/ostest/Make.defs +++ b/nuttx/configs/stm32f4discovery/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/stm32f4discovery/pm/Make.defs b/nuttx/configs/stm32f4discovery/pm/Make.defs index 9c94797a7f..4c10a32515 100644 --- a/nuttx/configs/stm32f4discovery/pm/Make.defs +++ b/nuttx/configs/stm32f4discovery/pm/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/sure-pic32mx/nsh/Make.defs b/nuttx/configs/sure-pic32mx/nsh/Make.defs index 0ba6d01f49..9d22039f97 100644 --- a/nuttx/configs/sure-pic32mx/nsh/Make.defs +++ b/nuttx/configs/sure-pic32mx/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/sure-pic32mx/ostest/Make.defs b/nuttx/configs/sure-pic32mx/ostest/Make.defs index 6f624317c1..e0742562db 100644 --- a/nuttx/configs/sure-pic32mx/ostest/Make.defs +++ b/nuttx/configs/sure-pic32mx/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/sure-pic32mx/usbnsh/Make.defs b/nuttx/configs/sure-pic32mx/usbnsh/Make.defs index 7cf2ca106b..f9968573ad 100644 --- a/nuttx/configs/sure-pic32mx/usbnsh/Make.defs +++ b/nuttx/configs/sure-pic32mx/usbnsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/teensy/hello/Make.defs b/nuttx/configs/teensy/hello/Make.defs index 70027f7378..da2a9e212f 100644 --- a/nuttx/configs/teensy/hello/Make.defs +++ b/nuttx/configs/teensy/hello/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/teensy/nsh/Make.defs b/nuttx/configs/teensy/nsh/Make.defs index eb166cb7e0..92458c12e0 100755 --- a/nuttx/configs/teensy/nsh/Make.defs +++ b/nuttx/configs/teensy/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/teensy/usbstorage/Make.defs b/nuttx/configs/teensy/usbstorage/Make.defs index e73f0c1c5b..74da8d78f1 100755 --- a/nuttx/configs/teensy/usbstorage/Make.defs +++ b/nuttx/configs/teensy/usbstorage/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/twr-k60n512/nsh/Make.defs b/nuttx/configs/twr-k60n512/nsh/Make.defs index 33cd6c52a1..5ae6ca061e 100644 --- a/nuttx/configs/twr-k60n512/nsh/Make.defs +++ b/nuttx/configs/twr-k60n512/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/twr-k60n512/ostest/Make.defs b/nuttx/configs/twr-k60n512/ostest/Make.defs index 5299bbd54c..e737d71899 100644 --- a/nuttx/configs/twr-k60n512/ostest/Make.defs +++ b/nuttx/configs/twr-k60n512/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ubw32/nsh/Make.defs b/nuttx/configs/ubw32/nsh/Make.defs index 78d8d3e1dd..8330fb677e 100644 --- a/nuttx/configs/ubw32/nsh/Make.defs +++ b/nuttx/configs/ubw32/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/ubw32/ostest/Make.defs b/nuttx/configs/ubw32/ostest/Make.defs index 1aefa28443..7747cb3c45 100644 --- a/nuttx/configs/ubw32/ostest/Make.defs +++ b/nuttx/configs/ubw32/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/us7032evb1/nsh/Make.defs b/nuttx/configs/us7032evb1/nsh/Make.defs index 292f91a8bb..410d0cea67 100644 --- a/nuttx/configs/us7032evb1/nsh/Make.defs +++ b/nuttx/configs/us7032evb1/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = -g diff --git a/nuttx/configs/us7032evb1/ostest/Make.defs b/nuttx/configs/us7032evb1/ostest/Make.defs index e3a0753a4e..f924dc56fe 100644 --- a/nuttx/configs/us7032evb1/ostest/Make.defs +++ b/nuttx/configs/us7032evb1/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################## include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = -g diff --git a/nuttx/configs/vsn/nsh/Make.defs b/nuttx/configs/vsn/nsh/Make.defs index 5695c8c637..0487609ea7 100644 --- a/nuttx/configs/vsn/nsh/Make.defs +++ b/nuttx/configs/vsn/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain diff --git a/nuttx/configs/xtrs/nsh/Make.defs b/nuttx/configs/xtrs/nsh/Make.defs index 345fa47c1f..e1d147dc40 100644 --- a/nuttx/configs/xtrs/nsh/Make.defs +++ b/nuttx/configs/xtrs/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = --debug diff --git a/nuttx/configs/xtrs/ostest/Make.defs b/nuttx/configs/xtrs/ostest/Make.defs index 6f769411cd..773b97d9d1 100644 --- a/nuttx/configs/xtrs/ostest/Make.defs +++ b/nuttx/configs/xtrs/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = --debug diff --git a/nuttx/configs/xtrs/pashello/Make.defs b/nuttx/configs/xtrs/pashello/Make.defs index 6f769411cd..773b97d9d1 100644 --- a/nuttx/configs/xtrs/pashello/Make.defs +++ b/nuttx/configs/xtrs/pashello/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = --debug diff --git a/nuttx/configs/z16f2800100zcog/ostest/Make.defs b/nuttx/configs/z16f2800100zcog/ostest/Make.defs index 9b7ac4179e..64eda832f8 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/Make.defs +++ b/nuttx/configs/z16f2800100zcog/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZNeo-II toolchain is installed diff --git a/nuttx/configs/z16f2800100zcog/pashello/Make.defs b/nuttx/configs/z16f2800100zcog/pashello/Make.defs index 36c4f57725..999f25e625 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/Make.defs +++ b/nuttx/configs/z16f2800100zcog/pashello/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZNeo-II toolchain is installed diff --git a/nuttx/configs/z80sim/nsh/Make.defs b/nuttx/configs/z80sim/nsh/Make.defs index ff4e2633a8..d20096ea15 100644 --- a/nuttx/configs/z80sim/nsh/Make.defs +++ b/nuttx/configs/z80sim/nsh/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = --debug diff --git a/nuttx/configs/z80sim/ostest/Make.defs b/nuttx/configs/z80sim/ostest/Make.defs index c684428682..0eb90879b1 100644 --- a/nuttx/configs/z80sim/ostest/Make.defs +++ b/nuttx/configs/z80sim/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = --debug diff --git a/nuttx/configs/z80sim/pashello/Make.defs b/nuttx/configs/z80sim/pashello/Make.defs index cb0be065d8..b1f2b62cb2 100644 --- a/nuttx/configs/z80sim/pashello/Make.defs +++ b/nuttx/configs/z80sim/pashello/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION = --debug diff --git a/nuttx/configs/z8encore000zco/ostest/Make.defs b/nuttx/configs/z8encore000zco/ostest/Make.defs index a14f9b6154..000ee4a63f 100644 --- a/nuttx/configs/z8encore000zco/ostest/Make.defs +++ b/nuttx/configs/z8encore000zco/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/configs/z8f64200100kit/ostest/Make.defs b/nuttx/configs/z8f64200100kit/ostest/Make.defs index 7324c79524..9334377a26 100644 --- a/nuttx/configs/z8f64200100kit/ostest/Make.defs +++ b/nuttx/configs/z8f64200100kit/ostest/Make.defs @@ -34,6 +34,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed diff --git a/nuttx/tools/Config.mk b/nuttx/tools/Config.mk new file mode 100644 index 0000000000..004a7e5bdd --- /dev/null +++ b/nuttx/tools/Config.mk @@ -0,0 +1,38 @@ +############################################################################ +# Config.mk +# Strip quotes from Kconfig strings. +# +# Author: Richard Cochran +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +CONFIG_ARCH := $(shell echo $(CONFIG_ARCH)) +CONFIG_ARCH_CHIP := $(shell echo $(CONFIG_ARCH_CHIP)) +CONFIG_ARCH_BOARD := $(shell echo $(CONFIG_ARCH_BOARD)) From 018beb7f1b41d99bdc728eade6d039ae3c1cc9c1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 27 Aug 2012 19:23:40 +0000 Subject: [PATCH 3/5] Fix some NAK race conditions in control transfers (there are more) git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5058 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/ChangeLog | 8 ++ nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 151 +++++++++++++-------- 2 files changed, 105 insertions(+), 54 deletions(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index c4e914658e..192af9dc35 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3192,4 +3192,12 @@ * arch/arm/src/lpc17xx/lpc17_ethernet.c: Conditionally elide setting PHY speed/duplex. This does not work for certain PHYs. Still some unresolved issues (also from Kate). + * tools/Config.mk, Makefile, configs/*/Make.defs: Add a new Makefile + fragement to de-quoate certain strings from the Kconfig logic that + need to be used at path segments (Richard Cochran). + * arch/arm/src/stm32/stm32_usbotghost.c: The STM32 USB host driver only + works with debug turned on. The problem appears to be that with debug + OFF, there are more NAKs occuring in more places than before and this + reveals a variety of errors. This check in improves NAK robustness + for control transfers but does not resolve all of the issues. diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 0b09070dc6..61f2640d4e 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -141,14 +141,15 @@ #define STM32_EP0_MAX_PACKET_SIZE 64 /* EP0 FS max packet size */ #define STM32_MAX_TX_FIFOS 15 /* Max number of TX FIFOs */ #define STM32_MAX_PKTCOUNT 256 /* Max packet count */ -#define STM32_RETRY_COUNT 3 /* Number of retries */ +#define STM32_RETRY_COUNT 3 /* Number of ctrl transfer retries */ #define STM32_DEF_DEVADDR 0 /* Default device address */ /* Delays **********************************************************************/ -#define STM32_READY_DELAY 200000 /* In loop counts */ -#define STM32_FLUSH_DELAY 200000 /* In loop counts */ -#define STM32_NOTREADY_DELAY 5000 /* In frames */ +#define STM32_READY_DELAY 200000 /* In loop counts */ +#define STM32_FLUSH_DELAY 200000 /* In loop counts */ +#define STM32_SETUP_DELAY 5000 /* In frames */ +#define STM32_DATANAK_DELAY 5000 /* In frames */ /* Ever-present MIN/MAX macros */ @@ -376,10 +377,11 @@ static void stm32_disconnect(FAR struct usbhost_driver_s *drvr); /* Initialization **************************************************************/ static void stm32_portreset(FAR struct stm32_usbhost_s *priv); -static inline void stm32_flush_txfifos(uint32_t txfnum); -static inline void stm32_flush_rxfifo(void); +static void stm32_flush_txfifos(uint32_t txfnum); +static void stm32_flush_rxfifo(void); static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state); static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv); + static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv); static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv); @@ -1196,14 +1198,15 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, FAR const struct usb_ctrlreq_s *req) { FAR struct stm32_chan_s *chan; - uint16_t start = stm32_getframe(); + uint16_t start; uint16_t elapsed; int ret; - chan = &priv->chan[priv->ep0out]; - /* Loop while the device reports NAK (and a timeout is not exceeded */ + chan = &priv->chan[priv->ep0out]; + start = stm32_getframe(); + do { /* Send the SETUP packet */ @@ -1248,11 +1251,11 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, return ret; } - /* Get the elpased time (in frames) */ + /* Get the elapsed time (in frames) */ elapsed = stm32_getframe() - start; } - while (elapsed < STM32_NOTREADY_DELAY); + while (elapsed < STM32_SETUP_DELAY); return -ETIMEDOUT; } @@ -3284,6 +3287,8 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; uint16_t buflen; + uint16_t start; + uint16_t elapsed; int retries; int ret; @@ -3300,7 +3305,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, stm32_takesem(&priv->exclsem); - /* Loop, retrying until the retry count expires */ + /* Loop, retrying until the retry time expires */ for (retries = 0; retries < STM32_RETRY_COUNT; retries++) { @@ -3308,38 +3313,55 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, ret = stm32_ctrl_sendsetup(priv, req); if (ret < 0) - { + { udbg("stm32_ctrl_sendsetup failed: %d\n", ret); - return ret; + continue; } - /* Handle the IN data phase (if any) */ + /* Get the start time. Loop again until the timeout expires */ - if (buflen > 0) + start = stm32_getframe(); + do { - ret = stm32_ctrl_recvdata(priv, buffer, buflen); - if (ret < 0) + /* Handle the IN data phase (if any) */ + + if (buflen > 0) { - udbg("stm32_ctrl_recvdata failed: %d\n", ret); - continue; + ret = stm32_ctrl_recvdata(priv, buffer, buflen); + if (ret < 0) + { + udbg("stm32_ctrl_recvdata failed: %d\n", ret); + } } + + /* Handle the status OUT phase */ + + if (ret == OK) + { + priv->chan[priv->ep0out].outdata1 ^= true; + ret = stm32_ctrl_senddata(priv, NULL, 0); + if (ret == OK) + { + /* All success transactions exit here */ + + stm32_givesem(&priv->exclsem); + return OK; + } + + udbg("stm32_ctrl_senddata failed: %d\n", ret); + } + + /* Get the elapsed time (in frames) */ + + elapsed = stm32_getframe() - start; } - - /* Handle the status OUT phase */ - - priv->chan[priv->ep0out].outdata1 ^= true; - ret = stm32_ctrl_senddata(priv, NULL, 0); - if (ret == OK) - { - break; - } - - udbg("stm32_ctrl_senddata failed: %d\n", ret); - ret = -ETIMEDOUT; + while (elapsed < STM32_DATANAK_DELAY); } + /* All failures exit here after all retries and timeouts have been exhausted */ + stm32_givesem(&priv->exclsem); - return ret; + return -ETIMEDOUT; } static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, @@ -3348,6 +3370,8 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; uint16_t buflen; + uint16_t start; + uint16_t elapsed; int retries; int ret; @@ -3364,12 +3388,14 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, stm32_takesem(&priv->exclsem); - /* Loop, retrying until the retry count expires */ + /* Loop, retrying until the retry time expires */ for (retries = 0; retries < STM32_RETRY_COUNT; retries++) { /* Send the SETUP request */ + /* Send the SETUP request */ + ret = stm32_ctrl_sendsetup(priv, req); if (ret < 0) { @@ -3377,35 +3403,52 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, continue; } - /* Handle the data OUT phase (if any) */ + /* Get the start time. Loop again until the timeout expires */ - if (buflen > 0) + start = stm32_getframe(); + do { - /* Start DATA out transfer (only one DATA packet) */ + /* Handle the data OUT phase (if any) */ - priv->chan[priv->ep0out].outdata1 = true; - ret = stm32_ctrl_senddata(priv, NULL, 0); - if (ret < 0) + if (buflen > 0) { - udbg("stm32_ctrl_senddata failed: %d\n", ret); - continue; + /* Start DATA out transfer (only one DATA packet) */ + + priv->chan[priv->ep0out].outdata1 = true; + ret = stm32_ctrl_senddata(priv, NULL, 0); + if (ret < 0) + { + udbg("stm32_ctrl_senddata failed: %d\n", ret); + } } - } - /* Handle the status IN phase */ + /* Handle the status IN phase */ - ret = stm32_ctrl_recvdata(priv, NULL, 0); - if (ret == OK) - { - break; - } + if (ret == OK) + { + ret = stm32_ctrl_recvdata(priv, NULL, 0); + if (ret == OK) + { + /* All success transactins exit here */ - udbg("stm32_ctrl_recvdata failed: %d\n", ret); - ret = -ETIMEDOUT; + stm32_givesem(&priv->exclsem); + return OK; + } + + udbg("stm32_ctrl_recvdata failed: %d\n", ret); + } + + /* Get the elapsed time (in frames) */ + + elapsed = stm32_getframe() - start; + } + while (elapsed < STM32_DATANAK_DELAY); } + /* All failures exit here after all retries and timeouts have been exhausted */ + stm32_givesem(&priv->exclsem); - return ret; + return -ETIMEDOUT; } /******************************************************************************* @@ -3660,7 +3703,7 @@ static void stm32_portreset(FAR struct stm32_usbhost_s *priv) * *******************************************************************************/ -static inline void stm32_flush_txfifos(uint32_t txfnum) +static void stm32_flush_txfifos(uint32_t txfnum) { uint32_t regval; uint32_t timeout; @@ -3700,7 +3743,7 @@ static inline void stm32_flush_txfifos(uint32_t txfnum) * *******************************************************************************/ -static inline void stm32_flush_rxfifo(void) +static void stm32_flush_rxfifo(void) { uint32_t regval; uint32_t timeout; From 064743fe725c55b992d12f00c852dcda395c1808 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 27 Aug 2012 22:27:03 +0000 Subject: [PATCH 4/5] Some STM32 USB OTG FS driver fixes git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5059 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/ChangeLog | 2 ++ nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 21 ++++++++++++++++--- nuttx/configs/stm3220g-eval/dhcpd/defconfig | 2 +- nuttx/configs/stm3220g-eval/nettest/defconfig | 2 +- nuttx/configs/stm3220g-eval/nsh/defconfig | 2 +- nuttx/configs/stm3220g-eval/nsh2/defconfig | 2 +- nuttx/configs/stm3220g-eval/nxwm/defconfig | 2 +- nuttx/configs/stm3220g-eval/ostest/defconfig | 2 +- nuttx/configs/stm3220g-eval/telnetd/defconfig | 2 +- nuttx/fs/romfs/fs_romfsutil.c | 2 +- 10 files changed, 28 insertions(+), 11 deletions(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 192af9dc35..eff224f79a 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3200,4 +3200,6 @@ OFF, there are more NAKs occuring in more places than before and this reveals a variety of errors. This check in improves NAK robustness for control transfers but does not resolve all of the issues. + * configs/stm3220g-eval/*/defconfig: Calibrated delay loop. It had + never been calibrated was was way off. diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 61f2640d4e..ce0e9036e5 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -48,6 +48,10 @@ #include #include +#if !defined(CONFIG_DEBUG_VERBOSE) && !defined(CONFIG_DEBUG_USB) +# include +#endif + #include #include #include @@ -1888,7 +1892,7 @@ static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv) if (!priv->connected) { /* Yes.. then now we are connected */ - + ullvdbg("Connected\n"); priv->connected = true; DEBUGASSERT(priv->smstate == SMSTATE_DETACHED); @@ -3595,8 +3599,19 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, } } + /* There is a bug in the code at present. With debug OFF, this driver + * overruns the typical FLASH device and there are many problems with + * NAKS sticking a big delay here allows the driver to work but with + * very poor performance when debug is off. + */ + +#if !defined(CONFIG_DEBUG_VERBOSE) && !defined(CONFIG_DEBUG_USB) +#warning "REVISIT this delay" + usleep(100*1000); +#endif + /* Start the transfer */ - + stm32_transfer_start(priv, chidx); /* Wait for the transfer to complete and get the result */ @@ -3696,7 +3711,7 @@ static void stm32_portreset(FAR struct stm32_usbhost_s *priv) * Flush the selected Tx FIFO. * * Input Parameters: - * priv -- USB host driver private data structure. + * txfnum -- USB host driver private data structure. * * Returned Value: * None. diff --git a/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig index 27b6180071..7a211ddc9d 100644 --- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3220g-eval/dhcpd/defconfig @@ -75,7 +75,7 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y -CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/stm3220g-eval/nettest/defconfig b/nuttx/configs/stm3220g-eval/nettest/defconfig index 1c5889e902..ade4bbe97f 100644 --- a/nuttx/configs/stm3220g-eval/nettest/defconfig +++ b/nuttx/configs/stm3220g-eval/nettest/defconfig @@ -75,7 +75,7 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y -CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig index 1fe4816063..58b47b3d7c 100644 --- a/nuttx/configs/stm3220g-eval/nsh/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh/defconfig @@ -75,7 +75,7 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y -CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig index 0b157f91f6..13f7292576 100644 --- a/nuttx/configs/stm3220g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig @@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y -CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig index fec79bd9fc..8d97997457 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig @@ -75,7 +75,7 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y -CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/stm3220g-eval/ostest/defconfig b/nuttx/configs/stm3220g-eval/ostest/defconfig index 5d1d0e5e43..0cb5f37f00 100644 --- a/nuttx/configs/stm3220g-eval/ostest/defconfig +++ b/nuttx/configs/stm3220g-eval/ostest/defconfig @@ -75,7 +75,7 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y -CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/stm3220g-eval/telnetd/defconfig b/nuttx/configs/stm3220g-eval/telnetd/defconfig index 5b0157c412..d8b3608873 100644 --- a/nuttx/configs/stm3220g-eval/telnetd/defconfig +++ b/nuttx/configs/stm3220g-eval/telnetd/defconfig @@ -75,7 +75,7 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y -CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/fs/romfs/fs_romfsutil.c b/nuttx/fs/romfs/fs_romfsutil.c index ec009da89d..cb3f9f9ace 100644 --- a/nuttx/fs/romfs/fs_romfsutil.c +++ b/nuttx/fs/romfs/fs_romfsutil.c @@ -351,7 +351,7 @@ static inline int romfs_searchdir(struct romfs_mountpt_s *rm, } while (next != 0); - /* There is nothing in this directoy with that name */ + /* There is nothing in this directory with that name */ return -ENOENT; } From bbe3db55f26c2aef2f2ba27bf726bee1ec039b24 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 28 Aug 2012 14:40:12 +0000 Subject: [PATCH 5/5] Add some protection to the priority inheritance logic when sem_post() is called from an interrupt handler git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5060 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- apps/ChangeLog.txt | 5 + apps/examples/ostest/prioinherit.c | 12 +- nuttx/Documentation/NuttxPortingGuide.html | 5 + nuttx/configs/README.txt | 8 +- nuttx/fs/nxffs/README.txt | 11 +- nuttx/sched/sem_holder.c | 298 +++++++++++++++------ nuttx/sched/sem_post.c | 16 +- 7 files changed, 262 insertions(+), 93 deletions(-) diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 0f60338a49..361fb97dc8 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -285,4 +285,9 @@ list (contributed by Kate). * apps/nshlib/nsh_parse.c: CONFIG_NSH_DISABLE_WGET not CONFIG_NSH_DISABLE_GET in one location (found by Kate). + * apps/examples/ostest/prioinherit.c: Limit the number of test + threds to no more than 3 of each priority. Bad things happen + when the existing logic tried to created several hundred test + treads! + diff --git a/apps/examples/ostest/prioinherit.c b/apps/examples/ostest/prioinherit.c index 87849abcfd..eea5a818ff 100644 --- a/apps/examples/ostest/prioinherit.c +++ b/apps/examples/ostest/prioinherit.c @@ -59,20 +59,28 @@ # define CONFIG_SEM_PREALLOCHOLDERS 0 #endif +/* If resources were configured for lots of holders, then run 3 low priority + * threads. Otherwise, just one. + */ + #if CONFIG_SEM_PREALLOCHOLDERS > 3 # define NLOWPRI_THREADS 3 #else -# define NLOWPRI_THREADS (CONFIG_SEM_PREALLOCHOLDERS+1) +# define NLOWPRI_THREADS 1 #endif #ifndef CONFIG_SEM_NNESTPRIO # define CONFIG_SEM_NNESTPRIO 0 #endif +/* Where resources configured for lots of waiters? If so then run 3 high + * priority threads. Otherwise, just one. + */ + #if CONFIG_SEM_NNESTPRIO > 3 # define NHIGHPRI_THREADS 3 #else -# define NHIGHPRI_THREADS (CONFIG_SEM_NNESTPRIO+1) +# define NHIGHPRI_THREADS 1 #endif /**************************************************************************** diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index a339b3a990..78c1327e20 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -4005,6 +4005,9 @@ build This may be set to zero if priority inheritance is disabled OR if you are only using semaphores as mutexes (only one holder) OR if no more than two threads participate using a counting semaphore. + If defined, then this should be a relatively large number because this + is the total number of counts on the total number of semaphores (like + 64 or 100).
  • CONFIG_SEM_NNESTPRIO: If priority inheritance is enabled, @@ -4012,6 +4015,8 @@ build 1) than can be waiting for another thread to release a count on a semaphore. This value may be set to zero if no more than one thread is expected to wait for a semaphore. + If defined, then this should be a relatively small number because this the + number of maximumum of waiters on one semaphore (like 4 or 8).
  • CONFIG_FDCLONE_DISABLE: Disable cloning of all file descriptors diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 87725bf58f..7da0aa062a 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -323,13 +323,17 @@ defconfig -- This is a configuration file similar to the Linux set to zero if priority inheritance is disabled OR if you are only using semaphores as mutexes (only one holder) OR if no more than two threads participate using a counting - semaphore. + semaphore. If defined, then this should be a relatively + large number because this is the total number of counts on + the total number of semaphores (like 64 or 100). CONFIG_SEM_NNESTPRIO. If priority inheritance is enabled, then this setting is the maximum number of higher priority threads (minus 1) than can be waiting for another thread to release a count on a semaphore. This value may be set to zero if no more than one thread is expected to wait for - a semaphore. + a semaphore. If defined, then this should be a relatively + small number because this the number of maximumum of waiters + on one semaphore (like 4 or 8). CONFIG_FDCLONE_DISABLE. Disable cloning of all file descriptors by task_create() when a new task is started. If set, all files/drivers will appear to be closed in the new task. diff --git a/nuttx/fs/nxffs/README.txt b/nuttx/fs/nxffs/README.txt index a257351107..a10fb97a54 100755 --- a/nuttx/fs/nxffs/README.txt +++ b/nuttx/fs/nxffs/README.txt @@ -154,7 +154,7 @@ Things to Do - The file name is always extracted and held in allocated, variable-length memory. The file name is not used during reading and eliminating the file name in the entry structure would improve performance. -- There is a big inefficient in reading. On each read, the logic searches +- There is a big inefficiency in reading. On each read, the logic searches for the read position from the beginning of the file each time. This may be necessary whenever an lseek() is done, but not in general. Read performance could be improved by keeping FLASH offset and read positional @@ -168,4 +168,13 @@ Things to Do FLASH. As the file system becomes more filled with fixed files at the front of the device, the level of wear on the blocks at the end of the FLASH increases. +- When the time comes to reorganization the FLASH, the system may be + inavailable for a long time. That is a bad behavior. What is needed, + I think, is a garbage collection task that runs periodically so that + when the big reorganizaiton event occurs, most of the work is already + done. That garbarge collection should search for valid blocks that no + longer contain valid data. It should pre-erase them, put them in + a good but empty state... all ready for file system re-organization. + + diff --git a/nuttx/sched/sem_holder.c b/nuttx/sched/sem_holder.c index 34f88185a9..abe7e9e280 100644 --- a/nuttx/sched/sem_holder.c +++ b/nuttx/sched/sem_holder.c @@ -275,10 +275,10 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder, FAR _TCB *htcb = (FAR _TCB *)pholder->htcb; FAR _TCB *rtcb = (FAR _TCB*)arg; - /* Make sure that the thread is still active. If it exited without releasing - * its counts, then that would be a bad thing. But we can take no real - * action because we don't know know that the program is doing. Perhaps its - * plan is to kill a thread, then destroy the semaphore. + /* Make sure that the holder thread is still active. If it exited without + * releasing its counts, then that would be a bad thing. But we can take no + * real action because we don't know know that the program is doing. Perhaps + * its plan is to kill a thread, then destroy the semaphore. */ if (!sched_verifytcb(htcb)) @@ -303,15 +303,16 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder, if (rtcb->sched_priority > htcb->sched_priority) { - /* If the current priority has already been boosted, then add the - * boost priority to the list of restoration priorities. When the - * higher priority thread gets its count, then we need to revert - * to this saved priority, not to the base priority. + /* If the current priority of holder thread has already been + * boosted, then add the boost priority to the list of restoration + * priorities. When the higher priority waiter thread gets its + * count, then we need to revert the holder thread to this saved + * priority (not to its base priority). */ if (htcb->sched_priority > htcb->base_priority) { - /* Save the current, boosted priority */ + /* Save the current, boosted priority of the holder thread. */ if (htcb->npend_reprio < CONFIG_SEM_NNESTPRIO) { @@ -324,10 +325,10 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder, } } - /* Raise the priority of the holder of the semaphore. This - * cannot cause a context switch because we have preemption - * disabled. The task will be marked "pending" and the switch - * will occur during up_block_task() processing. + /* Raise the priority of the thread holding of the semaphore. + * This cannot cause a context switch because we have preemption + * disabled. The holder thread may be marked "pending" and the + * switch may occur during up_block_task() processing. */ (void)sched_setpriority(htcb, rtcb->sched_priority); @@ -422,10 +423,10 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem int j; #endif - /* Make sure that the thread is still active. If it exited without releasing - * its counts, then that would be a bad thing. But we can take no real - * action because we don't know know that the program is doing. Perhaps its - * plan is to kill a thread, then destroy the semaphore. + /* Make sure that the hdoler thread is still active. If it exited without + * releasing its counts, then that would be a bad thing. But we can take no + * real action because we don't know know that the program is doing. Perhaps + * its plan is to kill a thread, then destroy the semaphore. */ if (!sched_verifytcb(htcb)) @@ -434,8 +435,8 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem sem_freeholder(sem, pholder); } - /* Was the priority of this thread boosted? If so, then drop its priority - * back to the correct level. + /* Was the priority of the holder thread boosted? If so, then drop its + * priority back to the correct level. What is the correct level? */ else if (htcb->sched_priority != htcb->base_priority) @@ -445,23 +446,23 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem if (htcb->npend_reprio < 1) { - /* No... the thread has only been boosted once. Reset all priorities - * back to the base priority. + /* No... the holder thread has only been boosted once. Reset all + * priorities back to the base priority. */ DEBUGASSERT(htcb->sched_priority == stcb->sched_priority && htcb->npend_reprio == 0); sched_reprioritize(htcb, htcb->base_priority); } - /* There are multiple pending priority levels. The thread's "boosted" + /* There are multiple pending priority levels. The holder thread's "boosted" * priority could greater than or equal to "stcb->sched_priority" (it could be - * greater if its priority we boosted becuase it also holds another semaphore. + * greater if its priority we boosted becuase it also holds another semaphore). */ else if (htcb->sched_priority <= stcb->sched_priority) { - /* The thread has been boosted to the same priority as the task - * that just received the count. We will simply reprioritized + /* The holder thread has been boosted to the same priority as the waiter + * thread that just received the count. We will simply reprioritize * to the next highest priority that we have in rpriority. */ @@ -492,9 +493,10 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem } else { - /* The thread has been boosted to a higher priority than the task. The - * pending priority should be in he list (unless it was lost because of - * of list overflow). + /* The holder thread has been boosted to a higher priority than the + * waiter task. The pending priority should be in the list (unless it + * was lost because of of list overflow or because the holder was + * reporioritize again unbeknownst to the priority inheritance logic). * * Search the list for the matching priority. */ @@ -522,7 +524,8 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem } #else /* There is no alternative restore priorities, drop the priority - * all the way back to the threads "base" priority. + * of the holder thread all the way back to the threads "base" + * priority. */ sched_reprioritize(htcb, htcb->base_priority); @@ -533,10 +536,15 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem } /**************************************************************************** - * Name: sem_restoreholderprioA & B + * Name: sem_restoreholderprioA + * + * Description: + * Reprioritize all holders except the currently executing task + * ****************************************************************************/ -static int sem_restoreholderprioA(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR void *arg) +static int sem_restoreholderprioA(FAR struct semholder_s *pholder, + FAR sem_t *sem, FAR void *arg) { FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; if (pholder->htcb != rtcb) @@ -547,7 +555,16 @@ static int sem_restoreholderprioA(FAR struct semholder_s *pholder, FAR sem_t *se return 0; } -static int sem_restoreholderprioB(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR void *arg) +/**************************************************************************** + * Name: sem_restoreholderprioB + * + * Description: + * Reprioritize only the currently executing task + * + ****************************************************************************/ + +static int sem_restoreholderprioB(FAR struct semholder_s *pholder, + FAR sem_t *sem, FAR void *arg) { FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; if (pholder->htcb == rtcb) @@ -559,6 +576,158 @@ static int sem_restoreholderprioB(FAR struct semholder_s *pholder, FAR sem_t *se return 0; } +/**************************************************************************** + * Name: sem_restorebaseprio_irq + * + * Description: + * This function is called after the an interrupt handler posts a count on + * the semaphore. It will check if we need to drop the priority of any + * threads holding a count on the semaphore. Their priority could have + * been boosted while they held the count. + * + * Parameters: + * stcb - The TCB of the task that was just started (if any). If the + * post action caused a count to be given to another thread, then stcb + * is the TCB that received the count. Note, just because stcb received + * the count, it does not mean that it it is higher priority than other + * threads. + * sem - A reference to the semaphore being posted. + * - If the semaphore count is <0 then there are still threads waiting + * for a count. stcb should be non-null and will be higher priority + * than all of the other threads still waiting. + * - If it is ==0 then stcb refers to the thread that got the last count; + * no other threads are waiting. + * - If it is >0 then there should be no threads waiting for counts and + * stcb should be null. + * + * Return Value: + * None + * + * Assumptions: + * The scheduler is locked. + * + ****************************************************************************/ + +static inline void sem_restorebaseprio_irq(FAR _TCB *stcb, FAR sem_t *sem) +{ + /* Perfom the following actions only if a new thread was given a count. + * The thread that received the count should be the highest priority + * of all threads waiting for a count from the semphore. So in that + * case, the priority of all holder threads should be dropped to the + * next highest pending priority. + */ + + if (stcb) + { + /* Drop the priority of all holder threads */ + + (void)sem_foreachholder(sem, sem_restoreholderprio, stcb); + } + + /* If there are no tasks waiting for available counts, then all holders + * should be at their base priority. + */ + +#ifdef CONFIG_DEBUG + else + { + (void)sem_foreachholder(sem, sem_verifyholder, NULL); + } +#endif +} + +/**************************************************************************** + * Name: sem_restorebaseprio_task + * + * Description: + * This function is called after the current running task releases a + * count on the semaphore. It will check if we need to drop the priority + * of any threads holding a count on the semaphore. Their priority could + * have been boosted while they held the count. + * + * Parameters: + * stcb - The TCB of the task that was just started (if any). If the + * post action caused a count to be given to another thread, then stcb + * is the TCB that received the count. Note, just because stcb received + * the count, it does not mean that it it is higher priority than other + * threads. + * sem - A reference to the semaphore being posted. + * - If the semaphore count is <0 then there are still threads waiting + * for a count. stcb should be non-null and will be higher priority + * than all of the other threads still waiting. + * - If it is ==0 then stcb refers to the thread that got the last count; + * no other threads are waiting. + * - If it is >0 then there should be no threads waiting for counts and + * stcb should be null. + * + * Return Value: + * None + * + * Assumptions: + * The scheduler is locked. + * + ****************************************************************************/ + +static inline void sem_restorebaseprio_task(FAR _TCB *stcb, FAR sem_t *sem) +{ + FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; + FAR struct semholder_s *pholder; + + /* Perfom the following actions only if a new thread was given a count. + * The thread that received the count should be the highest priority + * of all threads waiting for a count from the semphore. So in that + * case, the priority of all holder threads should be dropped to the + * next highest pending priority. + */ + + if (stcb) + { + /* The currently executed thread should be the lower priority + * thread that just posted the count and caused this action. + * However, we cannot drop the priority of the currently running + * thread -- becuase that will cause it to be suspended. + * + * So, do this in two passes. First, reprioritizing all holders + * except for the running thread. + */ + + (void)sem_foreachholder(sem, sem_restoreholderprioA, stcb); + + /* Now, find an reprioritize only the ready to run task */ + + (void)sem_foreachholder(sem, sem_restoreholderprioB, stcb); + } + + /* If there are no tasks waiting for available counts, then all holders + * should be at their base priority. + */ + +#ifdef CONFIG_DEBUG + else + { + (void)sem_foreachholder(sem, sem_verifyholder, NULL); + } +#endif + + /* In any case, the currently executing task should have an entry in the + * list. Its counts were previously decremented; if it now holds no + * counts, then we need to remove it from the list of holders. + */ + + pholder = sem_findholder(sem, rtcb); + if (pholder) + { + /* When no more counts are held, remove the holder from the list. The + * count was decremented in sem_releaseholder. + */ + + if (pholder->counts <= 0) + { + sem_freeholder(sem, pholder); + } + } +} + /**************************************************************************** * Public Functions ****************************************************************************/ @@ -743,9 +912,10 @@ void sem_releaseholder(FAR sem_t *sem) * * Description: * This function is called after the current running task releases a - * count on the semaphore. It will check if we need to drop the priority - * of any threads holding a count on the semaphore. Their priority could - * have been boosted while they held the count. + * count on the semaphore or an interrupt handler posts a new count. It + * will check if we need to drop the priority of any threads holding a + * count on the semaphore. Their priority could have been boosted while + * they held the count. * * Parameters: * stcb - The TCB of the task that was just started (if any). If the @@ -763,7 +933,7 @@ void sem_releaseholder(FAR sem_t *sem) * stcb should be null. * * Return Value: - * 0 (OK) or -1 (ERROR) if unsuccessful + * None * * Assumptions: * The scheduler is locked. @@ -772,61 +942,25 @@ void sem_releaseholder(FAR sem_t *sem) void sem_restorebaseprio(FAR _TCB *stcb, FAR sem_t *sem) { - FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; - FAR struct semholder_s *pholder; - /* Check our assumptions */ DEBUGASSERT((sem->semcount > 0 && stcb == NULL) || (sem->semcount <= 0 && stcb != NULL)); - /* Perfom the following actions only if a new thread was given a count. */ - - if (stcb) - { - /* The currently executed thread should be the low priority - * thread that just posted the count and caused this action. - * However, we cannot drop the priority of the currently running - * thread -- becuase that will cause it to be suspended. - * - * So, do this in two passes. First, reprioritizing all holders - * except for the running thread. - */ - - (void)sem_foreachholder(sem, sem_restoreholderprioA, stcb); - - /* Now, find an reprioritize only the ready to run task */ - - (void)sem_foreachholder(sem, sem_restoreholderprioB, stcb); - } - - /* If there are no tasks waiting for available counts, then all holders - * should be at their base priority. + /* Handler semaphore counts posed from an interrupt handler differently + * from interrupts posted from threads. The priority difference is that + * if the semaphore is posted from a thread, then the poster thread is + * a player in the priority inheritance scheme. The interrupt handler + * externally injects the new count without participated itself. */ -#ifdef CONFIG_DEBUG + if (up_interrupt_context()) + { + sem_restorebaseprio_irq(stcb, sem); + } else { - (void)sem_foreachholder(sem, sem_verifyholder, NULL); - } -#endif - - /* In any case, the currently execuing task should have an entry in the - * list. Its counts were previously decremented; if it now holds no - * counts, then we need to remove it from the list of holders. - */ - - pholder = sem_findholder(sem, rtcb); - if (pholder) - { - /* When no more counts are held, remove the holder from the list. The - * count was decremented in sem_releaseholder. - */ - - if (pholder->counts <= 0) - { - sem_freeholder(sem, pholder); - } + sem_restorebaseprio_task(stcb, sem); } } diff --git a/nuttx/sched/sem_post.c b/nuttx/sched/sem_post.c index b3780db1f6..1c694b68c6 100644 --- a/nuttx/sched/sem_post.c +++ b/nuttx/sched/sem_post.c @@ -123,17 +123,21 @@ int sem_post(FAR sem_t *sem) sem_releaseholder(sem); sem->semcount++; - /* If the result of of semaphore unlock is non-positive, then - * there must be some task waiting for the semaphore. - */ - #ifdef CONFIG_PRIORITY_INHERITANCE - /* Don't let it run until we complete the priority restoration - * steps. + /* Don't let any unblocked tasks run until we complete any priority + * restoration steps. Interrupts are disabled, but we do not want + * the head of the read-to-run list to be modified yet. + * + * NOTE: If this sched_lock is called from an interrupt handler, it + * will do nothing. */ sched_lock(); #endif + /* If the result of of semaphore unlock is non-positive, then + * there must be some task waiting for the semaphore. + */ + if (sem->semcount <= 0) { /* Check if there are any tasks in the waiting for semaphore