phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Candidate fix for the libboard.a dependency problem (from Mike Smith) 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4346 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-01-29 20:07:16 +00:00
parent c45f07b541
commit 5d862a3ca5
16 changed files with 63 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/README.txt
View File

@ -195,6 +195,9 @@ A: Here are four:
setenv.sh->nuttx/setenv.sh, Make.defs->nuttx/Make.defs,
appconfig->apps/.config
Using the 'external' link makes it especially easy to add a
'built-in' application an existing configuration.
4) Add any link to apps/
a) Add symbolic links apps/ to as many other directories as you

7
nuttx/ChangeLog
View File

@ -2401,5 +2401,10 @@
Add a configuration test the USB composite device.
* include/nuttx/usb/usb.h, drivers/usbdev/composite_descriptors.c, and
drivers/usbdev/cdcacm_descriptors.c: Add support for the USB Interface
Association Descriptor (IAD)
Association Descriptor (IAD)
* arch/arm/src/stm32/stm32_i2c.c: Correct a typo in STM32 I2C3 support
(submitted by Mike Smith)
* arch/*/src/Makefile: Candidate solution for dependency issue in the board
sub-directory: By making libboard.a a "phony" target, libboard.a should
always rebuilt (the end result is worth the small increase in build time)
(submitted by Mike Smith).

6
nuttx/TODO
View File

@ -668,6 +668,12 @@ o Build system
Title: DEPENDENCIES IN THE BOARD DIRECTORY
Description: Dependencies do not work correctly under configs/<board>/src
(same as arch/<arch>/src/board).
UPDATE: Added the following to each arch/*/src/Makefile:
PHONY: board/libboard$(LIBEXT)
However, I have not confirmed that this a full-proof fix in
all cases -- still under test (thanks to Mike Smith).
Status: Open
Priority: Medium (maybe higher for z80 target)

8
nuttx/arch/8051/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/8051/src/Makefile
#
# Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2007, 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -107,6 +107,8 @@ STACK_BASE = ${shell \
all: up_head$(OBJEXT) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(ASRCS) $(LINKASRCS): %$(ASMEXT): %.S
$(CPP) -P $(CPPFLAGS) $< -o $@
@ -189,7 +191,7 @@ nuttx$(EXEEXT): pass1.ihx nuttx.ihx
# This is part of the top-level export target
export_head: uboard/libboard$(LIBEXT) p_head$(OBJEXT)
export_head: board/libboard$(LIBEXT) p_head$(OBJEXT)
@if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f up_head$(OBJEXT) "$(EXPORT_DIR)/startup"; \
else \

6
nuttx/arch/arm/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/arm/src/Makefile
#
# Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -91,6 +91,8 @@ VPATH = chip:common:$(ARCH_SUBDIR)
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)

6
nuttx/arch/avr/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/avr/src/Makefile
#
# Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -96,6 +96,8 @@ VPATH = chip:common:$(ARCH_SUBDIR)
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)

5
nuttx/arch/hc/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/hc/src/Makefile
#
# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -87,6 +87,7 @@ LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
VPATH = chip:common:$(ARCH_SUBDIR)
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)

6
nuttx/arch/mips/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/mips/src/Makefile
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -85,6 +85,8 @@ VPATH = chip:common:$(ARCH_SUBDIR)
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)

5
nuttx/arch/rgmp/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/rgmp/src/Makefile
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -56,6 +56,7 @@ LDPATHS += -L$(RGMPLIBDIR)
LDLIBS += -lrgmp -lm -ltest $(shell gcc -print-libgcc-file-name)
all: libarch$(LIBEXT)
.PHONY: clean distclean depend
$(AOBJS): %$(OBJEXT): %.S

6
nuttx/arch/sh/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/sh/src/Makefile
#
# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -65,6 +65,8 @@ VPATH = chip:common
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)

3
nuttx/arch/sim/src/Makefile
View File

@ -131,7 +131,8 @@ LDLIBS += -lboard
# Make targets begin here
all: up_head$(OBJEXT) libarch$(LIBEXT)
.PHONY: export_head clean distclean cleanrel depend
.PHONY: board/libboard$(LIBEXT) export_head clean distclean cleanrel depend
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)

6
nuttx/arch/x86/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/x86/src/Makefile
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -93,6 +93,8 @@ VPATH = chip:common:$(ARCH_SUBDIR)
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)

6
nuttx/arch/z16/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/z16/src/Makefile
#
# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -71,6 +71,8 @@ VPATH = chip:common
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
ifeq ($(COMPILER),zneocc.exe)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) $< -o $@.tmp

4
nuttx/arch/z80/src/Makefile
View File

@ -1,8 +1,8 @@
############################################################################
# arch/z80/src/Makefile
#
# Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2007, 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions

6
nuttx/arch/z80/src/Makefile.sdcc
View File

@ -1,8 +1,8 @@
############################################################################
# arch/z80/src/Makefile.sdcc
#
# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -86,6 +86,8 @@ HEAP_BASE = ${shell ./mkhpbase.sh}
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@)

7
nuttx/arch/z80/src/Makefile.zdsii
View File

@ -1,8 +1,8 @@
############################################################################
# arch/z16/src/Makefile
#
# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -69,8 +69,11 @@ VPATH = chip:common
############################################################################
# Targets
all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT)
$(HEAD_GENSRC) $(GENSRCS) : %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) $< -o $@.tmp
@cat $@.tmp | sed -e "s/^#/;/g" > $@