From d526dd3268500d397746b19d2ab6688abf524077 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 00:49:27 +0200 Subject: [PATCH] rename tinygecko->efm32tg everywhere --- Makefile | 2 +- include/libopencm3/dispatch/nvic.h | 2 +- include/libopencm3/efm32/{tinygecko => efm32tg}/irq.yaml | 2 +- include/libopencm3/efm32/{tinygecko => efm32tg}/memorymap.h | 0 include/libopencmsis/dispatch/irqhandlers.h | 2 +- lib/dispatch/vector_nvic.c | 2 +- lib/efm32/{tinygecko => efm32tg}/EFM32TG840F32.ld | 0 lib/efm32/{tinygecko => efm32tg}/Makefile | 4 ++-- .../libopencm3_efm32tg.ld} | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename include/libopencm3/efm32/{tinygecko => efm32tg}/irq.yaml (89%) rename include/libopencm3/efm32/{tinygecko => efm32tg}/memorymap.h (100%) rename lib/efm32/{tinygecko => efm32tg}/EFM32TG840F32.ld (100%) rename lib/efm32/{tinygecko => efm32tg}/Makefile (95%) rename lib/efm32/{tinygecko/libopencm3_efm32tinygecko.ld => efm32tg/libopencm3_efm32tg.ld} (100%) diff --git a/Makefile b/Makefile index 02d3c7a0..80f08227 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ SHAREDIR = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts INSTALL = install SRCLIBDIR = $(shell pwd)/lib -TARGETS = stm32/f1 stm32/f2 stm32/f4 lpc13xx lpc17xx lpc43xx lm3s efm32/tinygecko +TARGETS = stm32/f1 stm32/f2 stm32/f4 lpc13xx lpc17xx lpc43xx lm3s efm32/efm32tg # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) diff --git a/include/libopencm3/dispatch/nvic.h b/include/libopencm3/dispatch/nvic.h index 2146c83b..27c61611 100644 --- a/include/libopencm3/dispatch/nvic.h +++ b/include/libopencm3/dispatch/nvic.h @@ -6,7 +6,7 @@ # include #elif defined(EFM32TG) -# include +# include #elif defined(LPC43XX) # include diff --git a/include/libopencm3/efm32/tinygecko/irq.yaml b/include/libopencm3/efm32/efm32tg/irq.yaml similarity index 89% rename from include/libopencm3/efm32/tinygecko/irq.yaml rename to include/libopencm3/efm32/efm32tg/irq.yaml index da954f60..f4aaba33 100644 --- a/include/libopencm3/efm32/tinygecko/irq.yaml +++ b/include/libopencm3/efm32/efm32tg/irq.yaml @@ -1,4 +1,4 @@ -includeguard: LIBOPENCM3_EFM32_TINYGECKO_NVIC_H +includeguard: LIBOPENCM3_EFM32TG_NVIC_H partname_humanreadable: EFM32 Tiny Gecko series partname_doxygen: EFM32TG # The names and sequence are taken from d0034_efm32tg_reference_manual.pdf table 4.1. diff --git a/include/libopencm3/efm32/tinygecko/memorymap.h b/include/libopencm3/efm32/efm32tg/memorymap.h similarity index 100% rename from include/libopencm3/efm32/tinygecko/memorymap.h rename to include/libopencm3/efm32/efm32tg/memorymap.h diff --git a/include/libopencmsis/dispatch/irqhandlers.h b/include/libopencmsis/dispatch/irqhandlers.h index ad3f4a17..41c4b28e 100644 --- a/include/libopencmsis/dispatch/irqhandlers.h +++ b/include/libopencmsis/dispatch/irqhandlers.h @@ -6,7 +6,7 @@ # include #elif defined(EFM32TG) -# include +# include #elif defined(LPC43XX) # include diff --git a/lib/dispatch/vector_nvic.c b/lib/dispatch/vector_nvic.c index 9ac9517e..9373319b 100644 --- a/lib/dispatch/vector_nvic.c +++ b/lib/dispatch/vector_nvic.c @@ -6,7 +6,7 @@ # include "../stm32/f4/vector_nvic.c" #elif defined(EFM32TG) -# include "../efm32/tinygecko/vector_nvic.c" +# include "../efm32/efm32tg/vector_nvic.c" #elif defined(LPC43XX) # include "../lpc43xx/vector_nvic.c" diff --git a/lib/efm32/tinygecko/EFM32TG840F32.ld b/lib/efm32/efm32tg/EFM32TG840F32.ld similarity index 100% rename from lib/efm32/tinygecko/EFM32TG840F32.ld rename to lib/efm32/efm32tg/EFM32TG840F32.ld diff --git a/lib/efm32/tinygecko/Makefile b/lib/efm32/efm32tg/Makefile similarity index 95% rename from lib/efm32/tinygecko/Makefile rename to lib/efm32/efm32tg/Makefile index 550860c0..65f8d025 100644 --- a/lib/efm32/tinygecko/Makefile +++ b/lib/efm32/efm32tg/Makefile @@ -18,8 +18,8 @@ ## along with this library. If not, see . ## -LIBNAME = libopencm3_efm32tinygecko -FAMILY = TINYGECKO +LIBNAME = libopencm3_efm32tg +FAMILY = EFM32TG PREFIX ?= arm-none-eabi #PREFIX ?= arm-elf diff --git a/lib/efm32/tinygecko/libopencm3_efm32tinygecko.ld b/lib/efm32/efm32tg/libopencm3_efm32tg.ld similarity index 100% rename from lib/efm32/tinygecko/libopencm3_efm32tinygecko.ld rename to lib/efm32/efm32tg/libopencm3_efm32tg.ld