diff options
| author | Martin Galvan <martin.galvan@tallertechnologies.com> | 2015-11-05 11:17:23 -0300 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-11-05 15:27:46 +0100 |
| commit | 1d55e157ca9f4a9ff806f8fa5fcc79b03a7b8178 (patch) | |
| tree | eb82832786ef40fe57c4d6697e37ed51275bbbb7 | |
| parent | Resurrect make/Templates/Makefile.lib (diff) | |
| download | rtems-1d55e157ca9f4a9ff806f8fa5fcc79b03a7b8178.tar.bz2 | |
LPC1768: Fix compilation error
The LPC1768 variants have a gpio.h file whose name clashes with the gpio.h from
the new GPIO API. This results on the BSPs failing to compile.
This patch renames the LPC1768 gpio.* files to lpc-gpio.*, as it's done on other
BSPs (e.g. Beaglebone).
Closes #2441.
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc176x/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc176x/gpio/lpc-gpio.c (renamed from c/src/lib/libbsp/arm/lpc176x/gpio/gpio.c) | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h (renamed from c/src/lib/libbsp/arm/lpc176x/include/gpio.h) | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc176x/preinstall.am | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am index 50a7e798d6..352b2d97fe 100644 --- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am @@ -41,7 +41,7 @@ include_bsp_HEADERS += include/io-defs.h include_bsp_HEADERS += include/io.h include_bsp_HEADERS += include/common-types.h include_bsp_HEADERS += include/gpio-defs.h -include_bsp_HEADERS += include/gpio.h +include_bsp_HEADERS += include/lpc-gpio.h include_bsp_HEADERS += include/can.h include_bsp_HEADERS += include/can-defs.h include_bsp_HEADERS += include/pwmout.h @@ -131,7 +131,7 @@ libbsp_a_SOURCES += ../../shared/tod.c \ rtc/rtc-config.c # GPIO -libbsp_a_SOURCES += gpio/gpio.c +libbsp_a_SOURCES += gpio/lpc-gpio.c # CAN libbsp_a_SOURCES += can/can.c diff --git a/c/src/lib/libbsp/arm/lpc176x/gpio/gpio.c b/c/src/lib/libbsp/arm/lpc176x/gpio/lpc-gpio.c index e77e07b663..e7f07fe657 100644 --- a/c/src/lib/libbsp/arm/lpc176x/gpio/gpio.c +++ b/c/src/lib/libbsp/arm/lpc176x/gpio/lpc-gpio.c @@ -1,5 +1,5 @@ /** - * @file gpio.c + * @file lpc-gpio.c * * @ingroup lpc176x * @@ -22,7 +22,7 @@ #include <assert.h> #include <bsp/irq.h> #include <bsp/io.h> -#include <bsp/gpio.h> +#include <bsp/lpc-gpio.h> #include <rtems/status-checks.h> static uint32_t function_vector_size = 0u; diff --git a/c/src/lib/libbsp/arm/lpc176x/include/gpio.h b/c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h index 35f34beb47..9cb23df142 100644 --- a/c/src/lib/libbsp/arm/lpc176x/include/gpio.h +++ b/c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h @@ -1,5 +1,5 @@ /** - * @file gpio.h + * @file lpc-gpio.h * * @ingroup lpc176x * diff --git a/c/src/lib/libbsp/arm/lpc176x/preinstall.am b/c/src/lib/libbsp/arm/lpc176x/preinstall.am index 5c86c8b4d6..8d6c4d3410 100644 --- a/c/src/lib/libbsp/arm/lpc176x/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc176x/preinstall.am @@ -113,9 +113,9 @@ $(PROJECT_INCLUDE)/bsp/gpio-defs.h: include/gpio-defs.h $(PROJECT_INCLUDE)/bsp/$ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio-defs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio-defs.h -$(PROJECT_INCLUDE)/bsp/gpio.h: include/gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio.h +$(PROJECT_INCLUDE)/bsp/lpc-gpio.h: include/lpc-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-gpio.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-gpio.h $(PROJECT_INCLUDE)/bsp/can.h: include/can.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/can.h |