diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-22 15:05:47 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-23 15:18:42 +0200 |
commit | f004ace8280bd973b6b986402a805f684263aefb (patch) | |
tree | 52973fe737bd95f93605e60d17448b749ae1749e | |
parent | bsps: Move make/custom/* files to bsps (diff) | |
download | rtems-f004ace8280bd973b6b986402a805f684263aefb.tar.bz2 |
bsp/altera-cyclone-v: Move hwlib to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/README.txt (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/README.txt) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/include/alt_qspi.h (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi.h) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_16550_uart.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_16550_uart.c) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_address_space.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_address_space.c) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_clock_manager.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_clock_manager.c) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_dma.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma.c) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_dma_program.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma_program.c) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_generalpurpose_io.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_generalpurpose_io.c) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_i2c.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_i2c.c) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_qspi.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_qspi.c) | 0 | ||||
-rw-r--r-- | bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_reset_manager.c (renamed from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_reset_manager.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am | 57 |
12 files changed, 10 insertions, 47 deletions
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/README.txt b/bsps/arm/altera-cyclone-v/contrib/hwlib/README.txt index d0f505da76..d0f505da76 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/README.txt +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/README.txt diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi.h b/bsps/arm/altera-cyclone-v/contrib/hwlib/include/alt_qspi.h index 982c0aceae..982c0aceae 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi.h +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/include/alt_qspi.h diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_16550_uart.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_16550_uart.c index 7ed75c39d3..7ed75c39d3 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_16550_uart.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_16550_uart.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_address_space.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_address_space.c index d64ac33ec8..d64ac33ec8 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_address_space.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_address_space.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_clock_manager.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_clock_manager.c index 95404c1c13..95404c1c13 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_clock_manager.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_clock_manager.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_dma.c index 0fa69141ea..0fa69141ea 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_dma.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma_program.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_dma_program.c index c13957bcf8..c13957bcf8 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma_program.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_dma_program.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_generalpurpose_io.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_generalpurpose_io.c index b52e5002a3..b52e5002a3 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_generalpurpose_io.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_generalpurpose_io.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_i2c.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_i2c.c index b6279a7938..b6279a7938 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_i2c.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_i2c.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_qspi.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_qspi.c index 3e591fc044..3e591fc044 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_qspi.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_qspi.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_reset_manager.c b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_reset_manager.c index e37e5a7be3..e37e5a7be3 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_reset_manager.c +++ b/bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_reset_manager.c diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am index 99cf47db5e..d915f33e76 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am @@ -12,27 +12,6 @@ include $(top_srcdir)/../../bsp.am dist_project_lib_DATA = ../../../../../../bsps/arm/altera-cyclone-v/start/bsp_specs -############################################################################### -# Header # -############################################################################### - -# Altera hwlib -#The following Altera hwlib header files have been left out because so far -#they are not required: -#include_bsp_HEADERS += hwlib/include/alt_bridge_manager.h -#include_bsp_HEADERS += hwlib/include/alt_fpga_manager.h -#include_bsp_HEADERS += hwlib/include/alt_globaltmr.h -#include_bsp_HEADERS += hwlib/include/alt_system_manager.h -#include_bsp_HEADERS += hwlib/include/alt_timers.h -#include_bsp_HEADERS += hwlib/include/alt_watchdog.h -#The following Altera hwlib headers would be problematic with RTEMS: -#include_bsp_HEADERS += hwlib/include/alt_interrupt.h - -# Some of the headers from hwlib need the files from socal. Install them. -############################################################################### -# Data # -############################################################################### - start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) @@ -42,41 +21,25 @@ dist_project_lib_DATA += ../../../../../../bsps/arm/altera-cyclone-v/start/linkc dist_project_lib_DATA += ../../../../../../bsps/arm/altera-cyclone-v/start/linkcmds.altcycv_devkit dist_project_lib_DATA += ../../../../../../bsps/arm/altera-cyclone-v/start/linkcmds.altcycv_devkit_smp -############################################################################### -# LibBSP # -############################################################################### - project_lib_LIBRARIES = librtemsbsp.a librtemsbsp_a_SOURCES = librtemsbsp_a_CPPFLAGS = $(AM_CPPFLAGS) # for the Altera hwlib -librtemsbsp_a_CPPFLAGS += -I${srcdir}/hwlib/include -librtemsbsp_a_CPPFLAGS += -std=gnu99 +librtemsbsp_a_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/bsps/arm/altera-cyclone-v/contrib/hwlib/include CFLAGS += -Wno-missing-prototypes # hwlib from Altera -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_16550_uart.c -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_address_space.c -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_clock_manager.c -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_dma.c -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_dma_program.c -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_generalpurpose_io.c -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_i2c.c -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_qspi.c -librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_reset_manager.c -#The following Altera hwlib source files have been left out because so far -#they are not required: -#librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_bridge_manager.c -#librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_fpga_manager.c -#librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_globaltmr.c -#librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_system_manager.c -#librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_timers.c -#librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_watchdog.c -# The following Altera hwlib source files would be problematic with RTEMS: -#librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_interrupt.c - +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_16550_uart.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_address_space.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_clock_manager.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_dma.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_dma_program.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_generalpurpose_io.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_i2c.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_qspi.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_reset_manager.c # Shared librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c |