From f1297c303a32cfd9e00ae691cb15d28fc651a8d0 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 13:48:34 -0600 Subject: [PATCH] AVR32DEV1: Rename files for better conformance to naming conventions --- configs/avr32dev1/src/Makefile | 28 +++++++++---------- .../avr32dev1/src/{up_boot.c => avr32_boot.c} | 2 +- .../src/{up_buttons.c => avr32_buttons.c} | 2 +- .../avr32dev1/src/{up_leds.c => avr32_leds.c} | 2 +- configs/avr32dev1/src/avr32dev1_internal.h | 4 +-- 5 files changed, 18 insertions(+), 20 deletions(-) rename configs/avr32dev1/src/{up_boot.c => avr32_boot.c} (98%) rename configs/avr32dev1/src/{up_buttons.c => avr32_buttons.c} (99%) rename configs/avr32dev1/src/{up_leds.c => avr32_leds.c} (99%) diff --git a/configs/avr32dev1/src/Makefile b/configs/avr32dev1/src/Makefile index d96334291a..9117c3a841 100644 --- a/configs/avr32dev1/src/Makefile +++ b/configs/avr32dev1/src/Makefile @@ -35,30 +35,30 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched -ASRCS = -CSRCS = up_boot.c +ASRCS = +CSRCS = avr32_boot.c ifeq ($(CONFIG_ARCH_LEDS),y) -CSRCS += up_leds.c +CSRCS += avr32_leds.c endif ifeq ($(CONFIG_ARCH_BUTTONS),y) -CSRCS += up_buttons.c +CSRCS += avr32_buttons.c endif -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(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)/avr32}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/avr32}" else - CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/avr32 + CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/avr32 endif all: libboard$(LIBEXT) diff --git a/configs/avr32dev1/src/up_boot.c b/configs/avr32dev1/src/avr32_boot.c similarity index 98% rename from configs/avr32dev1/src/up_boot.c rename to configs/avr32dev1/src/avr32_boot.c index 75f0e9e71a..c558339740 100644 --- a/configs/avr32dev1/src/up_boot.c +++ b/configs/avr32dev1/src/avr32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/avr32dev1/src/up_boot.c + * configs/avr32dev1/src/avr32_boot.c * * Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/avr32dev1/src/up_buttons.c b/configs/avr32dev1/src/avr32_buttons.c similarity index 99% rename from configs/avr32dev1/src/up_buttons.c rename to configs/avr32dev1/src/avr32_buttons.c index 9d26e7f9a0..d1d6de2766 100644 --- a/configs/avr32dev1/src/up_buttons.c +++ b/configs/avr32dev1/src/avr32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/sam3u-ek/src/up_leds.c + * configs/avr32dev1/src/avr32_buttons.c * * Copyright (C) 2010-2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/avr32dev1/src/up_leds.c b/configs/avr32dev1/src/avr32_leds.c similarity index 99% rename from configs/avr32dev1/src/up_leds.c rename to configs/avr32dev1/src/avr32_leds.c index e81b8c6ef6..a5d0f1c08f 100644 --- a/configs/avr32dev1/src/up_leds.c +++ b/configs/avr32dev1/src/avr32_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/avr32dev1/src/up_leds.c + * configs/avr32dev1/src/avr32_leds.c * * Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/avr32dev1/src/avr32dev1_internal.h b/configs/avr32dev1/src/avr32dev1_internal.h index 663b6fde42..6c93e460b8 100644 --- a/configs/avr32dev1/src/avr32dev1_internal.h +++ b/configs/avr32dev1/src/avr32dev1_internal.h @@ -1,6 +1,5 @@ /************************************************************************************ * configs/avr32dev1/src/avr32dev1_internal.h - * arch/avr/src/board/avr32dev1_internal.n * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +45,7 @@ #include "at32uc3_config.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration ********************************************************************/ @@ -113,4 +112,3 @@ #endif /* __ASSEMBLY__ */ #endif /* _CONFIGS_AVR32DEV1_SRC_AVR32DEV1_INTERNAL_H */ -