diff options
Diffstat (limited to '')
-rw-r--r-- | bsps/powerpc/virtex/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/virtex/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/virtex/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/bsp/opbintctrl.h (renamed from c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/virtex/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/xiltemac.h (renamed from c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/xparameters_dflt.h (renamed from c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/virtex4/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/virtex4/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/include/bsp/mmu.h (renamed from c/src/lib/libbsp/powerpc/virtex4/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/virtex4/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/virtex5/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/virtex5/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/bsp/mmu.h (renamed from c/src/lib/libbsp/powerpc/virtex5/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/virtex5/include/tm27.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/Makefile.am | 23 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/preinstall.am | 100 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/virtex/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex4/Makefile.am | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex4/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex4/preinstall.am | 71 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/virtex4/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/Makefile.am | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/preinstall.am | 71 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/virtex5/bsp_specs) | 0 |
26 files changed, 18 insertions, 291 deletions
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/bsps/powerpc/virtex/include/bsp.h index 2f61ee2517..2f61ee2517 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h +++ b/bsps/powerpc/virtex/include/bsp.h diff --git a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h b/bsps/powerpc/virtex/include/bsp/irq.h index 1ce5b68b98..1ce5b68b98 100644 --- a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h +++ b/bsps/powerpc/virtex/include/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h b/bsps/powerpc/virtex/include/bsp/opbintctrl.h index 4ade0e48f8..4ade0e48f8 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h +++ b/bsps/powerpc/virtex/include/bsp/opbintctrl.h diff --git a/c/src/lib/libbsp/powerpc/virtex/include/tm27.h b/bsps/powerpc/virtex/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/tm27.h +++ b/bsps/powerpc/virtex/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h b/bsps/powerpc/virtex/include/xiltemac.h index 185b89bdc1..185b89bdc1 100644 --- a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h +++ b/bsps/powerpc/virtex/include/xiltemac.h diff --git a/c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h b/bsps/powerpc/virtex/include/xparameters_dflt.h index b31cb26fe8..b31cb26fe8 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h +++ b/bsps/powerpc/virtex/include/xparameters_dflt.h diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h b/bsps/powerpc/virtex4/include/bsp.h index 91e7ddf4ab..91e7ddf4ab 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h +++ b/bsps/powerpc/virtex4/include/bsp.h diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/irq.h b/bsps/powerpc/virtex4/include/bsp/irq.h index 45ef69adbf..45ef69adbf 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/include/irq.h +++ b/bsps/powerpc/virtex4/include/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/mmu.h b/bsps/powerpc/virtex4/include/bsp/mmu.h index 3e2710b95c..3e2710b95c 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/include/mmu.h +++ b/bsps/powerpc/virtex4/include/bsp/mmu.h diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/tm27.h b/bsps/powerpc/virtex4/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/include/tm27.h +++ b/bsps/powerpc/virtex4/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h b/bsps/powerpc/virtex5/include/bsp.h index ee9f20058d..ee9f20058d 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h +++ b/bsps/powerpc/virtex5/include/bsp.h diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/irq.h b/bsps/powerpc/virtex5/include/bsp/irq.h index 066090de7f..066090de7f 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/include/irq.h +++ b/bsps/powerpc/virtex5/include/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/mmu.h b/bsps/powerpc/virtex5/include/bsp/mmu.h index a3fb32b662..a3fb32b662 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/include/mmu.h +++ b/bsps/powerpc/virtex5/include/bsp/mmu.h diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/tm27.h b/bsps/powerpc/virtex5/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/include/tm27.h +++ b/bsps/powerpc/virtex5/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am index 9b6de34f50..232ec7b190 100644 --- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am @@ -4,29 +4,16 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp +dist_project_lib_DATA = startup/bsp_specs -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/xparameters_dflt.h if HAS_NETWORKING -include_HEADERS += network/xiltemac.h endif -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = - DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_bsp_HEADERS += ../shared/include/linker-symbols.h - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< @@ -38,7 +25,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) # Link commands -project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds dist_project_lib_DATA += ../shared/startup/linkcmds.base noinst_LIBRARIES = libbsp.a @@ -60,10 +47,6 @@ libbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \ ../../shared/console_read.c ../../shared/console_write.c # irq -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/opbintctrl.h -include_bsp_HEADERS += irq/irq.h libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c libbsp_a_SOURCES += ../../shared/src/irq-info.c @@ -98,5 +81,5 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/powerpc/virtex/headers.am diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac index 323d9759ed..8c910b5b3a 100644 --- a/c/src/lib/libbsp/powerpc/virtex/configure.ac +++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/virtex.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -45,7 +47,7 @@ RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([ Makefile -startup/linkcmds +linkcmds:startup/linkcmds.in ]) RTEMS_PPC_EXCEPTIONS diff --git a/c/src/lib/libbsp/powerpc/virtex/preinstall.am b/c/src/lib/libbsp/powerpc/virtex/preinstall.am deleted file mode 100644 index 9263f7a4d1..0000000000 --- a/c/src/lib/libbsp/powerpc/virtex/preinstall.am +++ /dev/null @@ -1,100 +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)/xparameters_dflt.h: include/xparameters_dflt.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xparameters_dflt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/xparameters_dflt.h - -if HAS_NETWORKING -$(PROJECT_INCLUDE)/xiltemac.h: network/xiltemac.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xiltemac.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/xiltemac.h -endif -$(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/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base - -$(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/opbintctrl.h: include/opbintctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/opbintctrl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/opbintctrl.h - -$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - diff --git a/c/src/lib/libbsp/powerpc/virtex/bsp_specs b/c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs index 6cb546f392..6cb546f392 100644 --- a/c/src/lib/libbsp/powerpc/virtex/bsp_specs +++ b/c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am index 28411c1fd0..c5a2a32632 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am @@ -5,18 +5,9 @@ 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 # include -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -include_bsp_HEADERS = - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h # start @@ -25,7 +16,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = rtems_crti.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a @@ -49,11 +40,9 @@ libbsp_a_SOURCES += startup/dummy_console.c \ ../../shared/dummy_printk_support.c # irq -include_bsp_HEADERS += include/irq.h libbsp_a_SOURCES += irq/irq_init.c # mmu -include_bsp_HEADERS += include/mmu.h libbsp_a_SOURCES += mmu/mmu.c libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ @@ -65,5 +54,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/powerpc/virtex4/headers.am diff --git a/c/src/lib/libbsp/powerpc/virtex4/configure.ac b/c/src/lib/libbsp/powerpc/virtex4/configure.ac index 8546bfc3a9..75e3c3bd15 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/configure.ac +++ b/c/src/lib/libbsp/powerpc/virtex4/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/virtex4.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/virtex4/preinstall.am b/c/src/lib/libbsp/powerpc/virtex4/preinstall.am deleted file mode 100644 index 62df611471..0000000000 --- a/c/src/lib/libbsp/powerpc/virtex4/preinstall.am +++ /dev/null @@ -1,71 +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_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(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/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h - diff --git a/c/src/lib/libbsp/powerpc/virtex4/bsp_specs b/c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs index ccbea2690c..ccbea2690c 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/bsp_specs +++ b/c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am index 5466edf088..ffc9c7eaea 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am @@ -4,18 +4,9 @@ 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 # include -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -include_bsp_HEADERS = - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h # start @@ -24,7 +15,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = rtems_crti.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a @@ -51,11 +42,9 @@ libbsp_a_SOURCES += startup/dummy_console.c \ ../../shared/dummy_printk_support.c # irq -include_bsp_HEADERS += include/irq.h libbsp_a_SOURCES += irq/irq_init.c # mmu -include_bsp_HEADERS += include/mmu.h libbsp_a_SOURCES += mmu/mmu.c libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ @@ -67,5 +56,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/powerpc/virtex5/headers.am diff --git a/c/src/lib/libbsp/powerpc/virtex5/configure.ac b/c/src/lib/libbsp/powerpc/virtex5/configure.ac index f3a156cb44..0c5481d772 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/configure.ac +++ b/c/src/lib/libbsp/powerpc/virtex5/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex5],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/virtex5.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/virtex5/preinstall.am b/c/src/lib/libbsp/powerpc/virtex5/preinstall.am deleted file mode 100644 index 62df611471..0000000000 --- a/c/src/lib/libbsp/powerpc/virtex5/preinstall.am +++ /dev/null @@ -1,71 +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_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(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/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h - diff --git a/c/src/lib/libbsp/powerpc/virtex5/bsp_specs b/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs index ccbea2690c..ccbea2690c 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/bsp_specs +++ b/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs |