From 829b16b472953ebe93747f7ab77cf9d04e5be2ff Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Thu, 16 Jul 2020 16:24:36 +0200 Subject: [PATCH] cpu/lpc23xx: rename lpc2387 to lpc23xx --- cpu/{lpc2387 => lpc23xx}/Makefile | 0 cpu/{lpc2387 => lpc23xx}/Makefile.dep | 0 cpu/{lpc2387 => lpc23xx}/Makefile.features | 0 cpu/{lpc2387 => lpc23xx}/Makefile.include | 0 cpu/{lpc2387 => lpc23xx}/asmfunc.s | 0 cpu/{lpc2387 => lpc23xx}/clocks.c | 2 +- cpu/{lpc2387 => lpc23xx}/cpu.c | 4 ++-- cpu/{lpc2387/doc/lpc2387.doc => lpc23xx/doc/lpc23xx.doc} | 0 cpu/{lpc2387 => lpc23xx}/include/cpu.h | 4 ++-- cpu/{lpc2387 => lpc23xx}/include/cpu_conf.h | 0 .../include/lpc2387.h => lpc23xx/include/lpc23xx.h} | 6 +++--- cpu/{lpc2387 => lpc23xx}/include/periph_cpu.h | 0 cpu/{lpc2387 => lpc23xx}/include/vendor/lpc23xx.h | 6 +++--- .../ldscripts/lpc2387.ld => lpc23xx/ldscripts/lpc23xx.ld} | 0 cpu/{lpc2387 => lpc23xx}/lpc23xx-iap.c | 2 +- cpu/{lpc2387 => lpc23xx}/mci/Makefile | 0 .../mci/lpc2387-mci.c => lpc23xx/mci/lpc23xx-mci.c} | 0 cpu/{lpc2387 => lpc23xx}/periph/Makefile | 0 cpu/{lpc2387 => lpc23xx}/periph/adc.c | 0 cpu/{lpc2387 => lpc23xx}/periph/dac.c | 0 cpu/{lpc2387 => lpc23xx}/periph/gpio.c | 0 cpu/{lpc2387 => lpc23xx}/periph/i2c.c | 2 +- cpu/{lpc2387 => lpc23xx}/periph/pm.c | 0 cpu/{lpc2387 => lpc23xx}/periph/pwm.c | 0 cpu/{lpc2387 => lpc23xx}/periph/rtc.c | 2 +- cpu/{lpc2387 => lpc23xx}/periph/spi.c | 2 +- cpu/{lpc2387 => lpc23xx}/periph/timer.c | 2 +- cpu/{lpc2387 => lpc23xx}/periph/uart.c | 0 cpu/{lpc2387 => lpc23xx}/startup.s | 0 .../tools/openocd-lpc23xx.cfg} | 0 30 files changed, 16 insertions(+), 16 deletions(-) rename cpu/{lpc2387 => lpc23xx}/Makefile (100%) rename cpu/{lpc2387 => lpc23xx}/Makefile.dep (100%) rename cpu/{lpc2387 => lpc23xx}/Makefile.features (100%) rename cpu/{lpc2387 => lpc23xx}/Makefile.include (100%) rename cpu/{lpc2387 => lpc23xx}/asmfunc.s (100%) rename cpu/{lpc2387 => lpc23xx}/clocks.c (99%) rename cpu/{lpc2387 => lpc23xx}/cpu.c (97%) rename cpu/{lpc2387/doc/lpc2387.doc => lpc23xx/doc/lpc23xx.doc} (100%) rename cpu/{lpc2387 => lpc23xx}/include/cpu.h (95%) rename cpu/{lpc2387 => lpc23xx}/include/cpu_conf.h (100%) rename cpu/{lpc2387/include/lpc2387.h => lpc23xx/include/lpc23xx.h} (98%) rename cpu/{lpc2387 => lpc23xx}/include/periph_cpu.h (100%) rename cpu/{lpc2387 => lpc23xx}/include/vendor/lpc23xx.h (99%) rename cpu/{lpc2387/ldscripts/lpc2387.ld => lpc23xx/ldscripts/lpc23xx.ld} (100%) rename cpu/{lpc2387 => lpc23xx}/lpc23xx-iap.c (99%) rename cpu/{lpc2387 => lpc23xx}/mci/Makefile (100%) rename cpu/{lpc2387/mci/lpc2387-mci.c => lpc23xx/mci/lpc23xx-mci.c} (100%) rename cpu/{lpc2387 => lpc23xx}/periph/Makefile (100%) rename cpu/{lpc2387 => lpc23xx}/periph/adc.c (100%) rename cpu/{lpc2387 => lpc23xx}/periph/dac.c (100%) rename cpu/{lpc2387 => lpc23xx}/periph/gpio.c (100%) rename cpu/{lpc2387 => lpc23xx}/periph/i2c.c (99%) rename cpu/{lpc2387 => lpc23xx}/periph/pm.c (100%) rename cpu/{lpc2387 => lpc23xx}/periph/pwm.c (100%) rename cpu/{lpc2387 => lpc23xx}/periph/rtc.c (99%) rename cpu/{lpc2387 => lpc23xx}/periph/spi.c (98%) rename cpu/{lpc2387 => lpc23xx}/periph/timer.c (99%) rename cpu/{lpc2387 => lpc23xx}/periph/uart.c (100%) rename cpu/{lpc2387 => lpc23xx}/startup.s (100%) rename cpu/{lpc2387/tools/openocd-lpc2387.cfg => lpc23xx/tools/openocd-lpc23xx.cfg} (100%) diff --git a/cpu/lpc2387/Makefile b/cpu/lpc23xx/Makefile similarity index 100% rename from cpu/lpc2387/Makefile rename to cpu/lpc23xx/Makefile diff --git a/cpu/lpc2387/Makefile.dep b/cpu/lpc23xx/Makefile.dep similarity index 100% rename from cpu/lpc2387/Makefile.dep rename to cpu/lpc23xx/Makefile.dep diff --git a/cpu/lpc2387/Makefile.features b/cpu/lpc23xx/Makefile.features similarity index 100% rename from cpu/lpc2387/Makefile.features rename to cpu/lpc23xx/Makefile.features diff --git a/cpu/lpc2387/Makefile.include b/cpu/lpc23xx/Makefile.include similarity index 100% rename from cpu/lpc2387/Makefile.include rename to cpu/lpc23xx/Makefile.include diff --git a/cpu/lpc2387/asmfunc.s b/cpu/lpc23xx/asmfunc.s similarity index 100% rename from cpu/lpc2387/asmfunc.s rename to cpu/lpc23xx/asmfunc.s diff --git a/cpu/lpc2387/clocks.c b/cpu/lpc23xx/clocks.c similarity index 99% rename from cpu/lpc2387/clocks.c rename to cpu/lpc23xx/clocks.c index de76731caa..4747780c0a 100644 --- a/cpu/lpc2387/clocks.c +++ b/cpu/lpc23xx/clocks.c @@ -24,7 +24,7 @@ #include "board.h" #include "cpu.h" #include "periph_conf.h" -#include "lpc2387.h" +#include "lpc23xx.h" #define CL_CPU_DIV 4 diff --git a/cpu/lpc2387/cpu.c b/cpu/lpc23xx/cpu.c similarity index 97% rename from cpu/lpc2387/cpu.c rename to cpu/lpc23xx/cpu.c index 15b93af1e3..8988bd9954 100644 --- a/cpu/lpc2387/cpu.c +++ b/cpu/lpc23xx/cpu.c @@ -19,7 +19,7 @@ #include "stdio_base.h" #include "periph/init.h" -void lpc2387_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale) +void lpc23xx_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale) { uint32_t pclkdiv; *prescale = source / target; @@ -52,7 +52,7 @@ void cpu_clock_scale(uint32_t source, uint32_t target, uint32_t *prescale) { uint32_t pclksel; - lpc2387_pclk_scale(source, target, &pclksel, prescale); + lpc23xx_pclk_scale(source, target, &pclksel, prescale); PCLKSEL0 = (PCLKSEL0 & ~(BIT2 | BIT3)) | (pclksel << 2); /* timer 0 */ PCLKSEL0 = (PCLKSEL0 & ~(BIT4 | BIT5)) | (pclksel << 4); /* timer 1 */ diff --git a/cpu/lpc2387/doc/lpc2387.doc b/cpu/lpc23xx/doc/lpc23xx.doc similarity index 100% rename from cpu/lpc2387/doc/lpc2387.doc rename to cpu/lpc23xx/doc/lpc23xx.doc diff --git a/cpu/lpc2387/include/cpu.h b/cpu/lpc23xx/include/cpu.h similarity index 95% rename from cpu/lpc2387/include/cpu.h rename to cpu/lpc23xx/include/cpu.h index be1b11d88a..0c3660dfa1 100644 --- a/cpu/lpc2387/include/cpu.h +++ b/cpu/lpc23xx/include/cpu.h @@ -19,7 +19,7 @@ #include #include -#include "lpc2387.h" +#include "lpc23xx.h" #include "arm_cpu.h" #ifdef __cplusplus @@ -41,7 +41,7 @@ void cpu_init_mam(void); /** * @brief Scale lpc2387 cpu speed */ -void lpc2387_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale); +void lpc23xx_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale); /** * @brief Initialize lpc2387 cpu clocks diff --git a/cpu/lpc2387/include/cpu_conf.h b/cpu/lpc23xx/include/cpu_conf.h similarity index 100% rename from cpu/lpc2387/include/cpu_conf.h rename to cpu/lpc23xx/include/cpu_conf.h diff --git a/cpu/lpc2387/include/lpc2387.h b/cpu/lpc23xx/include/lpc23xx.h similarity index 98% rename from cpu/lpc2387/include/lpc2387.h rename to cpu/lpc23xx/include/lpc23xx.h index 1ab595ae93..8db0f52f3d 100644 --- a/cpu/lpc2387/include/lpc2387.h +++ b/cpu/lpc23xx/include/lpc23xx.h @@ -8,8 +8,8 @@ * Parts taken from FeuerWhere-Project, lpc2387.h. */ -#ifndef LPC2387_H -#define LPC2387_H +#ifndef LPC23XX_H +#define LPC23XX_H #include "vendor/lpc23xx.h" #include "arm7_common.h" @@ -154,4 +154,4 @@ extern "C" { } #endif -#endif /* LPC2387_H */ +#endif /* LPC23XX_H */ diff --git a/cpu/lpc2387/include/periph_cpu.h b/cpu/lpc23xx/include/periph_cpu.h similarity index 100% rename from cpu/lpc2387/include/periph_cpu.h rename to cpu/lpc23xx/include/periph_cpu.h diff --git a/cpu/lpc2387/include/vendor/lpc23xx.h b/cpu/lpc23xx/include/vendor/lpc23xx.h similarity index 99% rename from cpu/lpc2387/include/vendor/lpc23xx.h rename to cpu/lpc23xx/include/vendor/lpc23xx.h index 0189bf3d14..e483986849 100644 --- a/cpu/lpc2387/include/vendor/lpc23xx.h +++ b/cpu/lpc23xx/include/vendor/lpc23xx.h @@ -12,8 +12,8 @@ * ******************************************************************************/ -#ifndef LPC23XX_H -#define LPC23XX_H +#ifndef LPC23XX_VENDOR_H +#define LPC23XX_VENDOR_H #include @@ -1256,4 +1256,4 @@ with the spec. update in USB Device Section. */ } #endif -#endif /* LPC23XX_H */ +#endif /* LPC23XX_VENDOR_H */ diff --git a/cpu/lpc2387/ldscripts/lpc2387.ld b/cpu/lpc23xx/ldscripts/lpc23xx.ld similarity index 100% rename from cpu/lpc2387/ldscripts/lpc2387.ld rename to cpu/lpc23xx/ldscripts/lpc23xx.ld diff --git a/cpu/lpc2387/lpc23xx-iap.c b/cpu/lpc23xx/lpc23xx-iap.c similarity index 99% rename from cpu/lpc2387/lpc23xx-iap.c rename to cpu/lpc23xx/lpc23xx-iap.c index 6f1f17059b..3596caff7d 100644 --- a/cpu/lpc2387/lpc23xx-iap.c +++ b/cpu/lpc23xx/lpc23xx-iap.c @@ -24,7 +24,7 @@ #include "irq.h" #include "flashrom.h" #include "iap.h" -#include "lpc2387.h" +#include "lpc23xx.h" #define ENABLE_DEBUG (0) #include "debug.h" diff --git a/cpu/lpc2387/mci/Makefile b/cpu/lpc23xx/mci/Makefile similarity index 100% rename from cpu/lpc2387/mci/Makefile rename to cpu/lpc23xx/mci/Makefile diff --git a/cpu/lpc2387/mci/lpc2387-mci.c b/cpu/lpc23xx/mci/lpc23xx-mci.c similarity index 100% rename from cpu/lpc2387/mci/lpc2387-mci.c rename to cpu/lpc23xx/mci/lpc23xx-mci.c diff --git a/cpu/lpc2387/periph/Makefile b/cpu/lpc23xx/periph/Makefile similarity index 100% rename from cpu/lpc2387/periph/Makefile rename to cpu/lpc23xx/periph/Makefile diff --git a/cpu/lpc2387/periph/adc.c b/cpu/lpc23xx/periph/adc.c similarity index 100% rename from cpu/lpc2387/periph/adc.c rename to cpu/lpc23xx/periph/adc.c diff --git a/cpu/lpc2387/periph/dac.c b/cpu/lpc23xx/periph/dac.c similarity index 100% rename from cpu/lpc2387/periph/dac.c rename to cpu/lpc23xx/periph/dac.c diff --git a/cpu/lpc2387/periph/gpio.c b/cpu/lpc23xx/periph/gpio.c similarity index 100% rename from cpu/lpc2387/periph/gpio.c rename to cpu/lpc23xx/periph/gpio.c diff --git a/cpu/lpc2387/periph/i2c.c b/cpu/lpc23xx/periph/i2c.c similarity index 99% rename from cpu/lpc2387/periph/i2c.c rename to cpu/lpc23xx/periph/i2c.c index fa61ffbe8b..188b25ad59 100644 --- a/cpu/lpc2387/periph/i2c.c +++ b/cpu/lpc23xx/periph/i2c.c @@ -124,7 +124,7 @@ void i2c_release(i2c_t dev) static void _set_baud(lpc23xx_i2c_t *i2c, uint32_t baud) { uint32_t pclksel, prescale; - lpc2387_pclk_scale(CLOCK_CORECLOCK, baud, &pclksel, &prescale); + lpc23xx_pclk_scale(CLOCK_CORECLOCK, baud, &pclksel, &prescale); switch ((uint32_t)i2c) { case I2C0_BASE_ADDR: diff --git a/cpu/lpc2387/periph/pm.c b/cpu/lpc23xx/periph/pm.c similarity index 100% rename from cpu/lpc2387/periph/pm.c rename to cpu/lpc23xx/periph/pm.c diff --git a/cpu/lpc2387/periph/pwm.c b/cpu/lpc23xx/periph/pwm.c similarity index 100% rename from cpu/lpc2387/periph/pwm.c rename to cpu/lpc23xx/periph/pwm.c diff --git a/cpu/lpc2387/periph/rtc.c b/cpu/lpc23xx/periph/rtc.c similarity index 99% rename from cpu/lpc2387/periph/rtc.c rename to cpu/lpc23xx/periph/rtc.c index 5518c1da73..3af3eac886 100644 --- a/cpu/lpc2387/periph/rtc.c +++ b/cpu/lpc23xx/periph/rtc.c @@ -29,7 +29,7 @@ /* cpu */ #include "periph/rtc.h" #include "VIC.h" -#include "lpc2387.h" +#include "lpc23xx.h" #define ENABLE_DEBUG (0) #include "debug.h" diff --git a/cpu/lpc2387/periph/spi.c b/cpu/lpc23xx/periph/spi.c similarity index 98% rename from cpu/lpc2387/periph/spi.c rename to cpu/lpc23xx/periph/spi.c index 1da169aeaa..258c557e3b 100644 --- a/cpu/lpc2387/periph/spi.c +++ b/cpu/lpc23xx/periph/spi.c @@ -119,7 +119,7 @@ int spi_acquire(spi_t bus, spi_cs_t cs, spi_mode_t mode, spi_clk_t clk) dev->CR0 = 7; /* configure bus clock */ - lpc2387_pclk_scale(CLOCK_CORECLOCK / 1000, (uint32_t)clk, &pclksel, &cpsr); + lpc23xx_pclk_scale(CLOCK_CORECLOCK / 1000, (uint32_t)clk, &pclksel, &cpsr); switch ((uint32_t)dev) { case SSP0_BASE_ADDR: diff --git a/cpu/lpc2387/periph/timer.c b/cpu/lpc23xx/periph/timer.c similarity index 99% rename from cpu/lpc2387/periph/timer.c rename to cpu/lpc23xx/periph/timer.c index 6a409287bc..587cc448d6 100644 --- a/cpu/lpc2387/periph/timer.c +++ b/cpu/lpc23xx/periph/timer.c @@ -137,7 +137,7 @@ int timer_init(tim_t tim, unsigned long freq, timer_cb_t cb, void *arg) } uint32_t scale, prescale; - lpc2387_pclk_scale(CLOCK_PCLK, freq, &scale, &prescale); + lpc23xx_pclk_scale(CLOCK_PCLK, freq, &scale, &prescale); /* save the callback */ isr_ctx[tim].cb = cb; diff --git a/cpu/lpc2387/periph/uart.c b/cpu/lpc23xx/periph/uart.c similarity index 100% rename from cpu/lpc2387/periph/uart.c rename to cpu/lpc23xx/periph/uart.c diff --git a/cpu/lpc2387/startup.s b/cpu/lpc23xx/startup.s similarity index 100% rename from cpu/lpc2387/startup.s rename to cpu/lpc23xx/startup.s diff --git a/cpu/lpc2387/tools/openocd-lpc2387.cfg b/cpu/lpc23xx/tools/openocd-lpc23xx.cfg similarity index 100% rename from cpu/lpc2387/tools/openocd-lpc2387.cfg rename to cpu/lpc23xx/tools/openocd-lpc23xx.cfg