diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-21 10:58:58 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-21 10:58:58 -0600 |
commit | 3a1fd703ea9540ef88802b29eb7e5300b9ffee77 (patch) | |
tree | bcfe34a933c4b87082920f36a9da5e1d4de32b67 /nuttx | |
parent | 6b57196e31fe88afb8078616014dd13f08f0aeb2 (diff) | |
download | px4-nuttx-3a1fd703ea9540ef88802b29eb7e5300b9ffee77.tar.gz px4-nuttx-3a1fd703ea9540ef88802b29eb7e5300b9ffee77.tar.bz2 px4-nuttx-3a1fd703ea9540ef88802b29eb7e5300b9ffee77.zip |
LM3S6965-EK: Rename files for better conformance to naming conventions
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/configs/lm3s6965-ek/src/Makefile | 30 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h | 3 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/src/lm_boot.c (renamed from nuttx/configs/lm3s6965-ek/src/up_boot.c) | 4 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/src/lm_ethernet.c (renamed from nuttx/configs/lm3s6965-ek/src/up_ethernet.c) | 3 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/src/lm_leds.c (renamed from nuttx/configs/lm3s6965-ek/src/up_leds.c) | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/src/lm_nsh.c (renamed from nuttx/configs/lm3s6965-ek/src/up_nsh.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/src/lm_oled.c (renamed from nuttx/configs/lm3s6965-ek/src/up_oled.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/src/lm_ssi.c (renamed from nuttx/configs/lm3s6965-ek/src/up_ssi.c) | 5 |
8 files changed, 27 insertions, 30 deletions
diff --git a/nuttx/configs/lm3s6965-ek/src/Makefile b/nuttx/configs/lm3s6965-ek/src/Makefile index 2a9ebb845..eaf04311d 100644 --- a/nuttx/configs/lm3s6965-ek/src/Makefile +++ b/nuttx/configs/lm3s6965-ek/src/Makefile @@ -35,30 +35,32 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched + +ASRCS = +AOBJS = $(ASRCS:.S=$(OBJEXT)) +CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c -ASRCS = -AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_boot.c up_leds.c up_ethernet.c up_ssi.c ifeq ($(CONFIG_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += lm_nsh.c endif + ifeq ($(CONFIG_NX_LCDDRIVER),y) -CSRCS += up_oled.c +CSRCS += lm_oled.c endif -COBJS = $(CSRCS:.c=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) -ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ifeq ($(WINTOOL),y) - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ - -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ - -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}" else - CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m + CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m endif all: libboard$(LIBEXT) diff --git a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h index 6c38276f1..44a136e73 100644 --- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h +++ b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h @@ -1,6 +1,5 @@ /************************************************************************************ * configs/lm3s6965-ek/src/lm3s6965ek_internal.h - * arch/arm/src/board/lm3s6965ek_internal.h * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -48,7 +47,7 @@ #include "tiva_gpio.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* How many SSI modules does this chip support? The LM3S6965 supports 1 SSI diff --git a/nuttx/configs/lm3s6965-ek/src/up_boot.c b/nuttx/configs/lm3s6965-ek/src/lm_boot.c index d2619b360..afa70a12e 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_boot.c +++ b/nuttx/configs/lm3s6965-ek/src/lm_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/lm3s6965-ek/src/up_boot.c + * configs/lm3s6965-ek/src/lm_boot.c * * Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -49,7 +49,7 @@ #include "lm3s6965ek_internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/nuttx/configs/lm3s6965-ek/src/up_ethernet.c b/nuttx/configs/lm3s6965-ek/src/lm_ethernet.c index 6a7e0133f..6d4d62f5f 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_ethernet.c +++ b/nuttx/configs/lm3s6965-ek/src/lm_ethernet.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/lm3s6965-ek/src/up_ethernet.c - * arch/arm/src/board/up_ethernet.c + * configs/lm3s6965-ek/src/lm_ethernet.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/lm3s6965-ek/src/up_leds.c b/nuttx/configs/lm3s6965-ek/src/lm_leds.c index 5dbe59665..060ff3fbb 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_leds.c +++ b/nuttx/configs/lm3s6965-ek/src/lm_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/lm3s6965-ek/src/up_leds.c + * configs/lm3s6965-ek/src/lm_leds.c * * Copyright (C) 2010, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/lm3s6965-ek/src/up_nsh.c b/nuttx/configs/lm3s6965-ek/src/lm_nsh.c index 65770f0a9..47a001ae5 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_nsh.c +++ b/nuttx/configs/lm3s6965-ek/src/lm_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/lm3s6965-ek/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/lm3s6965-ek/src/lm_nsh.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -48,7 +47,7 @@ #include <nuttx/mmcsd.h> /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/nuttx/configs/lm3s6965-ek/src/up_oled.c b/nuttx/configs/lm3s6965-ek/src/lm_oled.c index 2f10891f4..b2582ce82 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_oled.c +++ b/nuttx/configs/lm3s6965-ek/src/lm_oled.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/lm3s6965-ek/src/up_oled.c - * arch/arm/src/board/up_oled.c + * config/lm3s6965-ek/src/lm_oled.c * * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -52,7 +51,7 @@ #include "lm3s6965ek_internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Define the CONFIG_LCD_RITDEBUG to enable detailed debug output (stuff you diff --git a/nuttx/configs/lm3s6965-ek/src/up_ssi.c b/nuttx/configs/lm3s6965-ek/src/lm_ssi.c index aea93c995..97775e491 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_ssi.c +++ b/nuttx/configs/lm3s6965-ek/src/lm_ssi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/lm3s6965-ek/src/up_ssi.c - * arch/arm/src/board/up_ssi.c + * configs/lm3s6965-ek/src/lm_ssi.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -57,7 +56,7 @@ #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */ /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG too) */ |