From 28fb90597f58d7970dc94db9ce8be9b0a4268df8 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 7 Dec 2017 07:15:23 +0100 Subject: bsps/powerpc: Fix mpc83xx_i2cdrv.h location Update #3254. --- c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 1 - c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c | 2 +- c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am | 4 ---- c/src/lib/libcpu/powerpc/Makefile.am | 9 ++++++--- c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c | 6 +----- c/src/lib/libcpu/powerpc/preinstall.am | 18 +++++++++--------- 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index c2d7a61bfb..ecd6ed94d8 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -46,7 +46,6 @@ include_HEADERS += include/tm27.h nodist_include_HEADERS = include/bspopts.h include_bsp_HEADERS = -include_bsp_HEADERS += ../../../libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h include_bsp_HEADERS += ../../shared/include/irq-generic.h include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += ../../shared/include/stackalloc.h diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c index 97dcf5df90..49fd8cad9e 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c @@ -21,7 +21,7 @@ #include #include -#include +#include #if MPC55XX_CHIP_FAMILY == 551 static void i2c_probe(mpc83xx_i2c_softc_t *self) diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am index ea6e7cf845..ce7256f838 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am @@ -129,10 +129,6 @@ $(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/mpc83xx_i2cdrv.h: ../../../libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc83xx_i2cdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc83xx_i2cdrv.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 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 #include #include -#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H) - #include -#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) - #include -#endif +#include #include #include #include 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 -- cgit v1.2.3