From e19544c7aacaf61fac85ad0e2606a86e09526f77 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 5 May 2013 09:10:47 -0600 Subject: [PATCH] Make Pirelli-DLP10 a true board configuration; Calypso no compiles without errors --- configs/Kconfig | 11 +++ configs/README.txt | 4 +- configs/pirelli_dpl10/README.txt | 2 +- configs/pirelli_dpl10/include/board.h | 6 ++ configs/pirelli_dpl10/include/power.h | 6 ++ configs/pirelli_dpl10/nsh_highram/Make.defs | 2 +- configs/pirelli_dpl10/nsh_highram/defconfig | 4 +- configs/pirelli_dpl10/src/.gitignore | 4 ++ configs/pirelli_dpl10/src/Makefile | 79 +++++++++++++++++++++ configs/pirelli_dpl10/src/dummy.c | 1 + 10 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 configs/pirelli_dpl10/include/board.h create mode 100644 configs/pirelli_dpl10/include/power.h create mode 100644 configs/pirelli_dpl10/src/.gitignore create mode 100644 configs/pirelli_dpl10/src/Makefile create mode 100644 configs/pirelli_dpl10/src/dummy.c diff --git a/configs/Kconfig b/configs/Kconfig index 0fb6705b42d..ba22eea6602 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -429,6 +429,13 @@ config ARCH_BOARD_PIC32_PIC32MX7MMB This is the port NuttX to the Mikroelektronika PIC32MX7 Multimedia Board (MMB). See http://www.mikroe.com/ for further information. +config ARCH_BOARD_PIRELLI_DPL10 + bool "Pirelli DPL10 phone" + depends on ARCH_CHIP_CALYPSO + ---help--- + This directory contains the board support for Pirelli dpl10 phones. The + additions were made by Craig Comstock (with help form Alan Carvalho de Assis). + config ARCH_BOARD_PJRC_87C52 bool "PJRC 87C52 development system" depends on ARCH_CHIP_8052 @@ -742,6 +749,7 @@ config ARCH_BOARD default "pcblogic-pic32mx" if ARCH_BOARD_PCBLOGICPIC32MX default "pic32-starterkit" if ARCH_BOARD_PIC32_STARTERKIT default "pic32mx7mmb" if ARCH_BOARD_PIC32_PIC32MX7MMB + default "pirelli_dpl10" if ARCH_BOARD_PIRELLI_DPL10 default "pjrc-8051" if ARCH_BOARD_PJRC_87C52 default "qemu-i486" if ARCH_BOARD_QEMU_I486 default "rgmp" if ARCH_BOARD_RGMP @@ -949,6 +957,9 @@ endif if ARCH_BOARD_PIC32_PIC32MX7MMB source "configs/pic32mx7mmb/Kconfig" endif +if ARCH_BOARD_PIRELLI_DPL10 +source "configs/pirelli_dpl10/Kconfig" +endif if ARCH_BOARD_PJRC_87C52 source "configs/pjrc-8051/Kconfig" endif diff --git a/configs/README.txt b/configs/README.txt index cb188769304..9cc1edc0d0f 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -1938,8 +1938,8 @@ configs/pic32mx7mmb configs/pirelli_dpl10 This directory contains the board support for pirelli dpl10 phones. - It is a variant of the compal_e88 config with the small change of enabling - the IrDA serial console. + It is a variant of the compal_e88 config with the small changes for the + differences in the board. configs/pjrc-8051 8051 Microcontroller. This port uses the PJRC 87C52 development system diff --git a/configs/pirelli_dpl10/README.txt b/configs/pirelli_dpl10/README.txt index ca16fe8a97a..79de6a757ce 100644 --- a/configs/pirelli_dpl10/README.txt +++ b/configs/pirelli_dpl10/README.txt @@ -1,7 +1,7 @@ pirelli_dpl10 ============= -This directory contains the board support for pirelli dpl10 phones. +This directory contains the board support for Pirelli dpl10 phones. It is a variant of the compal_e88 configuration with the small change of enabling the IrDA serial console: diff --git a/configs/pirelli_dpl10/include/board.h b/configs/pirelli_dpl10/include/board.h new file mode 100644 index 00000000000..9fecb3c5f9a --- /dev/null +++ b/configs/pirelli_dpl10/include/board.h @@ -0,0 +1,6 @@ +/************************************************************************ + * configs/pirelli_dpl10/include/board.h + * + * Supposed to be empty + * + ************************************************************************/ diff --git a/configs/pirelli_dpl10/include/power.h b/configs/pirelli_dpl10/include/power.h new file mode 100644 index 00000000000..45d8ee7f94d --- /dev/null +++ b/configs/pirelli_dpl10/include/power.h @@ -0,0 +1,6 @@ +/************************************************************************ + * configs/pirelli_dpl10/include/power.h + * + * Supposed to be empty + * + ************************************************************************/ diff --git a/configs/pirelli_dpl10/nsh_highram/Make.defs b/configs/pirelli_dpl10/nsh_highram/Make.defs index a77493097ec..7ce44aecc8d 100644 --- a/configs/pirelli_dpl10/nsh_highram/Make.defs +++ b/configs/pirelli_dpl10/nsh_highram/Make.defs @@ -123,5 +123,5 @@ MKDEP = $(TOPDIR)/tools/mkdeps.sh HOSTCC = gcc HOSTINCLUDES = -I. -HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe +HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe HOSTLDFLAGS = diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig index a4456faf0d7..d3dd7bdf012 100644 --- a/configs/pirelli_dpl10/nsh_highram/defconfig +++ b/configs/pirelli_dpl10/nsh_highram/defconfig @@ -40,8 +40,8 @@ CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y CONFIG_ARCH_CHIP="calypso" CONFIG_ARCH_CHIP_CALYPSO=y -CONFIG_ARCH_BOARD="compal_e88" -CONFIG_ARCH_BOARD_COMPALE88=y +CONFIG_ARCH_BOARD="pirelli_dpl10" +CONFIG_ARCH_BOARD_PIRELLI_DPL10=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n CONFIG_ARCH_LEDS=n diff --git a/configs/pirelli_dpl10/src/.gitignore b/configs/pirelli_dpl10/src/.gitignore new file mode 100644 index 00000000000..e9b561c4e32 --- /dev/null +++ b/configs/pirelli_dpl10/src/.gitignore @@ -0,0 +1,4 @@ +.depend +Make.dep + + diff --git a/configs/pirelli_dpl10/src/Makefile b/configs/pirelli_dpl10/src/Makefile new file mode 100644 index 00000000000..650171e0dd7 --- /dev/null +++ b/configs/pirelli_dpl10/src/Makefile @@ -0,0 +1,79 @@ +############################################################################ +# configs/pirelli_dpl10/src/Makefile +# +# Copyright (C) 2007, 2008, 2013 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Copyright (C) 2011 Stefan Richter. All rights reserved. +# Author: Stefan Richter +# +# 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 + +CFLAGS += -I$(TOPDIR)/sched + +ASRCS = +AOBJS = $(ASRCS:.S=$(OBJEXT)) +CSRCS = dummy.c +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm + +all: libboard$(LIBEXT) + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +libboard$(LIBEXT): $(OBJS) + $(call ARCHIVE, $@, $(OBJS)) + +.depend: Makefile $(SRCS) + $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ + +depend: .depend + +clean: + $(call DELFILE, libboard$(LIBEXT)) + $(call CLEAN) + +distclean: clean + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + +-include Make.dep diff --git a/configs/pirelli_dpl10/src/dummy.c b/configs/pirelli_dpl10/src/dummy.c new file mode 100644 index 00000000000..69853a13041 --- /dev/null +++ b/configs/pirelli_dpl10/src/dummy.c @@ -0,0 +1 @@ +/* no libboard.a otherwise */