From 23d6f51d4032133ed41ae5ccff887242d21a7609 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Sep 2014 13:31:34 -0600 Subject: The 'make export' target needs to bundle up the user C startup file (crt0), not the kernel head object --- nuttx/arch/z80/src/Makefile.sdccl | 7 ++++--- nuttx/arch/z80/src/Makefile.sdccw | 7 ++++--- nuttx/arch/z80/src/Makefile.zdsiil | 9 ++++++--- nuttx/arch/z80/src/Makefile.zdsiiw | 8 +++++--- 4 files changed, 19 insertions(+), 12 deletions(-) (limited to 'nuttx/arch/z80') diff --git a/nuttx/arch/z80/src/Makefile.sdccl b/nuttx/arch/z80/src/Makefile.sdccl index c444690e7..3afd657de 100644 --- a/nuttx/arch/z80/src/Makefile.sdccl +++ b/nuttx/arch/z80/src/Makefile.sdccl @@ -1,7 +1,7 @@ ############################################################################ # arch/z80/src/Makefile.sdccl # -# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ CPPFLAGS += -D__ASSEMBLY__ # There should be one head source (.asm file) HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT)) +STARTUP_OBJS ?= $(HEAD_OBJ) # Assembly sources and objects @@ -181,9 +182,9 @@ endif # This is part of the top-level export target -export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) +export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS) $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \ - cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ + cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \ else \ echo "$(EXPORT_DIR)/startup does not exist"; \ exit 1; \ diff --git a/nuttx/arch/z80/src/Makefile.sdccw b/nuttx/arch/z80/src/Makefile.sdccw index 79e1b002e..ee7948c67 100644 --- a/nuttx/arch/z80/src/Makefile.sdccw +++ b/nuttx/arch/z80/src/Makefile.sdccw @@ -1,7 +1,7 @@ ############################################################################ # arch/z80/src/Makefile.sdccw # -# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ CPPFLAGS += -D__ASSEMBLY__ # There should be one head source (.asm file) HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT)) +STARTUP_OBJS ?= $(HEAD_OBJ) # Assembly sources and objects @@ -179,9 +180,9 @@ endif # This is part of the top-level export target -export_head: board\libboard$(LIBEXT) $(HEAD_OBJ) +export_startup: board\libboard$(LIBEXT) $(STARTUP_OBJS) $(Q) if not exist board\Makefile ( echo $(EXPORT_DIR)\startup does not exist ) - $(Q) if exist board\Makefile ( cp -f $(HEAD_OBJ) "$(EXPORT_DIR)\startup" ) + $(Q) if exist board\Makefile ( cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)\startup" ) # Build dependencies diff --git a/nuttx/arch/z80/src/Makefile.zdsiil b/nuttx/arch/z80/src/Makefile.zdsiil index 87ada571f..39c4cbe1e 100644 --- a/nuttx/arch/z80/src/Makefile.zdsiil +++ b/nuttx/arch/z80/src/Makefile.zdsiil @@ -1,7 +1,7 @@ ############################################################################ # arch/z80/src/Makefile.zdsiil # -# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,6 +51,7 @@ LDFLAGS += @nuttx.linkcmd ############################################################################ # Files and directories + ifneq ($(HEAD_SSRC),) HEAD_GENSRC = $(HEAD_SSRC:.S=$(ASMEXT)) HEAD_OBJ = $(HEAD_SSRC:.S=$(OBJEXT)) @@ -58,6 +59,8 @@ else HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT)) endif +STARTUP_OBJS ?= $(HEAD_OBJ) + SSRCS = $(CHIP_SSRCS) $(CMN_SSRCS) ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS) GENSRCS = $(SSRCS:.S=$(ASMEXT)) @@ -140,9 +143,9 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) nuttx.linkcmd # This is part of the top-level export target -export_head: board$(DELIM)libboard$(LIBEXT) $(HEAD_OBJ) +export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS) $(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \ - cp -f $(HEAD_OBJ) "$(EXPORT_DIR)$(DELIM)startup"; \ + cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup"; \ else \ echo "$(EXPORT_DIR)$(DELIM)startup does not exist"; \ exit 1; \ diff --git a/nuttx/arch/z80/src/Makefile.zdsiiw b/nuttx/arch/z80/src/Makefile.zdsiiw index bf599ecae..25099e8a6 100644 --- a/nuttx/arch/z80/src/Makefile.zdsiiw +++ b/nuttx/arch/z80/src/Makefile.zdsiiw @@ -1,7 +1,7 @@ ############################################################################ # arch/z80/src/Makefile.zdsiiw # -# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -55,6 +55,8 @@ else HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT)) endif +STARTUP_OBJS ?= $(HEAD_OBJ) + SSRCS = $(CHIP_SSRCS) $(CMN_SSRCS) ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS) GENSRCS = $(SSRCS:.S=$(ASMEXT)) @@ -132,8 +134,8 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) nuttx.linkcmd # This is part of the top-level export target -export_head: board$(DELIM)libboard$(LIBEXT) $(HEAD_OBJ) - $(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(HEAD_OBJ) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y) +export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS) + $(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y) # Dependencies -- cgit v1.2.3