From e1fbe0ba0dae38b2116e4a99a5eb47c3ec1f6437 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 30 Oct 2013 09:04:37 -0600 Subject: [PATCH] apps/platform: A new now for platform-specific applicatin code --- ChangeLog.txt | 5 ++ Kconfig | 4 + Makefile | 7 +- platform/.gitignore | 4 + platform/Kconfig | 6 ++ platform/Make.defs | 37 ++++++++ platform/Makefile | 135 ++++++++++++++++++++++++++++++ platform/bin/Makefile | 48 +++++++++++ platform/dummy/Kconfig | 4 + platform/dummy/Make.defs | 34 ++++++++ platform/mikroe-stm32f4/Kconfig | 7 ++ platform/mikroe-stm32f4/Make.defs | 39 +++++++++ system/nxplayer/Makefile | 5 +- 13 files changed, 329 insertions(+), 6 deletions(-) create mode 100644 platform/.gitignore create mode 100644 platform/Kconfig create mode 100644 platform/Make.defs create mode 100644 platform/Makefile create mode 100644 platform/bin/Makefile create mode 100644 platform/dummy/Kconfig create mode 100644 platform/dummy/Make.defs create mode 100644 platform/mikroe-stm32f4/Kconfig create mode 100644 platform/mikroe-stm32f4/Make.defs diff --git a/ChangeLog.txt b/ChangeLog.txt index c7160a968..a75cd6cb1 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -706,3 +706,8 @@ From Ken Pettit (2013-10-28). 6.31 2013-xx-xx Gregory Nutt + + * apps/platform: A new home for board-specific application code + (2013-10-30). + + diff --git a/Kconfig b/Kconfig index e4d179210..606cf8146 100644 --- a/Kconfig +++ b/Kconfig @@ -35,6 +35,10 @@ menu "NxWidgets/NxWM" source "$APPSDIR/NxWidgets/Kconfig" endmenu +menu "Platform-specific Support" +source "$APPSDIR/platform/Kconfig" +endmenu + menu "System NSH Add-Ons" source "$APPSDIR/system/Kconfig" endmenu diff --git a/Makefile b/Makefile index 03e812ff3..bc0959106 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ ############################################################################ # apps/Makefile # -# Copyright (C) 2011-2012 Uros Platise. All rights reserved. +# Copyright (C) 2011 Uros Platise. All rights reserved. +# Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. # Authors: Uros Platise # Gregory Nutt # @@ -48,7 +49,8 @@ APPDIR = ${shell pwd} # list can be extended by the .config file as well. CONFIGURED_APPS = -SUBDIRS = examples graphics interpreters modbus builtin nshlib netutils system +SUBDIRS = examples graphics interpreters modbus builtin nshlib netutils +SUBDIRS += platform system # There are two different mechanisms for obtaining the list of configured # directories: @@ -78,6 +80,7 @@ include interpreters/Make.defs include modbus/Make.defs include netutils/Make.defs include nshlib/Make.defs +include platform/Make.defs include system/Make.defs -include external/Make.defs diff --git a/platform/.gitignore b/platform/.gitignore new file mode 100644 index 000000000..4847299eb --- /dev/null +++ b/platform/.gitignore @@ -0,0 +1,4 @@ +/.built +/Make.defs +board + diff --git a/platform/Kconfig b/platform/Kconfig new file mode 100644 index 000000000..d0cfd0f97 --- /dev/null +++ b/platform/Kconfig @@ -0,0 +1,6 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +source "$APPSDIR/platform/mikroe-stm32f4/Kconfig" diff --git a/platform/Make.defs b/platform/Make.defs new file mode 100644 index 000000000..bce855e83 --- /dev/null +++ b/platform/Make.defs @@ -0,0 +1,37 @@ +############################################################################ +# apps/platform/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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. +# +############################################################################ + +CONFIGURED_APPS += platform diff --git a/platform/Makefile b/platform/Makefile new file mode 100644 index 000000000..4b47bc688 --- /dev/null +++ b/platform/Makefile @@ -0,0 +1,135 @@ +############################################################################ +# apps/platform/Makefile +# +# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)$(DELIM)Make.defs + +# Platform-specific Appliction Support +# Tool stuff + +ifeq ($(DIRLINK),) +DIRLINK = $(TOPDIR)/tools/link.sh +DIRUNLINK = $(TOPDIR)/tools/unlink.sh +endif + +ifeq ($(WINTOOL),y) +INCDIROPT = -w +endif + +# Directories + +BINDIR = $(APPDIR)$(DELIM)platform$(DELIM)bin +PLATFORMDIR = $(APPDIR)$(DELIM)platform$(DELIM)board +DUMMYDIR = $(APPDIR)$(DELIM)platform$(DELIM)dummy +BOARDDIR = $(APPDIR)$(DELIM)platform$(DELIM)$(CONFIG_ARCH_BOARD) +LINKDIR = $(if $(wildcard $(BOARDDIR)$(DELIM)Make.defs),$(BOARDDIR),$(DUMMYDIR)) + +VPATH = $(PLATFORMDIR) + +# Binaries + +ASRCS = +CSRCS = + +-include $(PLATFORMDIR)$(DELIM)Make.defs + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + BIN = ..\libapps$(LIBEXT) +else +ifeq ($(WINTOOL),y) + BIN = ..\\libapps$(LIBEXT) +else + BIN = ../libapps$(LIBEXT) +endif +endif + +# Build targets + +all: .built +.PHONY: context .depend depend clean distclean + +ifneq ($(AOBJS),) +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) +endif + +ifneq ($(COBJS),) +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) +endif + +.built: $(OBJS) +ifneq ($(OBJS),) + $(call ARCHIVE, $(BIN), $(OBJS)) +endif + $(Q) touch .built + +# Build context setup + +$(PLATFORMDIR): $(TOPDIR)$(DELIM).config + @echo "LN: platform$(DELIM)board to $(LINKDIR)" + $(Q) $(DIRUNLINK) $(PLATFORMDIR) + $(Q) $(DIRLINK) $(LINKDIR) $(PLATFORMDIR) + +context: $(PLATFORMDIR) + +# Dependencies + +.depend: Makefile $(SRCS) $(PLATFORMDIR) + $(Q) $(MKDEP) --obj-path bin --obj-suffix $(OBJEXT) --dep-path $(PLATFORMDIR) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ + +depend: .depend + +# Clean targets + +clean: $(PLATFORMDIR) + $(call DELFILE, .built) + $(MAKE) -C $(BINDIR) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" clean + +distclean: clean + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + $(Q) $(DIRUNLINK) $(PLATFORMDIR) + +-include Make.dep + diff --git a/platform/bin/Makefile b/platform/bin/Makefile new file mode 100644 index 000000000..3f8b21f12 --- /dev/null +++ b/platform/bin/Makefile @@ -0,0 +1,48 @@ +############################################################################ +# libc/bin/Makefile +# +# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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. +# +########################################################################### + +-include $(TOPDIR)/Make.defs + +all: +.PHONY: clean distclean + +# Clean Targets: + +clean: + $(call CLEAN) + +# Deep clean -- removes all traces of the configuration + +distclean: clean diff --git a/platform/dummy/Kconfig b/platform/dummy/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/platform/dummy/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/platform/dummy/Make.defs b/platform/dummy/Make.defs new file mode 100644 index 000000000..42a1dbe5f --- /dev/null +++ b/platform/dummy/Make.defs @@ -0,0 +1,34 @@ +############################################################################ +# apps/platform/dummy/Make.defs +# +# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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. +# +############################################################################ diff --git a/platform/mikroe-stm32f4/Kconfig b/platform/mikroe-stm32f4/Kconfig new file mode 100644 index 000000000..b6672b7fb --- /dev/null +++ b/platform/mikroe-stm32f4/Kconfig @@ -0,0 +1,7 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +if ARCH_BOARD_MIKROE_STM32F4 +endif diff --git a/platform/mikroe-stm32f4/Make.defs b/platform/mikroe-stm32f4/Make.defs new file mode 100644 index 000000000..bf0cc47ed --- /dev/null +++ b/platform/mikroe-stm32f4/Make.defs @@ -0,0 +1,39 @@ +############################################################################ +# apps/platform/mikroe-stm32f4/Make.defs +# +# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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. +# +############################################################################ + +# Add platform specific sources to ASRCS and CSRCS + +# ASRCS += xyz.S +# CSRCS += xyz.c diff --git a/system/nxplayer/Makefile b/system/nxplayer/Makefile index b7d04e2a7..bcdcbfc0e 100644 --- a/system/nxplayer/Makefile +++ b/system/nxplayer/Makefile @@ -35,9 +35,6 @@ # ############################################################################ -# TODO, this makefile should run make under the app dirs, instead of -# sourcing the Make.defs! - -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs @@ -122,7 +119,7 @@ depend: .depend clean: $(call DELFILE, .built) $(call CLEAN) - rm -rf ..$(DELIM)..$(DELIM)builtin$(DELIM)registry$(DELIM)$(APPNAME)_main.* + $(Q) rm -rf ..$(DELIM)..$(DELIM)builtin$(DELIM)registry$(DELIM)$(APPNAME)_main.* distclean: clean $(call DELFILE, Make.dep)