RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsps/powerpc: Fix mpc83xx_i2cdrv.h location

Browse Source 
Update #3254.
This commit is contained in:
Sebastian Huber
2017-12-07 07:15:23 +01:00
parent 1737e8f867
commit 28fb90597f
6 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
View File

@@ -46,7 +46,6 @@ include_HEADERS += include/tm27.h
nodist_include_HEADERS = include/bspopts.h nodist_include_HEADERS = include/bspopts.h
include_bsp_HEADERS = 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-generic.h
include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += ../../shared/include/irq-info.h
include_bsp_HEADERS += ../../shared/include/stackalloc.h include_bsp_HEADERS += ../../shared/include/stackalloc.h

2
c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c
View File

@@ -21,7 +21,7 @@
#include <bsp.h> #include <bsp.h>
#include <bsp/irq.h> #include <bsp/irq.h>
#include <bsp/mpc83xx_i2cdrv.h> #include <mpc83xx/mpc83xx_i2cdrv.h>
#if MPC55XX_CHIP_FAMILY == 551 #if MPC55XX_CHIP_FAMILY == 551
static void i2c_probe(mpc83xx_i2c_softc_t *self) static void i2c_probe(mpc83xx_i2c_softc_t *self)

4
c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
View File

@@ -129,10 +129,6 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
PREINSTALL_FILES += $(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) $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h

9
c/src/lib/libcpu/powerpc/Makefile.am
View File

@@ -16,6 +16,11 @@ include_bspdir = $(includedir)/bsp
include_bsp_HEADERS = include_bsp_HEADERS =
include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h 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 = EXTRA_DIST =
noinst_PROGRAMS = new-exceptions/rtems-cpu.rel noinst_PROGRAMS = new-exceptions/rtems-cpu.rel
@@ -369,9 +374,8 @@ endif
if mpc83xx if mpc83xx
# Includes # Includes
include_mpc83xxdir = $(includedir)/mpc83xx
include_mpc83xx_HEADERS = mpc83xx/include/mpc83xx.h include_mpc83xx_HEADERS += mpc83xx/include/mpc83xx.h
# Network # Network
include_bsp_HEADERS += mpc83xx/network/tsec.h include_bsp_HEADERS += mpc83xx/network/tsec.h
@@ -383,7 +387,6 @@ mpc83xx_tsec_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif endif
# i2c # i2c
include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h
noinst_PROGRAMS += mpc83xx/i2c.rel noinst_PROGRAMS += mpc83xx/i2c.rel
mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \ mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \
mpc83xx/i2c/mpc83xx_i2cdrv.h mpc83xx/i2c/mpc83xx_i2cdrv.h

4
c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c
View File

@@ -19,11 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <bsp.h> #include <bsp.h>
#include <bsp/irq.h> #include <bsp/irq.h>
#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
#include <mpc83xx/mpc83xx_i2cdrv.h> #include <mpc83xx/mpc83xx_i2cdrv.h>
#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
#include <bsp/mpc83xx_i2cdrv.h>
#endif
#include <rtems/error.h> #include <rtems/error.h>
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#include <errno.h> #include <errno.h>

18
c/src/lib/libcpu/powerpc/preinstall.am
View File

@@ -58,6 +58,15 @@ $(PROJECT_INCLUDE)/bsp/vectors.h: new-exceptions/bspsupport/vectors.h $(PROJECT_
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
PREINSTALL_FILES += $(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 if !mpc5xx
endif endif
if shared 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 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/mmu.h
endif endif
if mpc83xx 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) $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h: mpc83xx/include/mpc83xx.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
PREINSTALL_FILES += $(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 $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h
PREINSTALL_FILES += $(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) $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h: mpc83xx/spi/mpc83xx_spidrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h