diff options
Diffstat (limited to '')
-rw-r--r-- | bsps/arm/xilinx-zynq/include/bsp.h (renamed from c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h (renamed from c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h) | 0 | ||||
-rw-r--r-- | bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h (renamed from c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h) | 0 | ||||
-rw-r--r-- | bsps/arm/xilinx-zynq/include/bsp/i2c.h (renamed from c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h) | 0 | ||||
-rw-r--r-- | bsps/arm/xilinx-zynq/include/bsp/irq.h (renamed from c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h (renamed from c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h) | 0 | ||||
-rw-r--r-- | bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h (renamed from c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h) | 0 | ||||
-rw-r--r-- | bsps/arm/xilinx-zynq/include/tm27.h (renamed from c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am | 41 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/xilinx-zynq/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am | 151 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs (renamed from c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs) | 0 |
12 files changed, 7 insertions, 189 deletions
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h b/bsps/arm/xilinx-zynq/include/bsp.h index afc6a66a06..afc6a66a06 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h +++ b/bsps/arm/xilinx-zynq/include/bsp.h diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h index c06a47c7f1..c06a47c7f1 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h +++ b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h index 9697cf3354..9697cf3354 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h +++ b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h b/bsps/arm/xilinx-zynq/include/bsp/i2c.h index 709ea0178e..709ea0178e 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h +++ b/bsps/arm/xilinx-zynq/include/bsp/i2c.h diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h b/bsps/arm/xilinx-zynq/include/bsp/irq.h index e8288938fe..e8288938fe 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h +++ b/bsps/arm/xilinx-zynq/include/bsp/irq.h diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h index 127f272fd9..127f272fd9 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h +++ b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h index 4d3edfabef..4d3edfabef 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h +++ b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h b/bsps/arm/xilinx-zynq/include/tm27.h index 39b8ecafec..39b8ecafec 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h +++ b/bsps/arm/xilinx-zynq/include/tm27.h diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am index 8a8a693bfd..94f4e0f5ea 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am +++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am @@ -11,45 +11,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - -dist_project_lib_DATA = bsp_specs +dist_project_lib_DATA = startup/bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h -include_bsp_HEADERS += ../shared/include/arm-cp15-start.h -include_bsp_HEADERS += ../shared/include/arm-errata.h -include_bsp_HEADERS += ../shared/include/arm-gic.h -include_bsp_HEADERS += ../shared/include/arm-gic-irq.h -include_bsp_HEADERS += ../shared/include/arm-gic-regs.h -include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h -include_bsp_HEADERS += ../shared/include/arm-release-id.h -include_bsp_HEADERS += include/cadence-i2c.h -include_bsp_HEADERS += include/cadence-i2c-regs.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/zynq-uart.h -include_bsp_HEADERS += include/zynq-uart-regs.h - ############################################################################### # Data # ############################################################################### @@ -59,7 +26,7 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds ############################################################################### # LibBSP # @@ -68,7 +35,7 @@ project_lib_DATA += startup/linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -131,5 +98,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c startup/bspstartmmu.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/arm/xilinx-zynq/headers.am diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac index 67cdb5fd37..f5a0af51bf 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac +++ b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-xilinx-zynq-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/xilinx_zynq_a9_qemu.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -149,5 +151,5 @@ RTEMS_BSP_CLEANUP_OPTIONS AC_CONFIG_FILES([ Makefile -startup/linkcmds]) +linkcmds:startup/linkcmds.in]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am b/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am deleted file mode 100644 index 0a025b3b95..0000000000 --- a/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am +++ /dev/null @@ -1,151 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(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/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.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 - -$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h - -$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h - -$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h - -$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h: ../shared/include/arm-a9mpcore-clock.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h - -$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h: ../shared/include/arm-a9mpcore-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h - -$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h - -$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h - -$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h - -$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h - -$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h - -$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h - -$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h - -$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h - -$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h - -$(PROJECT_INCLUDE)/bsp/cadence-i2c.h: include/cadence-i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cadence-i2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cadence-i2c.h - -$(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.h: include/cadence-i2c-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.h - -$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h - -$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - -$(PROJECT_INCLUDE)/bsp/zynq-uart.h: include/zynq-uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/zynq-uart.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/zynq-uart.h - -$(PROJECT_INCLUDE)/bsp/zynq-uart-regs.h: include/zynq-uart-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/zynq-uart-regs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/zynq-uart-regs.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs index 47dd31d46b..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs +++ b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs |