diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-07 07:15:23 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-07 07:16:42 +0100 |
commit | 28fb90597f58d7970dc94db9ce8be9b0a4268df8 (patch) | |
tree | c24e96dbb3acd05f4fd4d33cbb0127d2a30bb810 /c/src/lib/libcpu | |
parent | libmisc/stackchk/check.c: correct formatting of stack pointers in Stack_check... (diff) | |
download | rtems-28fb90597f58d7970dc94db9ce8be9b0a4268df8.tar.bz2 |
bsps/powerpc: Fix mpc83xx_i2cdrv.h location
Update #3254.
Diffstat (limited to 'c/src/lib/libcpu')
-rw-r--r-- | c/src/lib/libcpu/powerpc/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c | 6 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/preinstall.am | 18 |
3 files changed, 16 insertions, 17 deletions
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 8315ff64a0..8278d60974 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -16,6 +16,11 @@ include_bspdir = $(includedir)/bsp include_bsp_HEADERS = include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h +include_mpc83xxdir = $(includedir)/mpc83xx + +include_mpc83xx_HEADERS = +include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h + EXTRA_DIST = noinst_PROGRAMS = new-exceptions/rtems-cpu.rel @@ -369,9 +374,8 @@ endif if mpc83xx # Includes -include_mpc83xxdir = $(includedir)/mpc83xx -include_mpc83xx_HEADERS = mpc83xx/include/mpc83xx.h +include_mpc83xx_HEADERS += mpc83xx/include/mpc83xx.h # Network include_bsp_HEADERS += mpc83xx/network/tsec.h @@ -383,7 +387,6 @@ mpc83xx_tsec_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif # i2c -include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h noinst_PROGRAMS += mpc83xx/i2c.rel mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \ mpc83xx/i2c/mpc83xx_i2cdrv.h diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c index 3047d8edf0..b4c3d477f7 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c +++ b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c @@ -19,11 +19,7 @@ #include <stdlib.h> #include <bsp.h> #include <bsp/irq.h> -#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H) - #include <mpc83xx/mpc83xx_i2cdrv.h> -#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) - #include <bsp/mpc83xx_i2cdrv.h> -#endif +#include <mpc83xx/mpc83xx_i2cdrv.h> #include <rtems/error.h> #include <rtems/bspIo.h> #include <errno.h> diff --git a/c/src/lib/libcpu/powerpc/preinstall.am b/c/src/lib/libcpu/powerpc/preinstall.am index a490597ec9..398def6bd2 100644 --- a/c/src/lib/libcpu/powerpc/preinstall.am +++ b/c/src/lib/libcpu/powerpc/preinstall.am @@ -58,6 +58,15 @@ $(PROJECT_INCLUDE)/bsp/vectors.h: new-exceptions/bspsupport/vectors.h $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h +$(PROJECT_INCLUDE)/mpc83xx/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc83xx + @: > $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) + +$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h + if !mpc5xx endif if shared @@ -217,11 +226,6 @@ $(PROJECT_INCLUDE)/mpc8260/mmu.h: mpc8260/include/mmu.h $(PROJECT_INCLUDE)/mpc82 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/mmu.h endif if mpc83xx -$(PROJECT_INCLUDE)/mpc83xx/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc83xx - @: > $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) - $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h: mpc83xx/include/mpc83xx.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h @@ -230,10 +234,6 @@ $(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/bsp/$(d $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h -$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h - $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h: mpc83xx/spi/mpc83xx_spidrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h |