From 3dd381f0431b761965f573381ff90a8d42a8bd79 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 21 Nov 2017 12:50:58 +0100 Subject: bsps: Simplify RTEMS_BSP_CLEANUP_OPTIONS Remove BSP-specific defaults for RTEMS_BSP_CLEANUP_OPTIONS to simplify the BSP configuration and documentation. Change defaults to: BSP_PRESS_KEY_FOR_RESET=0 BSP_RESET_BOARD_AT_EXIT=1 BSP_PRINT_EXCEPTION_CONTEXT=1 --- c/src/lib/libbsp/m68k/av5282/configure.ac | 2 +- c/src/lib/libbsp/m68k/csb360/Makefile.am | 1 + c/src/lib/libbsp/m68k/csb360/configure.ac | 2 +- c/src/lib/libbsp/m68k/gen68340/Makefile.am | 1 + c/src/lib/libbsp/m68k/gen68340/configure.ac | 2 +- c/src/lib/libbsp/m68k/gen68360/Makefile.am | 1 + c/src/lib/libbsp/m68k/gen68360/configure.ac | 2 +- c/src/lib/libbsp/m68k/genmcf548x/configure.ac | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 1 + c/src/lib/libbsp/m68k/mcf5206elite/configure.ac | 2 +- c/src/lib/libbsp/m68k/mcf52235/configure.ac | 2 +- c/src/lib/libbsp/m68k/mcf5225x/configure.ac | 2 +- c/src/lib/libbsp/m68k/mcf5235/configure.ac | 2 +- c/src/lib/libbsp/m68k/mcf5329/configure.ac | 2 +- c/src/lib/libbsp/m68k/mrm332/Makefile.am | 1 + c/src/lib/libbsp/m68k/mrm332/configure.ac | 2 +- c/src/lib/libbsp/m68k/mvme147/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme147/configure.ac | 2 +- c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme147s/configure.ac | 2 +- c/src/lib/libbsp/m68k/mvme162/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme162/configure.ac | 2 +- c/src/lib/libbsp/m68k/mvme167/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme167/configure.ac | 2 +- c/src/lib/libbsp/m68k/uC5282/configure.ac | 2 +- 25 files changed, 25 insertions(+), 16 deletions(-) (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/av5282/configure.ac b/c/src/lib/libbsp/m68k/av5282/configure.ac index 419517273e..434fb4f274 100644 --- a/c/src/lib/libbsp/m68k/av5282/configure.ac +++ b/c/src/lib/libbsp/m68k/av5282/configure.ac @@ -17,7 +17,7 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -RTEMS_BSP_CLEANUP_OPTIONS(0, 1) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index f872ebaa98..ea1823fea6 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -35,6 +35,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/getentropy-cpucounter.c \ ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # console libbsp_a_SOURCES += console/console-io.c ../../shared/console-polled.c diff --git a/c/src/lib/libbsp/m68k/csb360/configure.ac b/c/src/lib/libbsp/m68k/csb360/configure.ac index 91be914009..30bfc3105d 100644 --- a/c/src/lib/libbsp/m68k/csb360/configure.ac +++ b/c/src/lib/libbsp/m68k/csb360/configure.ac @@ -15,7 +15,7 @@ RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index f52e96613c..bdd19cf7be 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -38,6 +38,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/getentropy-cpucounter.c \ ../../shared/sbrk.c ../../shared/setvec.c \ startup/dumpanic.c ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += clock/ckinit.c # console diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.ac b/c/src/lib/libbsp/m68k/gen68340/configure.ac index 0325f23ce5..f70ee6809c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68340/configure.ac @@ -13,7 +13,7 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 25411d0b07..c57e0858b0 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -33,6 +33,7 @@ libbsp_a_SOURCES += startup/alloc360.c ../../shared/bspclean.c \ ../../shared/getentropy-cpucounter.c \ ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h # console diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac index f9cabb4337..6a0ff227a5 100644 --- a/c/src/lib/libbsp/m68k/gen68360/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac @@ -30,7 +30,7 @@ RTEMS_BSPOPTS_SET([GEN68360_040],[gen68360_040],[1]) RTEMS_BSPOPTS_HELP([GEN68360_040], [If defined, use custom settings for the gen68360_040 BSP.]) -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac index c14663659d..b92f780f31 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac +++ b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac @@ -42,7 +42,7 @@ RTEMS_BSPOPTS_SET([HAS_LOW_LEVEL_INIT],[*],[]) 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(0, 1) +RTEMS_BSP_CLEANUP_OPTIONS RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 473fe49cfa..bde6f54aeb 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -40,6 +40,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/getentropy-cpucounter.c \ ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # console libbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c # i2c diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac index a8fadb95ab..d5641422bc 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac @@ -15,7 +15,7 @@ RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS AC_CONFIG_SUBDIRS(tools) diff --git a/c/src/lib/libbsp/m68k/mcf52235/configure.ac b/c/src/lib/libbsp/m68k/mcf52235/configure.ac index 8d329f3ce1..ea3a064bf7 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf52235/configure.ac @@ -13,7 +13,7 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS -RTEMS_BSP_CLEANUP_OPTIONS(0, 1) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac index 3fcb545c00..ce208e0f77 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac @@ -15,7 +15,7 @@ RTEMS_PROG_CCAS RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION RTEMS_BSP_BOOTCARD_OPTIONS -RTEMS_BSP_CLEANUP_OPTIONS(0, 1) +RTEMS_BSP_CLEANUP_OPTIONS RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "lwip") diff --git a/c/src/lib/libbsp/m68k/mcf5235/configure.ac b/c/src/lib/libbsp/m68k/mcf5235/configure.ac index 810108cf58..867708a393 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5235/configure.ac @@ -17,7 +17,7 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -RTEMS_BSP_CLEANUP_OPTIONS(0, 1) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/mcf5329/configure.ac b/c/src/lib/libbsp/m68k/mcf5329/configure.ac index d9f8821161..0c4deccf04 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5329/configure.ac @@ -16,7 +16,7 @@ RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -RTEMS_BSP_CLEANUP_OPTIONS(0, 1) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index deb6a408fc..116865e92a 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -35,6 +35,7 @@ libbsp_a_SOURCES += startup/start_c.c \ ../../shared/bspclean.c \ ../../shared/setvec.c \ ../../shared/bspgetworkarea.c ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += clock/ckinit.c # console diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac index 4291f2bc1e..07efc0a533 100644 --- a/c/src/lib/libbsp/m68k/mrm332/configure.ac +++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac @@ -13,7 +13,7 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index d38a04d76f..4479282b46 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -36,6 +36,7 @@ libbsp_a_SOURCES += startup/bspclean.c \ ../../shared/bsppredriverhook.c \ ../../shared/bspgetworkarea.c ../../shared/sbrk.c \ ../../shared/setvec.c ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += clock/ckinit.c # console diff --git a/c/src/lib/libbsp/m68k/mvme147/configure.ac b/c/src/lib/libbsp/m68k/mvme147/configure.ac index 196591b19b..ebd9326879 100644 --- a/c/src/lib/libbsp/m68k/mvme147/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147/configure.ac @@ -13,7 +13,7 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 3b1fccad22..ff1c566f36 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -37,6 +37,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \ ../../shared/setvec.c \ ../../shared/bspgetworkarea.c ../../shared/setvec.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += ../mvme147/clock/ckinit.c # console diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac index 0d44b9db32..2ba1d0c7ab 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac @@ -13,7 +13,7 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index f04d19f587..e98fae2d73 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -41,6 +41,7 @@ libbsp_a_SOURCES += startup/bspclean.c \ ../../shared/bspgetworkarea.c startup/page_table.c \ ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += clock/ckinit.c # console diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac index 625f3f7c0b..cc3f3cd2de 100644 --- a/c/src/lib/libbsp/m68k/mvme162/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac @@ -18,7 +18,7 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL([HAS_NETWORKING],test "$HAS_NETWORKING" = "yes") AM_CONDITIONAL([HAS_FPSP],[test "$RTEMS_CPU_MODEL" = "m68040"]) -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index 120bc28d77..670126cb58 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -37,6 +37,7 @@ libbsp_a_SOURCES += startup/bspclean.c \ startup/page_table.c \ ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += clock/ckinit.c # console diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.ac b/c/src/lib/libbsp/m68k/mvme167/configure.ac index ab33b805a2..ddafc96840 100644 --- a/c/src/lib/libbsp/m68k/mvme167/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme167/configure.ac @@ -49,7 +49,7 @@ RTEMS_BSPOPTS_HELP([PRINTK_MINOR], 2 - /dev/tty2, Serial Port 3 on the MVME712M. 3 - /dev/tty3, Serial Port 4 on the MVME712M.]) -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/uC5282/configure.ac b/c/src/lib/libbsp/m68k/uC5282/configure.ac index fd268918c5..0d1f730a5e 100644 --- a/c/src/lib/libbsp/m68k/uC5282/configure.ac +++ b/c/src/lib/libbsp/m68k/uC5282/configure.ac @@ -17,7 +17,7 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -RTEMS_BSP_CLEANUP_OPTIONS(0, 1) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) -- cgit v1.2.3