Changeset 28fb9059 in rtems


Ignore:
Timestamp:
Dec 7, 2017, 6:15:23 AM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
5, master
Children:
3f575da
Parents:
1737e8f
git-author:
Sebastian Huber <sebastian.huber@…> (12/07/17 06:15:23)
git-committer:
Sebastian Huber <sebastian.huber@…> (12/07/17 06:16:42)
Message:

bsps/powerpc: Fix mpc83xx_i2cdrv.h location

Update #3254.

Location:
c/src/lib
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am

    r1737e8f r28fb9059  
    4747nodist_include_HEADERS = include/bspopts.h
    4848include_bsp_HEADERS =
    49 include_bsp_HEADERS += ../../../libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h
    5049include_bsp_HEADERS += ../../shared/include/irq-generic.h
    5150include_bsp_HEADERS += ../../shared/include/irq-info.h
  • c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c

    r1737e8f r28fb9059  
    2222#include <bsp.h>
    2323#include <bsp/irq.h>
    24 #include <bsp/mpc83xx_i2cdrv.h>
     24#include <mpc83xx/mpc83xx_i2cdrv.h>
    2525
    2626#if MPC55XX_CHIP_FAMILY == 551
  • c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am

    r1737e8f r28fb9059  
    130130PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
    131131
    132 $(PROJECT_INCLUDE)/bsp/mpc83xx_i2cdrv.h: ../../../libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    133         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc83xx_i2cdrv.h
    134 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc83xx_i2cdrv.h
    135 
    136132$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    137133        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
  • c/src/lib/libcpu/powerpc/Makefile.am

    r1737e8f r28fb9059  
    1616include_bsp_HEADERS =
    1717include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h
     18
     19include_mpc83xxdir = $(includedir)/mpc83xx
     20
     21include_mpc83xx_HEADERS =
     22include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h
    1823
    1924EXTRA_DIST =
     
    370375
    371376# Includes
    372 include_mpc83xxdir = $(includedir)/mpc83xx
    373 
    374 include_mpc83xx_HEADERS = mpc83xx/include/mpc83xx.h
     377
     378include_mpc83xx_HEADERS += mpc83xx/include/mpc83xx.h
    375379
    376380# Network
     
    384388
    385389# i2c
    386 include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h
    387390noinst_PROGRAMS += mpc83xx/i2c.rel
    388391mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \
  • c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c

    r1737e8f r28fb9059  
    2020#include <bsp.h>
    2121#include <bsp/irq.h>
    22 #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
    23   #include <mpc83xx/mpc83xx_i2cdrv.h>
    24 #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
    25   #include <bsp/mpc83xx_i2cdrv.h>
    26 #endif
     22#include <mpc83xx/mpc83xx_i2cdrv.h>
    2723#include <rtems/error.h>
    2824#include <rtems/bspIo.h>
  • c/src/lib/libcpu/powerpc/preinstall.am

    r1737e8f r28fb9059  
    5858        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
    5959PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
     60
     61$(PROJECT_INCLUDE)/mpc83xx/$(dirstamp):
     62        @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc83xx
     63        @: > $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
     64PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
     65
     66$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
     67        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
     68PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
    6069
    6170if !mpc5xx
     
    218227endif
    219228if mpc83xx
    220 $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp):
    221         @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc83xx
    222         @: > $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
    223 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
    224 
    225229$(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h: mpc83xx/include/mpc83xx.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
    226230        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
     
    230234        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h
    231235PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h
    232 
    233 $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
    234         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
    235 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
    236236
    237237$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h: mpc83xx/spi/mpc83xx_spidrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
Note: See TracChangeset for help on using the changeset viewer.