bsps: Move clock drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

10 files changed, 7 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/sh/gensh1/clock/ckinit.c b/bsps/sh/gensh1/clock/ckinit.c
index 6faaf27f58..6faaf27f58 100644
--- a/c/src/lib/libbsp/sh/gensh1/clock/ckinit.c
+++ b/bsps/sh/gensh1/clock/ckinit.c
diff --git a/c/src/lib/libbsp/sh/gensh1/clock/delay.c b/bsps/sh/gensh1/clock/delay.c
index 085771f777..085771f777 100644
--- a/c/src/lib/libbsp/sh/gensh1/clock/delay.c
+++ b/bsps/sh/gensh1/clock/delay.c
diff --git a/c/src/lib/libbsp/sh/gensh2/clock/ckinit.c b/bsps/sh/gensh2/clock/ckinit.c
index 5120b594eb..5120b594eb 100644
--- a/c/src/lib/libbsp/sh/gensh2/clock/ckinit.c
+++ b/bsps/sh/gensh2/clock/ckinit.c
diff --git a/c/src/lib/libbsp/sh/gensh4/clock/ckinit.c b/bsps/sh/gensh4/clock/ckinit.c
index 795203d2d9..795203d2d9 100644
--- a/c/src/lib/libbsp/sh/gensh4/clock/ckinit.c
+++ b/bsps/sh/gensh4/clock/ckinit.c
diff --git a/c/src/lib/libbsp/shared/clock_driver_simidle.c b/bsps/shared/dev/clock/clock-simidle.c
index 1b1cb6e55a..def406a1df 100644
--- a/c/src/lib/libbsp/shared/clock_driver_simidle.c
+++ b/bsps/shared/dev/clock/clock-simidle.c
@@ -25,7 +25,7 @@ volatile bool clock_driver_enabled;
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "clockdrv_shell.h"
+#include "clockimpl.h"
 
 /*
  * If this is defined, then the BSP has defined a delay of some sort so
diff --git a/c/src/lib/libbsp/shared/clockdrv_shell.h b/bsps/shared/dev/clock/clockimpl.h
index ddc66b049d..6eaa6c94e5 100644
--- a/c/src/lib/libbsp/shared/clockdrv_shell.h
+++ b/bsps/shared/dev/clock/clockimpl.h
@@ -36,7 +36,7 @@
  *
  */
 #if CLOCK_DRIVER_USE_FAST_IDLE && CLOCK_DRIVER_ISRS_PER_TICK
-#error "clockdrv_shell.h: Fast Idle PLUS n ISRs per tick is not supported"
+#error "Fast Idle PLUS n ISRs per tick is not supported"
 #endif
 
 /**
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index dba3efa272..d258a65c6e 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -31,8 +31,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += clock/ckinit.c
-librtemsbsp_a_SOURCES += clock/delay.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh1/clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh1/clock/delay.c
 librtemsbsp_a_SOURCES += startup/cpu_asm.c
 librtemsbsp_a_SOURCES += startup/ispsh7032.c
 librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index 76fc51d858..205e13ca8c 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh2/clock/ckinit.c
 librtemsbsp_a_SOURCES += startup/cpu_asm.c
 librtemsbsp_a_SOURCES += startup/ispsh7045.c
 librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index 7bbe0daaea..94c0601cc8 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += startup/cpu_asm.c
 librtemsbsp_a_SOURCES += startup/ispsh7750.c
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh4/clock/ckinit.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 0c834a7db6..4d399083a1 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += startup/cpu_asm.c
 librtemsbsp_a_SOURCES += startup/ispshgdb.c
 
 # clock
-librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 
 # console
 librtemsbsp_a_SOURCES += ../../shared/console-polled.c