From 78ce78da3c0c3682c8805343e6099bf46854c653 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 10:58:58 -0600 Subject: [PATCH] LM3S6965-EK: Rename files for better conformance to naming conventions --- configs/lm3s6965-ek/src/Makefile | 30 ++++++++++--------- configs/lm3s6965-ek/src/lm3s6965ek_internal.h | 3 +- .../lm3s6965-ek/src/{up_boot.c => lm_boot.c} | 4 +-- .../src/{up_ethernet.c => lm_ethernet.c} | 3 +- .../lm3s6965-ek/src/{up_leds.c => lm_leds.c} | 2 +- .../lm3s6965-ek/src/{up_nsh.c => lm_nsh.c} | 5 ++-- .../lm3s6965-ek/src/{up_oled.c => lm_oled.c} | 5 ++-- .../lm3s6965-ek/src/{up_ssi.c => lm_ssi.c} | 5 ++-- 8 files changed, 27 insertions(+), 30 deletions(-) rename configs/lm3s6965-ek/src/{up_boot.c => lm_boot.c} (98%) rename configs/lm3s6965-ek/src/{up_ethernet.c => lm_ethernet.c} (98%) rename configs/lm3s6965-ek/src/{up_leds.c => lm_leds.c} (99%) rename configs/lm3s6965-ek/src/{up_nsh.c => lm_nsh.c} (98%) rename configs/lm3s6965-ek/src/{up_oled.c => lm_oled.c} (98%) rename configs/lm3s6965-ek/src/{up_ssi.c => lm_ssi.c} (98%) diff --git a/configs/lm3s6965-ek/src/Makefile b/configs/lm3s6965-ek/src/Makefile index 2a9ebb8454..eaf04311d1 100644 --- a/configs/lm3s6965-ek/src/Makefile +++ b/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/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h index 6c38276f10..44a136e73d 100644 --- a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h +++ b/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 @@ -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/configs/lm3s6965-ek/src/up_boot.c b/configs/lm3s6965-ek/src/lm_boot.c similarity index 98% rename from configs/lm3s6965-ek/src/up_boot.c rename to configs/lm3s6965-ek/src/lm_boot.c index d2619b3604..afa70a12ef 100644 --- a/configs/lm3s6965-ek/src/up_boot.c +++ b/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 @@ -49,7 +49,7 @@ #include "lm3s6965ek_internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/lm3s6965-ek/src/up_ethernet.c b/configs/lm3s6965-ek/src/lm_ethernet.c similarity index 98% rename from configs/lm3s6965-ek/src/up_ethernet.c rename to configs/lm3s6965-ek/src/lm_ethernet.c index 6a7e0133f1..6d4d62f5fa 100644 --- a/configs/lm3s6965-ek/src/up_ethernet.c +++ b/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 diff --git a/configs/lm3s6965-ek/src/up_leds.c b/configs/lm3s6965-ek/src/lm_leds.c similarity index 99% rename from configs/lm3s6965-ek/src/up_leds.c rename to configs/lm3s6965-ek/src/lm_leds.c index 5dbe596655..060ff3fbb3 100644 --- a/configs/lm3s6965-ek/src/up_leds.c +++ b/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 diff --git a/configs/lm3s6965-ek/src/up_nsh.c b/configs/lm3s6965-ek/src/lm_nsh.c similarity index 98% rename from configs/lm3s6965-ek/src/up_nsh.c rename to configs/lm3s6965-ek/src/lm_nsh.c index 65770f0a94..47a001ae50 100644 --- a/configs/lm3s6965-ek/src/up_nsh.c +++ b/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 @@ -48,7 +47,7 @@ #include /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/lm3s6965-ek/src/up_oled.c b/configs/lm3s6965-ek/src/lm_oled.c similarity index 98% rename from configs/lm3s6965-ek/src/up_oled.c rename to configs/lm3s6965-ek/src/lm_oled.c index 2f10891f4f..b2582ce822 100644 --- a/configs/lm3s6965-ek/src/up_oled.c +++ b/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 @@ -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/configs/lm3s6965-ek/src/up_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c similarity index 98% rename from configs/lm3s6965-ek/src/up_ssi.c rename to configs/lm3s6965-ek/src/lm_ssi.c index aea93c995e..97775e491a 100644 --- a/configs/lm3s6965-ek/src/up_ssi.c +++ b/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 @@ -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) */