From 7a42e0821bf116fb4b5dfbde2650275ed4d07718 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 14:23:07 -0600 Subject: [PATCH] LPC4330 Xplorer: Rename files for better conformance to naming conventions --- configs/lpc4330-xplorer/src/Makefile | 66 +++++++++---------- .../src/{up_autoleds.c => lpc43_autoleds.c} | 2 +- .../src/{up_boot.c => lpc43_boot.c} | 4 +- .../src/{up_buttons.c => lpc43_buttons.c} | 2 +- .../src/{up_nsh.c => lpc43_nsh.c} | 5 +- .../src/{up_ostest.c => lpc43_ostest.c} | 5 +- .../src/{up_userleds.c => lpc43_userleds.c} | 5 +- .../lpc4330-xplorer/src/xplorer_internal.h | 5 +- 8 files changed, 45 insertions(+), 49 deletions(-) rename configs/lpc4330-xplorer/src/{up_autoleds.c => lpc43_autoleds.c} (99%) rename configs/lpc4330-xplorer/src/{up_boot.c => lpc43_boot.c} (97%) rename configs/lpc4330-xplorer/src/{up_buttons.c => lpc43_buttons.c} (99%) rename configs/lpc4330-xplorer/src/{up_nsh.c => lpc43_nsh.c} (97%) rename configs/lpc4330-xplorer/src/{up_ostest.c => lpc43_ostest.c} (97%) rename configs/lpc4330-xplorer/src/{up_userleds.c => lpc43_userleds.c} (98%) diff --git a/configs/lpc4330-xplorer/src/Makefile b/configs/lpc4330-xplorer/src/Makefile index 8b433ab0cdf..40e3ecddc6e 100644 --- a/configs/lpc4330-xplorer/src/Makefile +++ b/configs/lpc4330-xplorer/src/Makefile @@ -35,64 +35,64 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched -ASRCS = -CSRCS = up_boot.c +ASRCS = +CSRCS = lpc43_boot.c ifeq ($(CONFIG_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += lpc43_nsh.c endif ifeq ($(CONFIG_ARCH_FPU),y) -CSRCS += up_ostest.c +CSRCS += lpc43_ostest.c endif ifeq ($(CONFIG_ARCH_LEDS),y) -CSRCS += up_autoleds.c +CSRCS += lpc43_autoleds.c else -CSRCS += up_userleds.c +CSRCS += lpc43_userleds.c endif ifeq ($(CONFIG_ARCH_BUTTONS),y) -CSRCS += up_buttons.c +CSRCS += lpc43_buttons.c endif ifeq ($(CONFIG_USBMSC),y) -CSRCS += up_usbmsc.c +CSRCS += up_usbmsc.c endif ifeq ($(CONFIG_SPIFI_LIBRARY),y) -CFLAGS += -DEUROBIRD -SPIFI_LIB = spifi_lib -CSRCS += $(SPIFI_LIB)/spifi_rom_api.c -#CSRCS += $(SPIFI_LIB)/amic.c -#CSRCS += $(SPIFI_LIB)/atmel.c -#CSRCS += $(SPIFI_LIB)/chi.c -#CSRCS += $(SPIFI_LIB)/eon.c -#CSRCS += $(SPIFI_LIB)/esmt.c -#CSRCS += $(SPIFI_LIB)/esmt.c -#CSRCS += $(SPIFI_LIB)/giga.c -#CSRCS += $(SPIFI_LIB)/macronix.c -#CSRCS += $(SPIFI_LIB)/numonyx.c -CSRCS += $(SPIFI_LIB)/spansion.c -#CSRCS += $(SPIFI_LIB)/sst.c -CSRCS += $(SPIFI_LIB)/winbond.c +CFLAGS += -DEUROBIRD +SPIFI_LIB = spifi_lib +CSRCS += $(SPIFI_LIB)/spifi_rom_api.c +#CSRCS += $(SPIFI_LIB)/amic.c +#CSRCS += $(SPIFI_LIB)/atmel.c +#CSRCS += $(SPIFI_LIB)/chi.c +#CSRCS += $(SPIFI_LIB)/eon.c +#CSRCS += $(SPIFI_LIB)/esmt.c +#CSRCS += $(SPIFI_LIB)/esmt.c +#CSRCS += $(SPIFI_LIB)/giga.c +#CSRCS += $(SPIFI_LIB)/macronix.c +#CSRCS += $(SPIFI_LIB)/numonyx.c +CSRCS += $(SPIFI_LIB)/spansion.c +#CSRCS += $(SPIFI_LIB)/sst.c +CSRCS += $(SPIFI_LIB)/winbond.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)/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/lpc4330-xplorer/src/up_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c similarity index 99% rename from configs/lpc4330-xplorer/src/up_autoleds.c rename to configs/lpc4330-xplorer/src/lpc43_autoleds.c index f0f92c2c036..41377ae1ba4 100644 --- a/configs/lpc4330-xplorer/src/up_autoleds.c +++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/lpc4330-xplorer/src/up_autoleds.c + * configs/lpc4330-xplorer/src/lpc43_autoleds.c * * Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/lpc4330-xplorer/src/up_boot.c b/configs/lpc4330-xplorer/src/lpc43_boot.c similarity index 97% rename from configs/lpc4330-xplorer/src/up_boot.c rename to configs/lpc4330-xplorer/src/lpc43_boot.c index 27410c608bc..6698f7928e5 100644 --- a/configs/lpc4330-xplorer/src/up_boot.c +++ b/configs/lpc4330-xplorer/src/lpc43_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/lpc4330-xplorer/src/up_boot.c + * configs/lpc4330-xplorer/src/lpc43_boot.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +50,7 @@ #include "xplorer_internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/lpc4330-xplorer/src/up_buttons.c b/configs/lpc4330-xplorer/src/lpc43_buttons.c similarity index 99% rename from configs/lpc4330-xplorer/src/up_buttons.c rename to configs/lpc4330-xplorer/src/lpc43_buttons.c index 9eaec68fa03..a320e125deb 100644 --- a/configs/lpc4330-xplorer/src/up_buttons.c +++ b/configs/lpc4330-xplorer/src/lpc43_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/lpc4330-xplorer/src/board_buttons.c + * configs/lpc4330-xplorer/src/lpc43_buttons.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/lpc4330-xplorer/src/up_nsh.c b/configs/lpc4330-xplorer/src/lpc43_nsh.c similarity index 97% rename from configs/lpc4330-xplorer/src/up_nsh.c rename to configs/lpc4330-xplorer/src/lpc43_nsh.c index 732c4f8f144..dbad88b31ed 100644 --- a/configs/lpc4330-xplorer/src/up_nsh.c +++ b/configs/lpc4330-xplorer/src/lpc43_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/lpc4330-xplorer/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/lpc4330-xplorer/src/lpc43_nsh.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -57,7 +56,7 @@ #endif /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/lpc4330-xplorer/src/up_ostest.c b/configs/lpc4330-xplorer/src/lpc43_ostest.c similarity index 97% rename from configs/lpc4330-xplorer/src/up_ostest.c rename to configs/lpc4330-xplorer/src/lpc43_ostest.c index f0988337a22..6fb4805141d 100644 --- a/configs/lpc4330-xplorer/src/up_ostest.c +++ b/configs/lpc4330-xplorer/src/lpc43_ostest.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/lpc4330-xplorer/src/up_ostest.c - * arch/arm/src/board/up_ostest.c + * configs/lpc4330-xplorer/src/lpc43_ostest.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -53,7 +52,7 @@ #include "xplorer-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration ********************************************************************/ diff --git a/configs/lpc4330-xplorer/src/up_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c similarity index 98% rename from configs/lpc4330-xplorer/src/up_userleds.c rename to configs/lpc4330-xplorer/src/lpc43_userleds.c index c91f4df3ba7..334b7fd745e 100644 --- a/configs/lpc4330-xplorer/src/up_userleds.c +++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/lpc4330-xplorer/src/up_userleds.c - * arch/arm/src/board/up_userleds.c + * configs/lpc4330-xplorer/src/lpc43_userleds.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #ifndef CONFIG_ARCH_LEDS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* LED definitions **********************************************************/ /* The LPC4330-Xplorer has 2 user-controllable LEDs labeled D2 an D3 in the diff --git a/configs/lpc4330-xplorer/src/xplorer_internal.h b/configs/lpc4330-xplorer/src/xplorer_internal.h index 886382c6518..911038862a3 100644 --- a/configs/lpc4330-xplorer/src/xplorer_internal.h +++ b/configs/lpc4330-xplorer/src/xplorer_internal.h @@ -1,6 +1,5 @@ /**************************************************************************** * configs/lpc4330-xplorer/src/xplorer_internal.h - * arch/arm/src/board/xplorer_internal.n * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +47,7 @@ #include "lpc43_gpio.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** @@ -123,7 +122,7 @@ * ****************************************************************************/ -extern void weak_function lpc43_sspinitialize(void); +void weak_function lpc43_sspinitialize(void); #endif /* __ASSEMBLY__ */ #endif /* _CONFIGS_LPC4330_XPLORER_SRC_XPLORER_INTERNAL_H */