From 25874f070eeaa243b5f2e4cb26bce59b5ef3241c Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 7 Jun 2011 08:00:30 +0000 Subject: 2011-06-07 Sebastian Huber * Makefile.am, preinstall.am: Cache manager changes. --- c/src/lib/libbsp/arm/lpc24xx/ChangeLog | 4 ++++ c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 3 --- c/src/lib/libbsp/arm/lpc24xx/preinstall.am | 9 --------- c/src/lib/libbsp/arm/lpc32xx/ChangeLog | 4 ++++ c/src/lib/libbsp/arm/lpc32xx/Makefile.am | 3 +-- c/src/lib/libbsp/arm/lpc32xx/preinstall.am | 4 ---- 6 files changed, 9 insertions(+), 18 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index 4a4780b0fd..366bf698f8 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog @@ -1,3 +1,7 @@ +2011-06-07 Sebastian Huber + + * Makefile.am, preinstall.am: Cache manager changes. + 2011-05-19 Sebastian Huber * i2c/i2c-config.c: New file. diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 844cef6d07..b291159830 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -12,7 +12,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu dist_project_lib_DATA = bsp_specs @@ -53,8 +52,6 @@ include_bsp_HEADERS += include/lpc-ethernet-config.h include_HEADERS += ../../shared/include/tm27.h -include_libcpu_HEADERS = ../../../libcpu/arm/shared/include/cache.h - ############################################################################### # Data # ############################################################################### diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am index d2517424b9..7ec6f9c005 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am @@ -33,11 +33,6 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp): @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs @@ -150,10 +145,6 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h -$(PROJECT_INCLUDE)/libcpu/cache.h: ../../../libcpu/arm/shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/arm/lpc32xx/ChangeLog b/c/src/lib/libbsp/arm/lpc32xx/ChangeLog index cf4e7259bf..7c7386e49e 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc32xx/ChangeLog @@ -1,3 +1,7 @@ +2011-06-07 Sebastian Huber + + * Makefile.am, preinstall.am: Cache manager changes. + 2011-05-19 Sebastian Huber * Makefile.am, preinstall.am: Install new header files. diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am index 0bf9b0ae29..f9a5bb09f3 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am @@ -51,8 +51,7 @@ include_bsp_HEADERS += include/boot.h include_bsp_HEADERS += include/i2c.h include_bsp_HEADERS += include/emc.h -include_libcpu_HEADERS = ../../../libcpu/arm/shared/include/cache.h \ - ../../../libcpu/arm/shared/include/arm-cp15.h +include_libcpu_HEADERS = ../../../libcpu/arm/shared/include/arm-cp15.h ############################################################################### # Data # diff --git a/c/src/lib/libbsp/arm/lpc32xx/preinstall.am b/c/src/lib/libbsp/arm/lpc32xx/preinstall.am index f130bf900f..43eb71b39a 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc32xx/preinstall.am @@ -146,10 +146,6 @@ $(PROJECT_INCLUDE)/bsp/emc.h: include/emc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/emc.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/emc.h -$(PROJECT_INCLUDE)/libcpu/cache.h: ../../../libcpu/arm/shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - $(PROJECT_INCLUDE)/libcpu/arm-cp15.h: ../../../libcpu/arm/shared/include/arm-cp15.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h -- cgit v1.2.3