diff options
Diffstat (limited to '')
-rw-r--r-- | bsps/m68k/av5282/include/bsp.h (renamed from c/src/lib/libbsp/m68k/av5282/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/av5282/include/tm27.h (renamed from c/src/lib/libbsp/m68k/av5282/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/csb360/include/bsp.h (renamed from c/src/lib/libbsp/m68k/csb360/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/csb360/include/tm27.h (renamed from c/src/lib/libbsp/m68k/csb360/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68340/include/bsp.h (renamed from c/src/lib/libbsp/m68k/gen68340/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68340/include/m340timer.h (renamed from c/src/lib/libbsp/m68k/gen68340/include/m340timer.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68340/include/m340uart.h (renamed from c/src/lib/libbsp/m68k/gen68340/include/m340uart.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68340/include/m68340.h (renamed from c/src/lib/libbsp/m68k/gen68340/include/m68340.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68340/include/m68340.inc (renamed from c/src/lib/libbsp/m68k/gen68340/include/m68340.inc) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68340/include/m68349.inc (renamed from c/src/lib/libbsp/m68k/gen68340/include/m68349.inc) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68340/include/tm27.h (renamed from c/src/lib/libbsp/m68k/gen68340/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68360/include/bsp.h (renamed from c/src/lib/libbsp/m68k/gen68360/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/gen68360/include/tm27.h (renamed from c/src/lib/libbsp/m68k/gen68360/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/genmcf548x/include/bsp.h (renamed from c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/genmcf548x/include/bsp/irq.h (renamed from c/src/lib/libbsp/m68k/genmcf548x/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/genmcf548x/include/tm27.h (renamed from c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/bsp/linker-symbols.h (renamed from c/src/lib/libbsp/m68k/shared/include/linker-symbols.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mvme16x_hw.h (renamed from c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/ds1307.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/i2c.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/i2cdrv.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/nvram.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf52235/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mcf52235/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf52235/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mcf52235/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5225x/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5225x/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5235/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mcf5235/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5235/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mcf5235/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5329/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mcf5329/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5329/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mcf5329/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mrm332/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mrm332/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mrm332/include/mrm332.h (renamed from c/src/lib/libbsp/m68k/mrm332/include/mrm332.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mrm332/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mrm332/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme147/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mvme147/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme147/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mvme147/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme147s/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mvme147s/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme147s/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mvme147s/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme162/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mvme162/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme162/include/page_table.h (renamed from c/src/lib/libbsp/m68k/mvme162/include/page_table.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme162/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mvme162/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme167/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mvme167/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme167/include/page_table.h (renamed from c/src/lib/libbsp/m68k/mvme167/include/page_table.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mvme167/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mvme167/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/uC5282/include/bsp.h (renamed from c/src/lib/libbsp/m68k/uC5282/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/uC5282/include/tm27.h (renamed from c/src/lib/libbsp/m68k/uC5282/include/tm27.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/Makefile.am | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/Makefile.am | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/preinstall.am | 63 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/av5282/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/csb360/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/csb360/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/csb360/preinstall.am | 67 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/csb360/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/csb360/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/Makefile.am | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/preinstall.am | 83 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/gen68340/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/Makefile.am | 16 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/preinstall.am | 71 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/gen68360/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/genmcf548x/Makefile.am | 23 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/genmcf548x/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/genmcf548x/preinstall.am | 87 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/genmcf548x/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 21 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am | 87 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf52235/Makefile.am | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf52235/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf52235/preinstall.am | 63 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mcf52235/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5225x/Makefile.am | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5225x/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5225x/preinstall.am | 63 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mcf5225x/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/Makefile.am | 19 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/preinstall.am | 71 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mcf5235/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5329/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5329/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5329/preinstall.am | 67 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mcf5329/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/Makefile.am | 15 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/preinstall.am | 67 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mrm332/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/Makefile.am | 15 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/preinstall.am | 72 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mvme147/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 15 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/preinstall.am | 72 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mvme147s/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/Makefile.am | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/preinstall.am | 76 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mvme162/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/preinstall.am | 67 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mvme167/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/preinstall.am | 42 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/Makefile.am | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/preinstall.am | 63 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/uC5282/bsp_specs) | 0 |
115 files changed, 114 insertions, 1380 deletions
diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/bsps/m68k/av5282/include/bsp.h index a8b32e745e..a8b32e745e 100644 --- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h +++ b/bsps/m68k/av5282/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/av5282/include/tm27.h b/bsps/m68k/av5282/include/tm27.h index 1e1dc77e59..1e1dc77e59 100644 --- a/c/src/lib/libbsp/m68k/av5282/include/tm27.h +++ b/bsps/m68k/av5282/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/bsps/m68k/csb360/include/bsp.h index 5272e17ae2..5272e17ae2 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h +++ b/bsps/m68k/csb360/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/csb360/include/tm27.h b/bsps/m68k/csb360/include/tm27.h index 5f2fd8a383..5f2fd8a383 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/tm27.h +++ b/bsps/m68k/csb360/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/bsps/m68k/gen68340/include/bsp.h index 28d86ff2f7..28d86ff2f7 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h +++ b/bsps/m68k/gen68340/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h b/bsps/m68k/gen68340/include/m340timer.h index 892c690e5f..892c690e5f 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h +++ b/bsps/m68k/gen68340/include/m340timer.h diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h b/bsps/m68k/gen68340/include/m340uart.h index 619a732a14..619a732a14 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h +++ b/bsps/m68k/gen68340/include/m340uart.h diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68340.h b/bsps/m68k/gen68340/include/m68340.h index 37440f3098..37440f3098 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/m68340.h +++ b/bsps/m68k/gen68340/include/m68340.h diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68340.inc b/bsps/m68k/gen68340/include/m68340.inc index 5c1ba36799..5c1ba36799 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/m68340.inc +++ b/bsps/m68k/gen68340/include/m68340.inc diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68349.inc b/bsps/m68k/gen68340/include/m68349.inc index 4e3ce53d29..4e3ce53d29 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/m68349.inc +++ b/bsps/m68k/gen68340/include/m68349.inc diff --git a/c/src/lib/libbsp/m68k/gen68340/include/tm27.h b/bsps/m68k/gen68340/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/tm27.h +++ b/bsps/m68k/gen68340/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/bsps/m68k/gen68360/include/bsp.h index 0c6a94066c..0c6a94066c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/bsps/m68k/gen68360/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/gen68360/include/tm27.h b/bsps/m68k/gen68360/include/tm27.h index c71eed3897..c71eed3897 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/tm27.h +++ b/bsps/m68k/gen68360/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/bsps/m68k/genmcf548x/include/bsp.h index 77a7bca0e8..77a7bca0e8 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h +++ b/bsps/m68k/genmcf548x/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h b/bsps/m68k/genmcf548x/include/bsp/irq.h index 825cc0d104..825cc0d104 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h +++ b/bsps/m68k/genmcf548x/include/bsp/irq.h diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h b/bsps/m68k/genmcf548x/include/tm27.h index 31ea8bca0c..31ea8bca0c 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h +++ b/bsps/m68k/genmcf548x/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/shared/include/linker-symbols.h b/bsps/m68k/include/bsp/linker-symbols.h index 8bf5ebfa07..8bf5ebfa07 100644 --- a/c/src/lib/libbsp/m68k/shared/include/linker-symbols.h +++ b/bsps/m68k/include/bsp/linker-symbols.h diff --git a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h b/bsps/m68k/include/mvme16x_hw.h index 2ac595a0fa..2ac595a0fa 100644 --- a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h +++ b/bsps/m68k/include/mvme16x_hw.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/bsps/m68k/mcf5206elite/include/bsp.h index 47c7e8c745..47c7e8c745 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/bsps/m68k/mcf5206elite/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h b/bsps/m68k/mcf5206elite/include/ds1307.h index 8e5636a0c8..8e5636a0c8 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h +++ b/bsps/m68k/mcf5206elite/include/ds1307.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h b/bsps/m68k/mcf5206elite/include/i2c.h index 8bec067a3a..8bec067a3a 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h +++ b/bsps/m68k/mcf5206elite/include/i2c.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h b/bsps/m68k/mcf5206elite/include/i2cdrv.h index 4b4a1ec141..4b4a1ec141 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h +++ b/bsps/m68k/mcf5206elite/include/i2cdrv.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h b/bsps/m68k/mcf5206elite/include/nvram.h index fd75db2363..fd75db2363 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h +++ b/bsps/m68k/mcf5206elite/include/nvram.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h b/bsps/m68k/mcf5206elite/include/tm27.h index 2abef68311..2abef68311 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h +++ b/bsps/m68k/mcf5206elite/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h b/bsps/m68k/mcf52235/include/bsp.h index ef3b928a24..ef3b928a24 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h +++ b/bsps/m68k/mcf52235/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/tm27.h b/bsps/m68k/mcf52235/include/tm27.h index b4b62ef721..b4b62ef721 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/include/tm27.h +++ b/bsps/m68k/mcf52235/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/bsps/m68k/mcf5225x/include/bsp.h index 8b8d40f485..8b8d40f485 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h +++ b/bsps/m68k/mcf5225x/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h b/bsps/m68k/mcf5225x/include/tm27.h index fcf1c4f8aa..fcf1c4f8aa 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h +++ b/bsps/m68k/mcf5225x/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/bsps/m68k/mcf5235/include/bsp.h index 14a6b04034..14a6b04034 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h +++ b/bsps/m68k/mcf5235/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/tm27.h b/bsps/m68k/mcf5235/include/tm27.h index 92a85c789a..92a85c789a 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/include/tm27.h +++ b/bsps/m68k/mcf5235/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/bsps/m68k/mcf5329/include/bsp.h index 7670e7a2d9..7670e7a2d9 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h +++ b/bsps/m68k/mcf5329/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/tm27.h b/bsps/m68k/mcf5329/include/tm27.h index 33376540ac..33376540ac 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/include/tm27.h +++ b/bsps/m68k/mcf5329/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/bsps/m68k/mrm332/include/bsp.h index 6d4f7b8eb2..6d4f7b8eb2 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/bsps/m68k/mrm332/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/bsps/m68k/mrm332/include/mrm332.h index 1b8672752d..1b8672752d 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h +++ b/bsps/m68k/mrm332/include/mrm332.h diff --git a/c/src/lib/libbsp/m68k/mrm332/include/tm27.h b/bsps/m68k/mrm332/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/tm27.h +++ b/bsps/m68k/mrm332/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/bsps/m68k/mvme147/include/bsp.h index 9cf3fbf5a8..9cf3fbf5a8 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/bsps/m68k/mvme147/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mvme147/include/tm27.h b/bsps/m68k/mvme147/include/tm27.h index 5b548a888a..5b548a888a 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/tm27.h +++ b/bsps/m68k/mvme147/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/bsps/m68k/mvme147s/include/bsp.h index 3a4803fec2..3a4803fec2 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/bsps/m68k/mvme147s/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h b/bsps/m68k/mvme147s/include/tm27.h index 48ae0f459a..48ae0f459a 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h +++ b/bsps/m68k/mvme147s/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/bsps/m68k/mvme162/include/bsp.h index 3645a31086..3645a31086 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/bsps/m68k/mvme162/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h b/bsps/m68k/mvme162/include/page_table.h index 09b93a49bd..09b93a49bd 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h +++ b/bsps/m68k/mvme162/include/page_table.h diff --git a/c/src/lib/libbsp/m68k/mvme162/include/tm27.h b/bsps/m68k/mvme162/include/tm27.h index 750408d009..750408d009 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/tm27.h +++ b/bsps/m68k/mvme162/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/bsps/m68k/mvme167/include/bsp.h index d04b4f3952..d04b4f3952 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/bsps/m68k/mvme167/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mvme167/include/page_table.h b/bsps/m68k/mvme167/include/page_table.h index 2db5591729..2db5591729 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/page_table.h +++ b/bsps/m68k/mvme167/include/page_table.h diff --git a/c/src/lib/libbsp/m68k/mvme167/include/tm27.h b/bsps/m68k/mvme167/include/tm27.h index 5b65311794..5b65311794 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/tm27.h +++ b/bsps/m68k/mvme167/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/bsps/m68k/uC5282/include/bsp.h index a887cc0385..a887cc0385 100644 --- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h +++ b/bsps/m68k/uC5282/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/uC5282/include/tm27.h b/bsps/m68k/uC5282/include/tm27.h index 9a24da3755..9a24da3755 100644 --- a/c/src/lib/libbsp/m68k/uC5282/include/tm27.h +++ b/bsps/m68k/uC5282/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am index e03929f5e7..4beada2f35 100644 --- a/c/src/lib/libbsp/m68k/Makefile.am +++ b/c/src/lib/libbsp/m68k/Makefile.am @@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory _SUBDIRS = @RTEMS_BSP_FAMILY@ -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = shared/include/linker-symbols.h - dist_project_lib_DATA = shared/startup/linkcmds.base EXTRA_DIST = @@ -14,10 +11,8 @@ EXTRA_DIST += shared/start.S EXTRA_DIST += shared/bspspuriousinit.c shared/m68000spurious.c -include_HEADERS = shared/mvme/mvme16x_hw.h - EXTRA_DIST += shared/gdbstub/m68k-stub.c shared/gdbstub/gdb_if.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am +include $(srcdir)/../../../../../bsps/m68k/headers.am diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index 6e9ed76bee..a3d051a365 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -4,15 +4,8 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -22,7 +15,7 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -59,5 +52,5 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/av5282/headers.am diff --git a/c/src/lib/libbsp/m68k/av5282/configure.ac b/c/src/lib/libbsp/m68k/av5282/configure.ac index 7282407061..4d5e885e95 100644 --- a/c/src/lib/libbsp/m68k/av5282/configure.ac +++ b/c/src/lib/libbsp/m68k/av5282/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-av5282],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/av5282.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/m68k/av5282/preinstall.am b/c/src/lib/libbsp/m68k/av5282/preinstall.am deleted file mode 100644 index 0bdb6554d6..0000000000 --- a/c/src/lib/libbsp/m68k/av5282/preinstall.am +++ /dev/null @@ -1,63 +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)/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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/av5282/bsp_specs b/c/src/lib/libbsp/m68k/av5282/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/av5282/bsp_specs +++ b/c/src/lib/libbsp/m68k/av5282/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/configure.ac b/c/src/lib/libbsp/m68k/configure.ac index 4f26893934..8c5e064f3c 100644 --- a/c/src/lib/libbsp/m68k/configure.ac +++ b/c/src/lib/libbsp/m68k/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shared]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index 70278e70ff..ce4afb155b 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -4,16 +4,8 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h @@ -24,7 +16,7 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -51,5 +43,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/csb360/headers.am diff --git a/c/src/lib/libbsp/m68k/csb360/configure.ac b/c/src/lib/libbsp/m68k/csb360/configure.ac index f2611c546b..74cdcdeb49 100644 --- a/c/src/lib/libbsp/m68k/csb360/configure.ac +++ b/c/src/lib/libbsp/m68k/csb360/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-csb360],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/csb360.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/m68k/csb360/preinstall.am b/c/src/lib/libbsp/m68k/csb360/preinstall.am deleted file mode 100644 index 67ab64c592..0000000000 --- a/c/src/lib/libbsp/m68k/csb360/preinstall.am +++ /dev/null @@ -1,67 +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/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/csb360/bsp_specs b/c/src/lib/libbsp/m68k/csb360/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/csb360/bsp_specs +++ b/c/src/lib/libbsp/m68k/csb360/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 58c75f7262..bbb1f63c17 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -4,30 +4,18 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/m340uart.h -include_HEADERS += include/m340timer.h -include_HEADERS += include/m68340.h -include_HEADERS += include/m68340.inc -include_HEADERS += include/m68349.inc EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -53,5 +41,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/gen68340/headers.am diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.ac b/c/src/lib/libbsp/m68k/gen68340/configure.ac index 6a13816349..a984f2dc35 100644 --- a/c/src/lib/libbsp/m68k/gen68340/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68340/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-gen68340],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gen68340.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/m68k/gen68340/preinstall.am b/c/src/lib/libbsp/m68k/gen68340/preinstall.am deleted file mode 100644 index d4174d005d..0000000000 --- a/c/src/lib/libbsp/m68k/gen68340/preinstall.am +++ /dev/null @@ -1,83 +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)/m340uart.h: include/m340uart.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m340uart.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340uart.h - -$(PROJECT_INCLUDE)/m340timer.h: include/m340timer.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m340timer.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340timer.h - -$(PROJECT_INCLUDE)/m68340.h: include/m68340.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68340.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.h - -$(PROJECT_INCLUDE)/m68340.inc: include/m68340.inc $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68340.inc -PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.inc - -$(PROJECT_INCLUDE)/m68349.inc: include/m68349.inc $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68349.inc -PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68349.inc - -$(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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/gen68340/bsp_specs b/c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs index 3a20757667..3a20757667 100644 --- a/c/src/lib/libbsp/m68k/gen68340/bsp_specs +++ b/c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index a134d792a8..9bb4369caa 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -4,25 +4,21 @@ 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 -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -dist_project_lib_DATA += startup/linkcmds startup/linkcmds.prom \ - startup/linkcmds.bootp EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) +project_lib_DATA += linkcmds +dist_project_lib_DATA += startup/linkcmds.bootp +dist_project_lib_DATA += startup/linkcmds.prom + noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -60,5 +56,5 @@ if HAS_FPSP libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/gen68360/headers.am diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac index 965e491c78..5a0e72cb21 100644 --- a/c/src/lib/libbsp/m68k/gen68360/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-gen68360],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gen68360.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/m68k/gen68360/preinstall.am b/c/src/lib/libbsp/m68k/gen68360/preinstall.am deleted file mode 100644 index 17d061f6b9..0000000000 --- a/c/src/lib/libbsp/m68k/gen68360/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)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmds.prom: startup/linkcmds.prom $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.prom -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.prom - -$(PROJECT_LIB)/linkcmds.bootp: startup/linkcmds.bootp $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.bootp -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.bootp - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - diff --git a/c/src/lib/libbsp/m68k/gen68360/bsp_specs b/c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/gen68360/bsp_specs +++ b/c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index 6259cedae5..fd9eac00f3 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -4,18 +4,7 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - -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/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/irq.h +dist_project_lib_DATA = startup/bsp_specs DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -26,16 +15,14 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA = bsp_specs -dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash +project_lib_DATA += linkcmds dist_project_lib_DATA += startup/linkcmds.COBRA5475 dist_project_lib_DATA += startup/linkcmds.m5484FireEngine - -project_lib_DATA += startup/linkcmds +dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) # startup libbsp_a_SOURCES += \ @@ -82,5 +69,5 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/genmcf548x/headers.am diff --git a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac index ce1804c3d2..d7ec6702b9 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac +++ b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-genmcf548x],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/COBRA5475.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]) @@ -43,7 +46,6 @@ RTEMS_BSPOPTS_HELP([HAS_LOW_LEVEL_INIT], [If defined, we will do all the low level init of the chip (like bus/memory...).]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am deleted file mode 100644 index 7308faf0d1..0000000000 --- a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am +++ /dev/null @@ -1,87 +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_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/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/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_LIB)/linkcmds.m5484FireEngine.flash: startup/linkcmds.m5484FireEngine.flash $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash - -$(PROJECT_LIB)/linkcmds.COBRA5475: startup/linkcmds.COBRA5475 $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.COBRA5475 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.COBRA5475 - -$(PROJECT_LIB)/linkcmds.m5484FireEngine: startup/linkcmds.m5484FireEngine $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine - -$(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/m68k/genmcf548x/bsp_specs b/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs index 3a20757667..3a20757667 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs +++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 90937076c6..7e0c38902b 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -4,23 +4,12 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h _SUBDIRS = . tools -include_HEADERS += include/i2c.h -include_HEADERS += include/i2cdrv.h -include_HEADERS += include/ds1307.h -include_HEADERS += include/nvram.h EXTRA_DIST += times @@ -29,8 +18,10 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/gdbinit \ - startup/linkcmds.flash +project_lib_DATA += linkcmds +dist_project_lib_DATA += startup/linkcmds.flash + +dist_project_lib_DATA += startup/gdbinit noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -64,5 +55,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5206/timer.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mcf5206elite/headers.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac index 5c46002976..ccb3625138 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5206elite.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/m68k/mcf5206elite/preinstall.am b/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am deleted file mode 100644 index c08f87dd0a..0000000000 --- a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am +++ /dev/null @@ -1,87 +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)/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2c.h - -$(PROJECT_INCLUDE)/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cdrv.h - -$(PROJECT_INCLUDE)/ds1307.h: include/ds1307.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ds1307.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ds1307.h - -$(PROJECT_INCLUDE)/nvram.h: include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/gdbinit: startup/gdbinit $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/gdbinit -PREINSTALL_FILES += $(PROJECT_LIB)/gdbinit - -$(PROJECT_LIB)/linkcmds.flash: startup/linkcmds.flash $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.flash -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.flash - diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs +++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac index 39e9682157..c2654a5ca9 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([runtest]) RTEMS_TOP(../../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) AM_MAINTAINER_MODE diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am index e1e840966e..5c51afeb58 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am @@ -4,15 +4,8 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -22,7 +15,7 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -50,5 +43,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5223x/cachepd.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mcf52235/headers.am diff --git a/c/src/lib/libbsp/m68k/mcf52235/configure.ac b/c/src/lib/libbsp/m68k/mcf52235/configure.ac index 3054b0d441..da0b172536 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf52235/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf52235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf52235.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/m68k/mcf52235/preinstall.am b/c/src/lib/libbsp/m68k/mcf52235/preinstall.am deleted file mode 100644 index 0bdb6554d6..0000000000 --- a/c/src/lib/libbsp/m68k/mcf52235/preinstall.am +++ /dev/null @@ -1,63 +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)/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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/mcf52235/bsp_specs b/c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs index 3a20757667..3a20757667 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/bsp_specs +++ b/c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am index e753379b41..b33adc2ef0 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am @@ -4,15 +4,8 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -22,7 +15,7 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = \ @@ -45,5 +38,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5225x/cachepd.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mcf5225x/headers.am diff --git a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac index 4a7371fd87..fab934b3f5 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-dpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5225x.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/m68k/mcf5225x/preinstall.am b/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am deleted file mode 100644 index 0bdb6554d6..0000000000 --- a/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am +++ /dev/null @@ -1,63 +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)/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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/mcf5225x/bsp_specs b/c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs index 3a20757667..3a20757667 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/bsp_specs +++ b/c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index 95de41ccb1..8a9027883a 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -4,26 +4,21 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash \ - startup/linkcmdsram - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) +project_lib_DATA += linkcmds +dist_project_lib_DATA += startup/linkcmds +dist_project_lib_DATA += startup/linkcmdsflash +dist_project_lib_DATA += startup/linkcmdsram + noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -60,5 +55,5 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mcf5235/headers.am diff --git a/c/src/lib/libbsp/m68k/mcf5235/configure.ac b/c/src/lib/libbsp/m68k/mcf5235/configure.ac index 82df518466..07838cd677 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5235/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5235.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/m68k/mcf5235/preinstall.am b/c/src/lib/libbsp/m68k/mcf5235/preinstall.am deleted file mode 100644 index 1f590e7235..0000000000 --- a/c/src/lib/libbsp/m68k/mcf5235/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)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmdsflash: startup/linkcmdsflash $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsflash -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsflash - -$(PROJECT_LIB)/linkcmdsram: startup/linkcmdsram $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsram -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsram - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - diff --git a/c/src/lib/libbsp/m68k/mcf5235/bsp_specs b/c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs index 3a20757667..3a20757667 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/bsp_specs +++ b/c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am index 49595e90f6..b6527dbe77 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -4,15 +4,8 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -22,7 +15,8 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash +project_lib_DATA += linkcmds +dist_project_lib_DATA += startup/linkcmdsflash noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -61,5 +55,5 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mcf5329/headers.am diff --git a/c/src/lib/libbsp/m68k/mcf5329/configure.ac b/c/src/lib/libbsp/m68k/mcf5329/configure.ac index ca49b5e7c7..99eb6f5ea4 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5329/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf52235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5329.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/m68k/mcf5329/preinstall.am b/c/src/lib/libbsp/m68k/mcf5329/preinstall.am deleted file mode 100644 index c521ac75e6..0000000000 --- a/c/src/lib/libbsp/m68k/mcf5329/preinstall.am +++ /dev/null @@ -1,67 +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)/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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmdsflash: startup/linkcmdsflash $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsflash -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsflash - diff --git a/c/src/lib/libbsp/m68k/mcf5329/bsp_specs b/c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/bsp_specs +++ b/c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 0d06beaeaf..0cd22f2c0d 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -4,19 +4,10 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h -include_HEADERS += include/mrm332.h - EXTRA_DIST += times EXTRA_DIST += start/start.S @@ -24,7 +15,7 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -51,5 +42,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mrm332/headers.am diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac index a00483fcd0..c8fb1c1ac3 100644 --- a/c/src/lib/libbsp/m68k/mrm332/configure.ac +++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mrm332.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/m68k/mrm332/preinstall.am b/c/src/lib/libbsp/m68k/mrm332/preinstall.am deleted file mode 100644 index 7bf1c0166a..0000000000 --- a/c/src/lib/libbsp/m68k/mrm332/preinstall.am +++ /dev/null @@ -1,67 +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)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/mrm332/bsp_specs b/c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/mrm332/bsp_specs +++ b/c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index 2314474475..6b1ec396dd 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -4,29 +4,20 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = ## Zilog component header files -include_rtems_zilogdir = $(includedir)/rtems/zilog -include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h EXTRA_DIST += ../../m68k/shared/start/start.S start.$(OBJEXT): ../../m68k/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -52,5 +43,5 @@ libbsp_a_LIBADD = \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mvme147/headers.am diff --git a/c/src/lib/libbsp/m68k/mvme147/configure.ac b/c/src/lib/libbsp/m68k/mvme147/configure.ac index e6b583d0f3..eaec21faa9 100644 --- a/c/src/lib/libbsp/m68k/mvme147/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme147.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/m68k/mvme147/preinstall.am b/c/src/lib/libbsp/m68k/mvme147/preinstall.am deleted file mode 100644 index a7c23bbc1b..0000000000 --- a/c/src/lib/libbsp/m68k/mvme147/preinstall.am +++ /dev/null @@ -1,72 +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)/rtems/zilog/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog - @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/mvme147/bsp_specs b/c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs index 3a20757667..3a20757667 100644 --- a/c/src/lib/libbsp/m68k/mvme147/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 1e663ceeeb..c4d5f5f89d 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -4,29 +4,20 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = ## Zilog component header files -include_rtems_zilogdir = $(includedir)/rtems/zilog -include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h EXTRA_DIST += ../../m68k/shared/start/start.S start.$(OBJEXT): ../../m68k/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -60,5 +51,5 @@ libbsp_a_LIBADD = \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mvme147s/headers.am diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac index 86dc3b4867..14f9a8bac5 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147s],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme147s.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/m68k/mvme147s/preinstall.am b/c/src/lib/libbsp/m68k/mvme147s/preinstall.am deleted file mode 100644 index a7c23bbc1b..0000000000 --- a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am +++ /dev/null @@ -1,72 +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)/rtems/zilog/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog - @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs b/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs index 3a20757667..3a20757667 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 2ea3f528fe..9ecf9f56e0 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -4,30 +4,19 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/page_table.h - ## Zilog component header files -include_rtems_zilogdir = $(includedir)/rtems/zilog -include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.h EXTRA_DIST += ../../m68k/shared/start/start.S start.$(OBJEXT): ../../m68k/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -71,5 +60,5 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mvme162/headers.am diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac index f3ade4ee33..aef42983a9 100644 --- a/c/src/lib/libbsp/m68k/mvme162/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme162],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme162.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/m68k/mvme162/preinstall.am b/c/src/lib/libbsp/m68k/mvme162/preinstall.am deleted file mode 100644 index fe2fdb9359..0000000000 --- a/c/src/lib/libbsp/m68k/mvme162/preinstall.am +++ /dev/null @@ -1,76 +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)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h - -$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog - @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: ../../shared/include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/mvme162/bsp_specs b/c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/mvme162/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index a295731802..fdea7cb506 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -4,26 +4,18 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/page_table.h EXTRA_DIST += ../../m68k/shared/start/start.S start.$(OBJEXT): ../../m68k/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -63,5 +55,5 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mvme167/headers.am diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.ac b/c/src/lib/libbsp/m68k/mvme167/configure.ac index d93f1b4ae5..20120fc1b9 100644 --- a/c/src/lib/libbsp/m68k/mvme167/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme167/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme167],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme167.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/m68k/mvme167/preinstall.am b/c/src/lib/libbsp/m68k/mvme167/preinstall.am deleted file mode 100644 index 60f6c0ba9f..0000000000 --- a/c/src/lib/libbsp/m68k/mvme167/preinstall.am +++ /dev/null @@ -1,67 +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)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/mvme167/bsp_specs b/c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/mvme167/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/preinstall.am b/c/src/lib/libbsp/m68k/preinstall.am deleted file mode 100644 index 2e2ec9e167..0000000000 --- a/c/src/lib/libbsp/m68k/preinstall.am +++ /dev/null @@ -1,42 +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) - -$(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_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)/linkcmds.base: shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base - -$(PROJECT_INCLUDE)/mvme16x_hw.h: shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h - diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index 86b75950dd..5572d3f3dc 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -4,15 +4,8 @@ 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 - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -22,7 +15,7 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -57,5 +50,5 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/uC5282/headers.am diff --git a/c/src/lib/libbsp/m68k/uC5282/configure.ac b/c/src/lib/libbsp/m68k/uC5282/configure.ac index a01db32e8f..3025976b40 100644 --- a/c/src/lib/libbsp/m68k/uC5282/configure.ac +++ b/c/src/lib/libbsp/m68k/uC5282/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-uC5282],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/uC5282.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/m68k/uC5282/preinstall.am b/c/src/lib/libbsp/m68k/uC5282/preinstall.am deleted file mode 100644 index 0bdb6554d6..0000000000 --- a/c/src/lib/libbsp/m68k/uC5282/preinstall.am +++ /dev/null @@ -1,63 +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)/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 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/m68k/uC5282/bsp_specs b/c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs index 3a20757667..3a20757667 100644 --- a/c/src/lib/libbsp/m68k/uC5282/bsp_specs +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs |