From 834b230494fa0e3bda4bb3dab657e94772155b09 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 09:20:56 -0600 Subject: [PATCH] Olimex STM32 P107: Rename files for better conformance to naming conventions --- configs/olimex-stm32-p107/src/Makefile | 28 +++++++++---------- configs/olimex-stm32-p107/src/p107-internal.h | 2 +- .../src/{up_boot.c => stm32_boot.c} | 3 +- .../src/{up_can.c => stm32_can.c} | 2 +- .../{up_encx24j600.c => stm32_encx24j600.c} | 4 +-- .../src/{up_spi.c => stm32_spi.c} | 4 +-- 6 files changed, 21 insertions(+), 22 deletions(-) rename configs/olimex-stm32-p107/src/{up_boot.c => stm32_boot.c} (97%) rename configs/olimex-stm32-p107/src/{up_can.c => stm32_can.c} (99%) rename configs/olimex-stm32-p107/src/{up_encx24j600.c => stm32_encx24j600.c} (98%) rename configs/olimex-stm32-p107/src/{up_spi.c => stm32_spi.c} (98%) diff --git a/configs/olimex-stm32-p107/src/Makefile b/configs/olimex-stm32-p107/src/Makefile index 83211584d7..ab24d86605 100644 --- a/configs/olimex-stm32-p107/src/Makefile +++ b/configs/olimex-stm32-p107/src/Makefile @@ -35,33 +35,33 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched -ASRCS = -AOBJS = $(ASRCS:.S=$(OBJEXT)) +ASRCS = +AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_boot.c up_spi.c +CSRCS = stm32_boot.c stm32_spi.c ifeq ($(CONFIG_CAN),y) -CSRCS += up_can.c +CSRCS += stm32_can.c endif ifeq ($(CONFIG_ENCX24J600),y) -CSRCS += up_encx24j600.c +CSRCS += stm32_encx24j600.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/olimex-stm32-p107/src/p107-internal.h b/configs/olimex-stm32-p107/src/p107-internal.h index 8603baca28..02e94ebf13 100644 --- a/configs/olimex-stm32-p107/src/p107-internal.h +++ b/configs/olimex-stm32-p107/src/p107-internal.h @@ -44,7 +44,7 @@ #include /****************************************************************************** - * Definitions + * Pre-processor Definitions ******************************************************************************/ /* Olimex MOD-ENC624J600 Module diff --git a/configs/olimex-stm32-p107/src/up_boot.c b/configs/olimex-stm32-p107/src/stm32_boot.c similarity index 97% rename from configs/olimex-stm32-p107/src/up_boot.c rename to configs/olimex-stm32-p107/src/stm32_boot.c index d10b143ec0..1c0be0d2be 100644 --- a/configs/olimex-stm32-p107/src/up_boot.c +++ b/configs/olimex-stm32-p107/src/stm32_boot.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/olimex-stm32-p107/src/up_boot.c - * arch/arm/src/board/up_boot.c + * configs/olimex-stm32-p107/src/stm32_boot.c * * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/olimex-stm32-p107/src/up_can.c b/configs/olimex-stm32-p107/src/stm32_can.c similarity index 99% rename from configs/olimex-stm32-p107/src/up_can.c rename to configs/olimex-stm32-p107/src/stm32_can.c index f750092a3f..c33874dbf7 100644 --- a/configs/olimex-stm32-p107/src/up_can.c +++ b/configs/olimex-stm32-p107/src/stm32_can.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/olimex-stm32-p107/src/up_can.c + * configs/olimex-stm32-p107/src/stm32_can.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/olimex-stm32-p107/src/up_encx24j600.c b/configs/olimex-stm32-p107/src/stm32_encx24j600.c similarity index 98% rename from configs/olimex-stm32-p107/src/up_encx24j600.c rename to configs/olimex-stm32-p107/src/stm32_encx24j600.c index bb0fd54ca5..6a0e8bde0a 100644 --- a/configs/olimex-stm32-p107/src/up_encx24j600.c +++ b/configs/olimex-stm32-p107/src/stm32_encx24j600.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/olimex-stm32-p107/src/up_encx24j600.c + * configs/olimex-stm32-p107/src/stm32_encx24j600.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +56,7 @@ #ifdef CONFIG_ENCX24J600 /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/olimex-stm32-p107/src/up_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c similarity index 98% rename from configs/olimex-stm32-p107/src/up_spi.c rename to configs/olimex-stm32-p107/src/stm32_spi.c index c0e597d223..858998e1eb 100644 --- a/configs/olimex-stm32-p107/src/up_spi.c +++ b/configs/olimex-stm32-p107/src/stm32_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/olimex-stm32-p107/src/up_spi.c + * configs/olimex-stm32-p107/src/stm32_spi.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -54,7 +54,7 @@ #if defined(CONFIG_STM32_SPI3) /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG too) */