diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-23 14:06:09 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-23 14:06:09 +0000 |
commit | 13995d18a603324046bf3eb421b9a019c66b08e5 (patch) | |
tree | 0debaefb6be2d7f39d694ebff9402d6502f68bd6 /c | |
parent | 2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-13995d18a603324046bf3eb421b9a019c66b08e5.tar.bz2 |
2008-09-23 Sebastian Huber <sebastian.huber@embedded-brains.de>
* Makefile.am, preinstall.am, include/lpc24xx.h, misc/system-clocks.c:
Move utility.h
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/preinstall.am | 4 |
5 files changed, 13 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index eaa99a05af..6701acd081 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog @@ -1,3 +1,8 @@ +2008-09-23 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * Makefile.am, preinstall.am, include/lpc24xx.h, misc/system-clocks.c: + Move utility.h + 2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, startup/bspstart.c: Use standardized bsp_cleanup() which diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index c993ff8b56..9bfa9ed61c 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -24,7 +24,8 @@ include_HEADERS = include/bsp.h nodist_include_HEADERS = include/bspopts.h -include_bsp_HEADERS = ../../shared/include/irq-generic.h \ +include_bsp_HEADERS = ../../shared/include/utility.h \ + ../../shared/include/irq-generic.h \ ../../shared/tod.h \ ../shared/include/linker-symbols.h \ ../shared/include/start.h \ diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h b/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h index e1b69fb731..91347fddfe 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h +++ b/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h @@ -23,7 +23,7 @@ #include <stdint.h>
-#include <libcpu/utility.h>
+#include <bsp/utility.h>
/* Vectored Interrupt Controller (VIC) */
#define VIC_BASE_ADDR 0xFFFFF000
diff --git a/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c b/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c index 7f5df7dcdd..81a844e6ab 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c +++ b/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c @@ -18,9 +18,8 @@ * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE. */ -#include <libcpu/utility.h> - #include <bsp.h> +#include <bsp/utility.h> #include <bsp/lpc24xx.h> #include <bsp/system-clocks.h> diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am index 587248fe0b..374b79445c 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am @@ -46,6 +46,10 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h +$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h + $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h |