From 8c62cf4209b2fe57fdbc3a138f2c644e19774367 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 6 Jun 2018 16:21:22 +0200 Subject: tools: Remove shgen All tools should be removed from the RTEMS source repository at some point in time. Tools with a BSD-style license will be moved to the RTEMS tools repository. Unfortunately, the shgen tool is GPL licensed. Remove all uses of this tool from the code base. Replace generated files with stub functions. If users of this BSP still exist, they can reimplement the functionality using a BSD-style license. Close #3443. --- c/src/lib/libbsp/sh/gensh1/Makefile.am | 9 +-------- c/src/lib/libbsp/sh/gensh1/configure.ac | 7 +------ c/src/lib/libbsp/sh/gensh2/Makefile.am | 9 +-------- c/src/lib/libbsp/sh/gensh2/configure.ac | 6 +----- 4 files changed, 4 insertions(+), 27 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 3ebc5ad678..ca2c0f9d72 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -16,13 +16,6 @@ project_lib_DATA += linkcmds project_lib_LIBRARIES = librtemsbsp.a librtemsbsp_a_SOURCES = -SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen - -scitab.c: $(SHGEN) - $(SHGEN) -H @CPU_CLOCK_RATE_HZ@ sci > $@ -BUILT_SOURCES = scitab.c -CLEANFILES = scitab.c - # startup librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shared/start/bspstart.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c @@ -37,7 +30,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/start/cpu_asm.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/start/ispsh7032.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/btimer/btimer.c # scitab -librtemsbsp_a_SOURCES += scitab.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/console/scitab.c # console librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shared/console/console.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/console/sci.c diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac index 44b2e047eb..d336f9e094 100644 --- a/c/src/lib/libbsp/sh/gensh1/configure.ac +++ b/c/src/lib/libbsp/sh/gensh1/configure.ac @@ -13,17 +13,12 @@ RTEMS_BSP_CONFIGURE ## bsp-specific options -RTEMS_BSPOPTS_SET([CPU_CLOCK_RATE_HZ],[*],[20000000]) -RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ]) - RTEMS_BSPOPTS_SET([START_HW_INIT],[*],[]) RTEMS_BSPOPTS_HELP([START_HW_INIT], [If defined, selects whether 'early_hw_init()' is called from 'start.S'; 'bsp_hw_init()' is always called from 'bspstart.c']) -## Used in scitab/Makefile.am -AC_SUBST(CPU_CLOCK_RATE_HZ) - +AC_DEFINE(CPU_CLOCK_RATE_HZ, 20000000, [cpu clock rate in HZ]) RTEMS_BSP_CLEANUP_OPTIONS # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 2d964dc9e7..96c30a985e 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -18,13 +18,6 @@ dist_project_lib_DATA += ../../../../../../bsps/sh/gensh2/start/linkcmds.rom project_lib_LIBRARIES = librtemsbsp.a librtemsbsp_a_SOURCES = -SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen - -scitab.c: $(SHGEN) - $(SHGEN) -H @CPU_CLOCK_RATE_HZ@ sci > $@ -BUILT_SOURCES = scitab.c -CLEANFILES = scitab.c - # startup librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/start/hw_init.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shared/start/bspstart.c @@ -39,7 +32,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/start/cpu_asm.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/start/ispsh7045.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/btimer/btimer.c # scitab -librtemsbsp_a_SOURCES += scitab.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/console/scitab.c # console librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shared/console/console.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/console/config.c diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac index 55232320fe..97203eeceb 100644 --- a/c/src/lib/libbsp/sh/gensh2/configure.ac +++ b/c/src/lib/libbsp/sh/gensh2/configure.ac @@ -13,11 +13,7 @@ RTEMS_BSP_CONFIGURE ## bsp-specific options -RTEMS_BSPOPTS_SET([CPU_CLOCK_RATE_HZ],[*],[29491200]) -RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ]) - -## Used in scitab/Makefile.am -AC_SUBST(CPU_CLOCK_RATE_HZ) +AC_DEFINE(CPU_CLOCK_RATE_HZ, 29491200, [cpu clock rate in HZ]) RTEMS_BSPOPTS_SET([START_HW_INIT],[*],[]) RTEMS_BSPOPTS_HELP([START_HW_INIT], -- cgit v1.2.3