From 7c0bd1ad17945643cc2616135aa4244319fa8158 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 16 Aug 2011 15:06:39 +0000 Subject: [PATCH] Fixed for Kinetis build with DEBUG on git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3885 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/kinetis/kinetis_start.c | 8 +- arch/arm/src/kinetis/kinetis_vectors.S | 4 - configs/kwikstik-k40/src/Makefile | 14 ++- configs/twr-k60n512/src/Makefile | 14 ++- configs/twr-k60n512/src/up_lcd.c | 134 ------------------------- 5 files changed, 32 insertions(+), 142 deletions(-) delete mode 100755 configs/twr-k60n512/src/up_lcd.c diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c index 1baa5e6260..d976e5b2c2 100644 --- a/arch/arm/src/kinetis/kinetis_start.c +++ b/arch/arm/src/kinetis/kinetis_start.c @@ -51,6 +51,7 @@ #include "up_internal.h" #include "kinetis_internal.h" +#include "kinetis_smc.h" /**************************************************************************** * Private Definitions @@ -122,12 +123,15 @@ void __start(void) } #endif - /* Perform clock and Kinetis module initialization */ + /* Perform clock and Kinetis module initialization (This depends on + * RAM functions having been copied to RAM). + */ kinetis_clockconfig(); /* Configure the uart and perform early serial initialization so that we - * can get debug output as soon as possible. + * can get debug output as soon as possible (This depends on clock + * configuration). */ kinetis_lowsetup(); diff --git a/arch/arm/src/kinetis/kinetis_vectors.S b/arch/arm/src/kinetis/kinetis_vectors.S index 017483bb2f..ff252c91a1 100644 --- a/arch/arm/src/kinetis/kinetis_vectors.S +++ b/arch/arm/src/kinetis/kinetis_vectors.S @@ -44,10 +44,6 @@ /************************************************************************************************ * Preprocessor Definitions ************************************************************************************************/ -# define KINETIS_FLASH_BASE 0x00000000 /* –0x0fffffff Program flash and read- - define KINETIS_SRAML_BASE 0000 /* –0x1fffffff SRAM_L: Lower SRAM - * (ICODE/DCODE) */ - /* Memory Map: * * 0x0000:0000 - Beginning of FLASH. Address of vectors diff --git a/configs/kwikstik-k40/src/Makefile b/configs/kwikstik-k40/src/Makefile index 8e46fb2d22..9e0d72258b 100755 --- a/configs/kwikstik-k40/src/Makefile +++ b/configs/kwikstik-k40/src/Makefile @@ -40,12 +40,24 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_boot.c up_lcd.c up_leds.c up_buttons.c up_spi.c up_usbdev.c +CSRCS = up_boot.c up_lcd.c up_spi.c + +ifeq ($(CONFIG_ARCH_LEDS),y) +CSRCS += up_leds.c +endif + +ifeq ($(CONFIG_ARCH_BUTTONS),y) +CSRCS += up_buttons.c +endif ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif +ifeq ($(CONFIG_USBDEV),y) +CSRCS += up_usbdev.c +endif + ifeq ($(CONFIG_USBSTRG),y) CSRCS += up_usbstrg.c endif diff --git a/configs/twr-k60n512/src/Makefile b/configs/twr-k60n512/src/Makefile index 2593963b1a..4a5e743b7f 100755 --- a/configs/twr-k60n512/src/Makefile +++ b/configs/twr-k60n512/src/Makefile @@ -40,12 +40,24 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_boot.c up_lcd.c up_leds.c up_buttons.c up_spi.c up_usbdev.c +CSRCS = up_boot.c up_spi.c + +ifeq ($(CONFIG_ARCH_LEDS),y) +CSRCS += up_leds.c +endif + +ifeq ($(CONFIG_ARCH_BUTTONS),y) +CSRCS += up_buttons.c +endif ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif +ifeq ($(CONFIG_USBDEV),y) +CSRCS += up_usbdev.c +endif + ifeq ($(CONFIG_USBSTRG),y) CSRCS += up_usbstrg.c endif diff --git a/configs/twr-k60n512/src/up_lcd.c b/configs/twr-k60n512/src/up_lcd.c deleted file mode 100755 index 494a28c82c..0000000000 --- a/configs/twr-k60n512/src/up_lcd.c +++ /dev/null @@ -1,134 +0,0 @@ -/************************************************************************************** - * configs/twr-k60n512/src/up_lcd.c - * arch/arm/src/board/up_lcd.c - * - * Copyright (C) 2011 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. - * - **************************************************************************************/ - -/************************************************************************************** - * Included Files - **************************************************************************************/ - -#include - -#include -#include -#include - -#include - -#include "up_arch.h" -#include "twrk60-internal.h" - - -/************************************************************************************** - * Pre-processor Definitions - **************************************************************************************/ - -/* Configuration **********************************************************************/ - -/* Display/Color Properties ***********************************************************/ - -/* Debug ******************************************************************************/ - -#ifdef CONFIG_DEBUG_LCD -# define lcddbg(format, arg...) vdbg(format, ##arg) -#else -# define lcddbg(x...) -#endif - -/************************************************************************************** - * Private Type Definition - **************************************************************************************/ - -/************************************************************************************** - * Private Function Protototypes - **************************************************************************************/ - -/************************************************************************************** - * Private Data - **************************************************************************************/ - -/************************************************************************************** - * Private Functions - **************************************************************************************/ - -/************************************************************************************** - * Public Functions - **************************************************************************************/ - -/************************************************************************************** - * Name: up_lcdinitialize - * - * Description: - * Initialize the LCD video hardware. The initial state of the LCD is fully - * initialized, display memory cleared, and the LCD ready to use, but with the power - * setting at 0 (full off). - * - **************************************************************************************/ - -int up_lcdinitialize(void) -{ - gvdbg("Initializing\n"); -#warning "Missing logic" - return OK; -} - -/************************************************************************************** - * Name: up_lcdgetdev - * - * Description: - * Return a a reference to the LCD object for the specified LCD. This allows support - * for multiple LCD devices. - * - **************************************************************************************/ - -FAR struct lcd_dev_s *up_lcdgetdev(int lcddev) -{ - DEBUGASSERT(lcddev == 0); -#warning "Missing logic" - return NULL; -} - -/************************************************************************************** - * Name: up_lcduninitialize - * - * Description: - * Unitialize the LCD support - * - **************************************************************************************/ - -void up_lcduninitialize(void) -{ -#warning "Missing logic" -} -