sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move remaining, unique Make.defs files into scripts directory.

Browse Source
This commit is contained in:
Gregory Nutt 2017-07-11 10:39:17 -06:00
parent b750df8f46
commit 2fa83cb52a
14 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configs/amber/hello/Make.defs → configs/amber/scripts/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# configs/amber/hello/Make.defs
# configs/amber/scripts/Make.defs
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/hello.ld}"
else
# Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include"
ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx"
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/hello.ld
endif
CC = $(CROSSDEV)gcc

4
configs/amber/hello/ld.script → configs/amber/scripts/hello.ld
View File

@ -1,7 +1,7 @@
/**************************************************************************************
* configs/amber/hello/ld.script
* configs/amber/scripts/hello.ld
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

10
configs/cc3200-launchpad/nsh/Make.defs → configs/arduino-due/scripts/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# configs/cc3200-launchpad/nsh/Make.defs
# configs/arduino-due/scripts/Make.defs
#
# Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld}"
else
# Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld
endif
CC = $(CROSSDEV)gcc
@ -103,9 +103,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
LDFLAGS += -g
endif
HOSTCC = gcc
HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS =

4
configs/arduino-due/scripts/ld.script → configs/arduino-due/scripts/arduino-due.ld
View File

@ -1,7 +1,7 @@
/****************************************************************************
* configs/arduino-due/scripts/ld.script
* configs/arduino-due/scripts/arduino-due.ld
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

10
configs/arduino-due/nsh/Make.defs → configs/cc3200-launchpad/scripts/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# configs/arduino-due/nsh/Make.defs
# configs/cc3200-launchpad/scripts/Make.defs
#
# Copyright (C) 2013 Gregory Nutt. All rights reserved.
# Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/cc3200-launchpad.ld}"
else
# Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/cc3200-launchpad.ld
endif
CC = $(CROSSDEV)gcc
@ -103,7 +103,9 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
LDFLAGS += -g
endif
HOSTCC = gcc
HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS =

2
configs/cc3200-launchpad/scripts/ld.script → configs/cc3200-launchpad/scripts/cc3200-launchpad.ld
View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/cc3200-launchpad/scripts/ld.script
* configs/cc3200-launchpad/scripts/cc3200-launchpad.ld
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>

6
configs/cloudctrl/nsh/Make.defs → configs/cloudctrl/scripts/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################
# configs/cloudctrl/nsh/Make.defs
# configs/cloudctrl/scripts/Make.defs
#
# Copyright (C) 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
@ -40,9 +40,9 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
# Pick the linker script
ifeq ($(CONFIG_STM32_DFU),y)
LDSCRIPT = ld.script.dfu
LDSCRIPT = cloudctrl-dfu.ld
else
LDSCRIPT = ld.script
LDSCRIPT = cloudctrl.ld
endif
ifeq ($(WINTOOL),y)

2
configs/cloudctrl/scripts/ld.script.dfu → configs/cloudctrl/scripts/cloudctrl-dfu.ld
View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/cloudctrl/scripts/ld.script.dfu
* configs/cloudctrl/scripts/cloudctrl-dfu.ld
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
configs/cloudctrl/scripts/ld.script → configs/cloudctrl/scripts/cloudctrl.ld
View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/cloudctrl/scripts/ld.script
* configs/cloudctrl/scripts/cloudctrl.ld
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
configs/demo9s12ne64/ostest/Make.defs → configs/demo9s12ne64/scripts/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# configs/demo9s12ne64/ostest/Make.defs
# configs/demo9s12ne64/scripts/Make.defs
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
# Copyright (C) 2009,2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -45,10 +45,10 @@ WINTOOL = n
ifeq ($(CONFIG_HCS12_NONBANKED),y)
ARCHCPUFLAGS = -m9s12x -mshort -mnolong-calls
LDSCRIPT = ld.script.nonbanked
LDSCRIPT = demo9s12ne64-unbanked.ld
else
ARCHCPUFLAGS = -m9s12x -mshort -mlong-calls
LDSCRIPT = ld.script.banked
LDSCRIPT = demo9s12ne64-banked.ld
endif
ifneq ($(CONFIG_HCS12_MSOFTREGS),0)

4
configs/demo9s12ne64/ostest/ld.script.banked → configs/demo9s12ne64/scripts/demo9s12ne64-banked.ld
View File

@ -1,7 +1,7 @@
/****************************************************************************
* configs/demo9s12ne64/ostest/ld.script
* configs/demo9s12ne64/ostest/demo9s12ne64-banked.ld
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

4
configs/demo9s12ne64/ostest/ld.script.nonbanked → configs/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld
View File

@ -1,7 +1,7 @@
/****************************************************************************
* configs/demo9s12ne64/ostest/ld.script
* configs/demo9s12ne64/ostest/demo9s12ne64-banked.ld
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

8
configs/ea3152/ostest/Make.defs → configs/ea3152/scripts/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# configs/ea3152/ostest/Make.defs
# configs/ea3152/scripts/Make.defs
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld}"
else
# Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld
endif
CC = $(CROSSDEV)gcc

4
configs/ea3152/scripts/ld.script → configs/ea3152/scripts/ea3152.ld
View File

@ -1,7 +1,7 @@
/****************************************************************************
* configs/ea3152/scripts/ld.script
* configs/ea3152/scripts/ea3152.ld
*
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without