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/sh/gensh1/configure.ac | 2 +- c/src/lib/libbsp/sh/gensh2/Makefile.am | 1 + c/src/lib/libbsp/sh/gensh2/configure.ac | 2 +- c/src/lib/libbsp/sh/gensh4/Makefile.am | 1 + c/src/lib/libbsp/sh/gensh4/configure.ac | 2 +- c/src/lib/libbsp/sh/shsim/Makefile.am | 1 + c/src/lib/libbsp/sh/shsim/configure.ac | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) (limited to 'c/src/lib/libbsp/sh') diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac index 18e661219c..0f6a184369 100644 --- a/c/src/lib/libbsp/sh/gensh1/configure.ac +++ b/c/src/lib/libbsp/sh/gensh1/configure.ac @@ -25,7 +25,7 @@ RTEMS_BSPOPTS_HELP([START_HW_INIT], ## Used in scitab/Makefile.am AC_SUBST(CPU_CLOCK_RATE_HZ) -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/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 9a0c130fc9..ca052a1865 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -41,6 +41,7 @@ libbsp_a_SOURCES += startup/hw_init.c \ ../../shared/getentropy-cpucounter.c \ ../../shared/gnatinstallhandler.c ../../shared/bspclean.c \ ../shared/bsphwinit.c +libbsp_a_SOURCES += ../../shared/bspreset.c # scitab libbsp_a_SOURCES += scitab.c # console diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac index e7ef9a7cab..62f89b38d8 100644 --- a/c/src/lib/libbsp/sh/gensh2/configure.ac +++ b/c/src/lib/libbsp/sh/gensh2/configure.ac @@ -29,7 +29,7 @@ RTEMS_BSPOPTS_SET([STANDALONE_EVB],[*],[]) RTEMS_BSPOPTS_HELP([STANDALONE_EVB], [If defined, compiles code to jump-start from FLASH, without a monitor]) -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/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 9f41b8a18d..10c40daf04 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -33,6 +33,7 @@ libbsp_a_SOURCES += \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \ ../../shared/getentropy-cpucounter.c \ ../../shared/gnatinstallhandler.c ../shared/bsphwinit.c +libbsp_a_SOURCES += ../../shared/bspreset.c # console libbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c # hw_init diff --git a/c/src/lib/libbsp/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac index 6407e791d7..26513ee0cf 100644 --- a/c/src/lib/libbsp/sh/gensh4/configure.ac +++ b/c/src/lib/libbsp/sh/gensh4/configure.ac @@ -31,7 +31,7 @@ RTEMS_BSPOPTS_SET([COPY_DATA_FROM_ROM],[*],[0]) RTEMS_BSPOPTS_HELP([COPY_DATA_FROM_ROM], [Whether to copy data from ROM to RAM in start.S]) -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/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 39ab3f4e7a..45d4d4bfa2 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -38,6 +38,7 @@ libbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../shared/bsphwinit.c libbsp_a_SOURCES += startup/sysexit.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += ../../shared/clock_driver_simidle.c diff --git a/c/src/lib/libbsp/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac index 12ae3ccac6..6639496fbd 100644 --- a/c/src/lib/libbsp/sh/shsim/configure.ac +++ b/c/src/lib/libbsp/sh/shsim/configure.ac @@ -35,7 +35,7 @@ RTEMS_BSPOPTS_HELP([START_HW_INIT], ## Used in scitab/Makefile.am AC_SUBST(CPU_CLOCK_RATE_HZ) -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) -- cgit v1.2.3