[rtems commit] bsps: Move clock drivers to bsps
Sebastian Huber
sebh at rtems.org
Fri Apr 20 13:28:22 UTC 2018
Module: rtems
Branch: master
Commit: 7632906fc290b652416ab59eb5fb49356c064ed6
Changeset: http://git.rtems.org/rtems/commit/?id=7632906fc290b652416ab59eb5fb49356c064ed6
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Thu Apr 19 06:35:52 2018 +0200
bsps: Move clock drivers to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
---
{c/src/lib/libbsp => bsps}/arm/atsam/clock/systick-freq.c | 0
{c/src/lib/libbsp => bsps}/arm/csb336/clock/clockdrv.c | 4 ++--
{c/src/lib/libbsp => bsps}/arm/csb337/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/arm/edb7312/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/arm/gumstix/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/arm/raspberrypi/clock/clockdrv.c | 4 ++--
{c/src/lib/libbsp => bsps}/arm/rtl22xx/clock/clockdrv.c | 4 ++--
.../armv7m-clock-config.c => bsps/arm/shared/clock/clock-armv7m.c | 4 ++--
.../clock/lpc-clock-config.c => bsps/arm/shared/clock/clock-nxp-lpc.c | 4 ++--
{c/src/lib/libbsp => bsps}/arm/smdk2410/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/arm/smdk2410/clock/support.c | 0
{c/src/lib/libbsp => bsps}/arm/tms570/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/i386/pc386/clock/ckinit.c | 2 +-
{c/src/lib/libbsp => bsps}/i386/pc386/clock/rtc.c | 0
{c/src/lib/libbsp => bsps}/i386/pc386/clock/todcfg.c | 0
{c/src/lib/libbsp => bsps}/lm32/shared/clock/ckinit.c | 2 +-
{c/src/lib/libbsp => bsps}/lm32/shared/clock/clock.h | 0
{c/src/lib/libbsp => bsps}/m68k/av5282/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/m68k/gen68340/clock/ckinit.c | 0
{c/src/lib/libbsp => bsps}/m68k/gen68360/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/m68k/genmcf548x/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/m68k/mcf52235/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/m68k/mcf5225x/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/m68k/mcf5235/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/m68k/mcf5329/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/m68k/mrm332/clock/ckinit.c | 0
{c/src/lib/libbsp => bsps}/m68k/mvme147/clock/ckinit.c | 0
{c/src/lib/libbsp => bsps}/m68k/mvme162/clock/ckinit.c | 0
{c/src/lib/libbsp => bsps}/m68k/mvme167/clock/ckinit.c | 0
{c/src/lib/libbsp => bsps}/m68k/uC5282/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/mips/csb350/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/mips/hurricane/clock/ckinit.c | 0
{c/src/lib/libbsp => bsps}/mips/hurricane/clock/clock.S | 0
{c/src/lib/libbsp => bsps}/mips/hurricane/clock/clock.h | 0
{c/src/lib/libbsp => bsps}/mips/jmr3904/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/mips/rbtx4925/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/mips/rbtx4938/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/mips/rbtx4938/clock/yamon_api.h | 0
{c/src/lib/libbsp => bsps}/mips/shared/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/mips/shared/clock/mips_timer.S | 0
{c/src/lib/libbsp => bsps}/nios2/nios2_iss/clock/clock.c | 2 +-
{c/src/lib/libbsp => bsps}/no_cpu/no_bsp/clock/ckinit.c | 2 +-
{c/src/lib/libbsp => bsps}/or1k/generic_or1k/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/powerpc/mpc55xxevb/clock/clock-config.c | 2 +-
{c/src/lib/libbsp => bsps}/powerpc/mpc8260ads/clock/p_clock.c | 0
{c/src/lib/libbsp => bsps}/powerpc/qoriq/clock/clock-config.c | 4 ++--
bsps/powerpc/shared/{dev => clock}/clock-ppc-dec.c | 0
bsps/powerpc/shared/{dev => clock}/clock-ppc403.c | 0
{c/src/lib/libbsp => bsps}/powerpc/shared/clock/clock.c | 0
{c/src/lib/libbsp => bsps}/powerpc/shared/clock/p_clock.c | 0
bsps/powerpc/ss555/{dev => clock}/clock.c | 0
{c/src/lib/libbsp => bsps}/powerpc/ss555/clock/p_clock.c | 0
{c/src/lib/libbsp => bsps}/powerpc/t32mppc/clock/clock-config.c | 4 ++--
{c/src/lib/libbsp => bsps}/powerpc/tqm8xx/clock/p_clock.c | 0
{c/src/lib/libbsp => bsps}/riscv/riscv_generic/clock/clockdrv.c | 2 +-
{c/src/lib/libbsp => bsps}/sh/gensh1/clock/ckinit.c | 0
{c/src/lib/libbsp => bsps}/sh/gensh1/clock/delay.c | 0
{c/src/lib/libbsp => bsps}/sh/gensh2/clock/ckinit.c | 0
{c/src/lib/libbsp => bsps}/sh/gensh4/clock/ckinit.c | 0
.../clock_driver_simidle.c => bsps/shared/dev/clock/clock-simidle.c | 2 +-
.../shared/clockdrv_shell.h => bsps/shared/dev/clock/clockimpl.h | 2 +-
{c/src/lib/libbsp => bsps}/sparc/erc32/clock/ckinit.c | 2 +-
{c/src/lib/libbsp => bsps}/sparc/leon2/clock/ckinit.c | 2 +-
{c/src/lib/libbsp => bsps}/sparc/leon3/clock/ckinit.c | 2 +-
{c/src/lib/libbsp => bsps}/sparc64/shared/clock/ckinit.c | 2 +-
c/src/lib/libbsp/arm/atsam/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/beagle/clock.c | 2 +-
c/src/lib/libbsp/arm/csb336/Makefile.am | 2 +-
c/src/lib/libbsp/arm/csb337/Makefile.am | 2 +-
c/src/lib/libbsp/arm/edb7312/Makefile.am | 2 +-
c/src/lib/libbsp/arm/gdbarmsim/Makefile.am | 2 +-
c/src/lib/libbsp/arm/gumstix/Makefile.am | 2 +-
c/src/lib/libbsp/arm/lm3s69xx/Makefile.am | 2 +-
c/src/lib/libbsp/arm/lpc176x/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/lpc32xx/Makefile.am | 2 +-
c/src/lib/libbsp/arm/raspberrypi/Makefile.am | 2 +-
c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 2 +-
c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c | 4 ++--
c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c | 4 ++--
c/src/lib/libbsp/arm/smdk2410/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/stm32f4/Makefile.am | 2 +-
c/src/lib/libbsp/arm/tms570/Makefile.am | 2 +-
c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am | 2 +-
c/src/lib/libbsp/i386/pc386/Makefile.am | 4 ++--
c/src/lib/libbsp/lm32/lm32_evr/Makefile.am | 2 +-
c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c | 2 +-
c/src/lib/libbsp/m32c/m32cbsp/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/av5282/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/gen68340/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/gen68360/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/genmcf548x/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mcf52235/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mcf5225x/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mcf5235/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mcf5329/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mrm332/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mvme147/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mvme162/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mvme167/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/uC5282/Makefile.am | 2 +-
c/src/lib/libbsp/mips/csb350/Makefile.am | 2 +-
c/src/lib/libbsp/mips/hurricane/Makefile.am | 2 +-
c/src/lib/libbsp/mips/jmr3904/Makefile.am | 2 +-
c/src/lib/libbsp/mips/malta/Makefile.am | 4 ++--
c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 2 +-
c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 2 +-
c/src/lib/libbsp/moxie/moxiesim/Makefile.am | 2 +-
c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 2 +-
c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am | 2 +-
c/src/lib/libbsp/or1k/generic_or1k/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/haleakala/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/psim/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/qemuppc/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/ss555/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/t32mppc/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/virtex/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/virtex4/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/virtex5/Makefile.am | 4 ++--
c/src/lib/libbsp/riscv/riscv_generic/Makefile.am | 2 +-
c/src/lib/libbsp/sh/gensh1/Makefile.am | 4 ++--
c/src/lib/libbsp/sh/gensh2/Makefile.am | 2 +-
c/src/lib/libbsp/sh/gensh4/Makefile.am | 2 +-
c/src/lib/libbsp/sh/shsim/Makefile.am | 2 +-
c/src/lib/libbsp/sparc/erc32/Makefile.am | 2 +-
c/src/lib/libbsp/sparc/leon2/Makefile.am | 2 +-
c/src/lib/libbsp/sparc/leon3/Makefile.am | 2 +-
c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c | 4 ++--
c/src/lib/libbsp/sparc64/niagara/Makefile.am | 2 +-
c/src/lib/libbsp/sparc64/usiii/Makefile.am | 2 +-
c/src/lib/libbsp/v850/gdbv850sim/Makefile.am | 2 +-
142 files changed, 140 insertions(+), 140 deletions(-)
diff --git a/c/src/lib/libbsp/arm/atsam/clock/systick-freq.c b/bsps/arm/atsam/clock/systick-freq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/clock/systick-freq.c
rename to bsps/arm/atsam/clock/systick-freq.c
diff --git a/c/src/lib/libbsp/arm/csb336/clock/clockdrv.c b/bsps/arm/csb336/clock/clockdrv.c
similarity index 97%
rename from c/src/lib/libbsp/arm/csb336/clock/clockdrv.c
rename to bsps/arm/csb336/clock/clockdrv.c
index 576a827..ec56615 100644
--- a/c/src/lib/libbsp/arm/csb336/clock/clockdrv.c
+++ b/bsps/arm/csb336/clock/clockdrv.c
@@ -17,7 +17,7 @@
#include <mc9328mxl.h>
#include <rtems/bspIo.h> /* for printk */
-/* this is defined in ../../../shared/clockdrv_shell.h */
+/* this is defined in ../../../shared/dev/clock/clockimpl.h */
void Clock_isr(rtems_irq_hdl_param arg);
static void clock_isr_on(const rtems_irq_connect_data *unused);
static void clock_isr_off(const rtems_irq_connect_data *unused);
@@ -131,4 +131,4 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq)
/* Make sure to include this, and only at the end of the file */
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/csb337/clock/clock.c b/bsps/arm/csb337/clock/clock.c
similarity index 98%
rename from c/src/lib/libbsp/arm/csb337/clock/clock.c
rename to bsps/arm/csb337/clock/clock.c
index f231a04..5611144 100644
--- a/c/src/lib/libbsp/arm/csb337/clock/clock.c
+++ b/bsps/arm/csb337/clock/clock.c
@@ -110,4 +110,4 @@ static void Clock_driver_support_initialize_hardware(void)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c b/bsps/arm/edb7312/clock/clockdrv.c
similarity index 97%
rename from c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c
rename to bsps/arm/edb7312/clock/clockdrv.c
index 6c8c576..26839f3 100644
--- a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c
+++ b/bsps/arm/edb7312/clock/clockdrv.c
@@ -69,4 +69,4 @@ void Clock_isr(void * arg);
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/gumstix/clock/clock.c b/bsps/arm/gumstix/clock/clock.c
similarity index 98%
rename from c/src/lib/libbsp/arm/gumstix/clock/clock.c
rename to bsps/arm/gumstix/clock/clock.c
index d8e8afb..0c4e1f8 100644
--- a/c/src/lib/libbsp/arm/gumstix/clock/clock.c
+++ b/bsps/arm/gumstix/clock/clock.c
@@ -115,4 +115,4 @@ static void Clock_driver_support_initialize_hardware(void)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/raspberrypi/clock/clockdrv.c b/bsps/arm/raspberrypi/clock/clockdrv.c
similarity index 96%
rename from c/src/lib/libbsp/arm/raspberrypi/clock/clockdrv.c
rename to bsps/arm/raspberrypi/clock/clockdrv.c
index 43ce59e..2f6ec5b 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/clock/clockdrv.c
+++ b/bsps/arm/raspberrypi/clock/clockdrv.c
@@ -26,7 +26,7 @@
#include <bsp/raspberrypi.h>
#include <rtems/timecounter.h>
-/* This is defined in ../../../shared/clockdrv_shell.h */
+/* This is defined in ../../../shared/dev/clock/clockimpl.h */
void Clock_isr(rtems_irq_hdl_param arg);
static struct timecounter raspberrypi_tc;
@@ -111,4 +111,4 @@ static void raspberrypi_clock_cleanup(void)
#define CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR 1
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/rtl22xx/clock/clockdrv.c b/bsps/arm/rtl22xx/clock/clockdrv.c
similarity index 97%
rename from c/src/lib/libbsp/arm/rtl22xx/clock/clockdrv.c
rename to bsps/arm/rtl22xx/clock/clockdrv.c
index 3a0cf0a..84ab9c0 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/clock/clockdrv.c
+++ b/bsps/arm/rtl22xx/clock/clockdrv.c
@@ -77,7 +77,7 @@ rtems_irq_connect_data clock_isr_data = {
.isOn = clock_isr_is_on,
};
-/* use the /shared/clockdrv_shell.h code template */
+/* use the /shared/dev/clock/clockimpl.h code template */
/**
* Installs the clock ISR. You shouldn't need to change this.
@@ -173,5 +173,5 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq)
#define Clock_driver_timecounter_tick() lpc22xx_tc_tick()
/* Make sure to include this, and only at the end of the file */
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/shared/armv7m/clock/armv7m-clock-config.c b/bsps/arm/shared/clock/clock-armv7m.c
similarity index 97%
rename from c/src/lib/libbsp/arm/shared/armv7m/clock/armv7m-clock-config.c
rename to bsps/arm/shared/clock/clock-armv7m.c
index 1c17a92..39cd4ef 100644
--- a/c/src/lib/libbsp/arm/shared/armv7m/clock/armv7m-clock-config.c
+++ b/bsps/arm/shared/clock/clock-armv7m.c
@@ -20,7 +20,7 @@
#ifdef ARM_MULTILIB_ARCH_V7M
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
static void Clock_isr(void *arg);
typedef struct {
@@ -154,6 +154,6 @@ static void _ARMV7M_Systick_cleanup(void)
_ARMV7M_Systick_cleanup()
/* Include shared source clock driver code */
-#include "../../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
#endif /* ARM_MULTILIB_ARCH_V7M */
diff --git a/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c b/bsps/arm/shared/clock/clock-nxp-lpc.c
similarity index 96%
rename from c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c
rename to bsps/arm/shared/clock/clock-nxp-lpc.c
index b6a6dc9..c551f75 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c
+++ b/bsps/arm/shared/clock/clock-nxp-lpc.c
@@ -28,7 +28,7 @@
#ifdef ARM_MULTILIB_ARCH_V4
-/* This is defined in ../../../shared/clockdrv_shell.h */
+/* This is defined in ../../../shared/dev/clock/clockimpl.h */
void Clock_isr(rtems_irq_hdl_param arg);
static volatile lpc_timer *const lpc_clock =
@@ -131,6 +131,6 @@ static void lpc_clock_cleanup(void)
#define Clock_driver_support_shutdown_hardware() lpc_clock_cleanup()
/* Include shared source clock driver code */
-#include "../../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
#endif /* ARM_MULTILIB_ARCH_V4 */
diff --git a/c/src/lib/libbsp/arm/smdk2410/clock/clockdrv.c b/bsps/arm/smdk2410/clock/clockdrv.c
similarity index 98%
rename from c/src/lib/libbsp/arm/smdk2410/clock/clockdrv.c
rename to bsps/arm/smdk2410/clock/clockdrv.c
index 41d6190..0430826 100644
--- a/c/src/lib/libbsp/arm/smdk2410/clock/clockdrv.c
+++ b/bsps/arm/smdk2410/clock/clockdrv.c
@@ -120,4 +120,4 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
/* Make sure to include this, and only at the end of the file */
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/smdk2410/clock/support.c b/bsps/arm/smdk2410/clock/support.c
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/clock/support.c
rename to bsps/arm/smdk2410/clock/support.c
diff --git a/c/src/lib/libbsp/arm/tms570/clock/clock.c b/bsps/arm/tms570/clock/clock.c
similarity index 99%
rename from c/src/lib/libbsp/arm/tms570/clock/clock.c
rename to bsps/arm/tms570/clock/clock.c
index 091bfda..2c1a54b 100644
--- a/c/src/lib/libbsp/arm/tms570/clock/clock.c
+++ b/bsps/arm/tms570/clock/clock.c
@@ -187,4 +187,4 @@ static void tms570_clock_driver_support_shutdown_hardware( void )
void Clock_isr(void *arg); /* to supress warning */
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c b/bsps/i386/pc386/clock/ckinit.c
similarity index 99%
rename from c/src/lib/libbsp/i386/pc386/clock/ckinit.c
rename to bsps/i386/pc386/clock/ckinit.c
index 2a713a4..fce267b 100644
--- a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c
+++ b/bsps/i386/pc386/clock/ckinit.c
@@ -259,4 +259,4 @@ void Clock_driver_support_initialize_hardware(void)
assert(status == RTEMS_SUCCESSFUL); \
} while (0)
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/i386/pc386/clock/rtc.c b/bsps/i386/pc386/clock/rtc.c
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/clock/rtc.c
rename to bsps/i386/pc386/clock/rtc.c
diff --git a/c/src/lib/libbsp/i386/pc386/clock/todcfg.c b/bsps/i386/pc386/clock/todcfg.c
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/clock/todcfg.c
rename to bsps/i386/pc386/clock/todcfg.c
diff --git a/c/src/lib/libbsp/lm32/shared/clock/ckinit.c b/bsps/lm32/shared/clock/ckinit.c
similarity index 97%
rename from c/src/lib/libbsp/lm32/shared/clock/ckinit.c
rename to bsps/lm32/shared/clock/ckinit.c
index fd1c274..4d235e7 100644
--- a/c/src/lib/libbsp/lm32/shared/clock/ckinit.c
+++ b/bsps/lm32/shared/clock/ckinit.c
@@ -74,5 +74,5 @@ static void Clock_driver_support_initialize_hardware(void)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/lm32/shared/clock/clock.h b/bsps/lm32/shared/clock/clock.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/clock/clock.h
rename to bsps/lm32/shared/clock/clock.h
diff --git a/c/src/lib/libbsp/m68k/av5282/clock/clock.c b/bsps/m68k/av5282/clock/clock.c
similarity index 97%
rename from c/src/lib/libbsp/m68k/av5282/clock/clock.c
rename to bsps/m68k/av5282/clock/clock.c
index eb01e84..f6e42f2 100644
--- a/c/src/lib/libbsp/m68k/av5282/clock/clock.c
+++ b/bsps/m68k/av5282/clock/clock.c
@@ -58,4 +58,4 @@
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c b/bsps/m68k/gen68340/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
rename to bsps/m68k/gen68340/clock/ckinit.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c b/bsps/m68k/gen68360/clock/clock.c
similarity index 98%
rename from c/src/lib/libbsp/m68k/gen68360/clock/clock.c
rename to bsps/m68k/gen68360/clock/clock.c
index 56fd0e1..b95ca5d 100644
--- a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c
+++ b/bsps/m68k/gen68360/clock/clock.c
@@ -98,4 +98,4 @@ extern int m360_clock_rate;
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/clock/clock.c b/bsps/m68k/genmcf548x/clock/clock.c
similarity index 98%
rename from c/src/lib/libbsp/m68k/genmcf548x/clock/clock.c
rename to bsps/m68k/genmcf548x/clock/clock.c
index 0b3579e..68b7c5f 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/clock/clock.c
+++ b/bsps/m68k/genmcf548x/clock/clock.c
@@ -98,5 +98,5 @@
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c b/bsps/m68k/mcf52235/clock/clock.c
similarity index 97%
rename from c/src/lib/libbsp/m68k/mcf52235/clock/clock.c
rename to bsps/m68k/mcf52235/clock/clock.c
index f29a820..a879a77 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c
+++ b/bsps/m68k/mcf52235/clock/clock.c
@@ -103,4 +103,4 @@ static void Clock_driver_support_initialize_hardware(void)
#define Clock_driver_timecounter_tick() mcf52235_tc_tick()
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c b/bsps/m68k/mcf5225x/clock/clock.c
similarity index 97%
rename from c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c
rename to bsps/m68k/mcf5225x/clock/clock.c
index 88234f0..b01c37a 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c
+++ b/bsps/m68k/mcf5225x/clock/clock.c
@@ -103,4 +103,4 @@ static void Clock_driver_support_initialize_hardware(void)
#define Clock_driver_timecounter_tick() mcf5225x_tc_tick()
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/m68k/mcf5235/clock/clock.c b/bsps/m68k/mcf5235/clock/clock.c
similarity index 97%
rename from c/src/lib/libbsp/m68k/mcf5235/clock/clock.c
rename to bsps/m68k/mcf5235/clock/clock.c
index 9664fdd..db3a585 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/clock/clock.c
+++ b/bsps/m68k/mcf5235/clock/clock.c
@@ -58,4 +58,4 @@
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c b/bsps/m68k/mcf5329/clock/clock.c
similarity index 97%
rename from c/src/lib/libbsp/m68k/mcf5329/clock/clock.c
rename to bsps/m68k/mcf5329/clock/clock.c
index f924499..5638238 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c
+++ b/bsps/m68k/mcf5329/clock/clock.c
@@ -102,4 +102,4 @@ static void Clock_driver_support_initialize_hardware(void)
#define Clock_driver_timecounter_tick() mcf5329_tc_tick()
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c b/bsps/m68k/mrm332/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
rename to bsps/m68k/mrm332/clock/ckinit.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c b/bsps/m68k/mvme147/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
rename to bsps/m68k/mvme147/clock/ckinit.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c b/bsps/m68k/mvme162/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
rename to bsps/m68k/mvme162/clock/ckinit.c
diff --git a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c b/bsps/m68k/mvme167/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
rename to bsps/m68k/mvme167/clock/ckinit.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c b/bsps/m68k/uC5282/clock/clock.c
similarity index 99%
rename from c/src/lib/libbsp/m68k/uC5282/clock/clock.c
rename to bsps/m68k/uC5282/clock/clock.c
index 5ec0bc4..8fffdc0 100644
--- a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c
+++ b/bsps/m68k/uC5282/clock/clock.c
@@ -158,4 +158,4 @@ int bsp_cpu_load_percentage(void)
#define Clock_driver_timecounter_tick() uC5282_tc_tick()
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/mips/csb350/clock/clockdrv.c b/bsps/mips/csb350/clock/clockdrv.c
similarity index 98%
rename from c/src/lib/libbsp/mips/csb350/clock/clockdrv.c
rename to bsps/mips/csb350/clock/clockdrv.c
index 3534c66..e42261e 100644
--- a/c/src/lib/libbsp/mips/csb350/clock/clockdrv.c
+++ b/bsps/mips/csb350/clock/clockdrv.c
@@ -87,4 +87,4 @@ void au1x00_clock_init(void)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/mips/hurricane/clock/ckinit.c b/bsps/mips/hurricane/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/clock/ckinit.c
rename to bsps/mips/hurricane/clock/ckinit.c
diff --git a/c/src/lib/libbsp/mips/hurricane/clock/clock.S b/bsps/mips/hurricane/clock/clock.S
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/clock/clock.S
rename to bsps/mips/hurricane/clock/clock.S
diff --git a/c/src/lib/libbsp/mips/hurricane/clock/clock.h b/bsps/mips/hurricane/clock/clock.h
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/clock/clock.h
rename to bsps/mips/hurricane/clock/clock.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c b/bsps/mips/jmr3904/clock/clockdrv.c
similarity index 96%
rename from c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c
rename to bsps/mips/jmr3904/clock/clockdrv.c
index 8c3216d..e0539f1 100644
--- a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c
+++ b/bsps/mips/jmr3904/clock/clockdrv.c
@@ -47,4 +47,4 @@
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/mips/rbtx4925/clock/clockdrv.c b/bsps/mips/rbtx4925/clock/clockdrv.c
similarity index 99%
rename from c/src/lib/libbsp/mips/rbtx4925/clock/clockdrv.c
rename to bsps/mips/rbtx4925/clock/clockdrv.c
index b10edba..2a3121a 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/clock/clockdrv.c
+++ b/bsps/mips/rbtx4925/clock/clockdrv.c
@@ -117,4 +117,4 @@
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/mips/rbtx4938/clock/clockdrv.c b/bsps/mips/rbtx4938/clock/clockdrv.c
similarity index 98%
rename from c/src/lib/libbsp/mips/rbtx4938/clock/clockdrv.c
rename to bsps/mips/rbtx4938/clock/clockdrv.c
index 63f2302..616defc 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/clock/clockdrv.c
+++ b/bsps/mips/rbtx4938/clock/clockdrv.c
@@ -116,4 +116,4 @@ void new_brk_esr(void)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/mips/rbtx4938/clock/yamon_api.h b/bsps/mips/rbtx4938/clock/yamon_api.h
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4938/clock/yamon_api.h
rename to bsps/mips/rbtx4938/clock/yamon_api.h
diff --git a/c/src/lib/libbsp/mips/shared/clock/clockdrv.c b/bsps/mips/shared/clock/clockdrv.c
similarity index 96%
rename from c/src/lib/libbsp/mips/shared/clock/clockdrv.c
rename to bsps/mips/shared/clock/clockdrv.c
index c4dbdc1..658666c 100644
--- a/c/src/lib/libbsp/mips/shared/clock/clockdrv.c
+++ b/bsps/mips/shared/clock/clockdrv.c
@@ -46,4 +46,4 @@ static uint32_t mips_timer_rate = 0;
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/mips/shared/clock/mips_timer.S b/bsps/mips/shared/clock/mips_timer.S
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/clock/mips_timer.S
rename to bsps/mips/shared/clock/mips_timer.S
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/clock/clock.c b/bsps/nios2/nios2_iss/clock/clock.c
similarity index 96%
rename from c/src/lib/libbsp/nios2/nios2_iss/clock/clock.c
rename to bsps/nios2/nios2_iss/clock/clock.c
index 80d91fe..0ec0a71 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/clock/clock.c
+++ b/bsps/nios2/nios2_iss/clock/clock.c
@@ -51,5 +51,5 @@ static void Clock_driver_support_initialize_hardware(void)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c b/bsps/no_cpu/no_bsp/clock/ckinit.c
similarity index 97%
rename from c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
rename to bsps/no_cpu/no_bsp/clock/ckinit.c
index fbfe541..eb0867a 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
+++ b/bsps/no_cpu/no_bsp/clock/ckinit.c
@@ -1,7 +1,7 @@
/*
* This file provides a template for the clock device driver initialization.
*
- * If possible, please use the clockdrv_shell.h method for instantiating
+ * If possible, please use the dev/clock/clockimpl.h method for instantiating
* a clock driver.
*/
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/clock/clockdrv.c b/bsps/or1k/generic_or1k/clock/clockdrv.c
similarity index 98%
rename from c/src/lib/libbsp/or1k/generic_or1k/clock/clockdrv.c
rename to bsps/or1k/generic_or1k/clock/clockdrv.c
index 212737b..569421d 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/clock/clockdrv.c
+++ b/bsps/or1k/generic_or1k/clock/clockdrv.c
@@ -144,4 +144,4 @@ CPU_Counter_ticks _CPU_Counter_difference(
#define Clock_driver_support_shutdown_hardware() generic_or1k_clock_cleanup()
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c b/bsps/powerpc/mpc55xxevb/clock/clock-config.c
similarity index 99%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
rename to bsps/powerpc/mpc55xxevb/clock/clock-config.c
index c712d80..41320c8 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
+++ b/bsps/powerpc/mpc55xxevb/clock/clock-config.c
@@ -254,4 +254,4 @@ static void mpc55xx_clock_cleanup(void)
mpc55xx_clock_cleanup()
/* Include shared source clock driver code */
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/p_clock.c b/bsps/powerpc/mpc8260ads/clock/p_clock.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc8260ads/clock/p_clock.c
rename to bsps/powerpc/mpc8260ads/clock/p_clock.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/clock/clock-config.c b/bsps/powerpc/qoriq/clock/clock-config.c
similarity index 97%
rename from c/src/lib/libbsp/powerpc/qoriq/clock/clock-config.c
rename to bsps/powerpc/qoriq/clock/clock-config.c
index 82d8b8c..335b156 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/clock/clock-config.c
+++ b/bsps/powerpc/qoriq/clock/clock-config.c
@@ -28,7 +28,7 @@
#include <bsp/qoriq.h>
#include <bsp/irq.h>
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
static rtems_isr Clock_isr(void *arg);
static struct timecounter qoriq_clock_tc;
@@ -175,4 +175,4 @@ static void qoriq_clock_cleanup(void)
qoriq_clock_initialize()
/* Include shared source clock driver code */
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/bsps/powerpc/shared/dev/clock-ppc-dec.c b/bsps/powerpc/shared/clock/clock-ppc-dec.c
similarity index 100%
rename from bsps/powerpc/shared/dev/clock-ppc-dec.c
rename to bsps/powerpc/shared/clock/clock-ppc-dec.c
diff --git a/bsps/powerpc/shared/dev/clock-ppc403.c b/bsps/powerpc/shared/clock/clock-ppc403.c
similarity index 100%
rename from bsps/powerpc/shared/dev/clock-ppc403.c
rename to bsps/powerpc/shared/clock/clock-ppc403.c
diff --git a/c/src/lib/libbsp/powerpc/shared/clock/clock.c b/bsps/powerpc/shared/clock/clock.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/clock/clock.c
rename to bsps/powerpc/shared/clock/clock.c
diff --git a/c/src/lib/libbsp/powerpc/shared/clock/p_clock.c b/bsps/powerpc/shared/clock/p_clock.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/clock/p_clock.c
rename to bsps/powerpc/shared/clock/p_clock.c
diff --git a/bsps/powerpc/ss555/dev/clock.c b/bsps/powerpc/ss555/clock/clock.c
similarity index 100%
rename from bsps/powerpc/ss555/dev/clock.c
rename to bsps/powerpc/ss555/clock/clock.c
diff --git a/c/src/lib/libbsp/powerpc/ss555/clock/p_clock.c b/bsps/powerpc/ss555/clock/p_clock.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/ss555/clock/p_clock.c
rename to bsps/powerpc/ss555/clock/p_clock.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/clock/clock-config.c b/bsps/powerpc/t32mppc/clock/clock-config.c
similarity index 94%
rename from c/src/lib/libbsp/powerpc/t32mppc/clock/clock-config.c
rename to bsps/powerpc/t32mppc/clock/clock-config.c
index 7cdc37b..799de19 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/clock/clock-config.c
+++ b/bsps/powerpc/t32mppc/clock/clock-config.c
@@ -19,7 +19,7 @@
#include <bsp.h>
#include <bsp/irq.h>
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
static rtems_isr Clock_isr(void *arg);
static struct timecounter t32mppc_clock_tc;
@@ -61,4 +61,4 @@ static void t32mppc_clock_initialize(void)
t32mppc_clock_initialize()
/* Include shared source clock driver code */
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/clock/p_clock.c b/bsps/powerpc/tqm8xx/clock/p_clock.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/clock/p_clock.c
rename to bsps/powerpc/tqm8xx/clock/p_clock.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/clock/clockdrv.c b/bsps/riscv/riscv_generic/clock/clockdrv.c
similarity index 98%
rename from c/src/lib/libbsp/riscv/riscv_generic/clock/clockdrv.c
rename to bsps/riscv/riscv_generic/clock/clockdrv.c
index 974ada0..8ae50f9 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/clock/clockdrv.c
+++ b/bsps/riscv/riscv_generic/clock/clockdrv.c
@@ -128,4 +128,4 @@ CPU_Counter_ticks _CPU_Counter_difference(
#define Clock_driver_support_shutdown_hardware() riscv_generic_clock_cleanup()
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/sh/gensh1/clock/ckinit.c b/bsps/sh/gensh1/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/clock/ckinit.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/clock/delay.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/clock/ckinit.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/clock/ckinit.c
rename to 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
similarity index 97%
rename from c/src/lib/libbsp/shared/clock_driver_simidle.c
rename to bsps/shared/dev/clock/clock-simidle.c
index 1b1cb6e..def406a 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
similarity index 98%
rename from c/src/lib/libbsp/shared/clockdrv_shell.h
rename to bsps/shared/dev/clock/clockimpl.h
index ddc66b0..6eaa6c9 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/sparc/erc32/clock/ckinit.c b/bsps/sparc/erc32/clock/ckinit.c
similarity index 98%
rename from c/src/lib/libbsp/sparc/erc32/clock/ckinit.c
rename to bsps/sparc/erc32/clock/ckinit.c
index 38542c0..7f8c0f5 100644
--- a/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c
+++ b/bsps/sparc/erc32/clock/ckinit.c
@@ -126,6 +126,6 @@ static void erc32_counter_initialize( uint32_t frequency )
); \
} while (0)
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
SPARC_COUNTER_DEFINITION;
diff --git a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c b/bsps/sparc/leon2/clock/ckinit.c
similarity index 98%
rename from c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
rename to bsps/sparc/leon2/clock/ckinit.c
index 84577d4..a1dfc12 100644
--- a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
+++ b/bsps/sparc/leon2/clock/ckinit.c
@@ -99,6 +99,6 @@ extern int CLOCK_SPEED;
#define Clock_driver_timecounter_tick() leon2_tc_tick()
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
SPARC_COUNTER_DEFINITION;
diff --git a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c b/bsps/sparc/leon3/clock/ckinit.c
similarity index 99%
rename from c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
rename to bsps/sparc/leon3/clock/ckinit.c
index fd699a4..fd194ab 100644
--- a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
+++ b/bsps/sparc/leon3/clock/ckinit.c
@@ -275,6 +275,6 @@ static void leon3_clock_initialize(void)
#define Clock_driver_timecounter_tick() leon3_tc_do_tick()
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
#endif
diff --git a/c/src/lib/libbsp/sparc64/shared/clock/ckinit.c b/bsps/sparc64/shared/clock/ckinit.c
similarity index 98%
rename from c/src/lib/libbsp/sparc64/shared/clock/ckinit.c
rename to bsps/sparc64/shared/clock/ckinit.c
index c014a73..6a82806 100644
--- a/c/src/lib/libbsp/sparc64/shared/clock/ckinit.c
+++ b/bsps/sparc64/shared/clock/ckinit.c
@@ -118,5 +118,5 @@ static void Clock_driver_support_initialize_hardware(void)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index 52d809c..4472869 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -118,8 +118,8 @@ librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += console/debug-console.c
# Clock
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
-librtemsbsp_a_SOURCES += clock/systick-freq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/atsam/clock/systick-freq.c
# Timer
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
diff --git a/c/src/lib/libbsp/arm/beagle/clock.c b/c/src/lib/libbsp/arm/beagle/clock.c
index ec35f15..d8b2062 100644
--- a/c/src/lib/libbsp/arm/beagle/clock.c
+++ b/c/src/lib/libbsp/arm/beagle/clock.c
@@ -320,4 +320,4 @@ static void beagle_clock_cleanup(void)
#define Clock_driver_support_shutdown_hardware() beagle_clock_cleanup()
/* Include shared source clock driver code */
-#include "../../shared/clockdrv_shell.h"
+#include "../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 9c4ae60..04deee4 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/csb336/clock/clockdrv.c
librtemsbsp_a_SOURCES += timer/timer.c
# console
librtemsbsp_a_SOURCES += console/uart.c
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index fcf4774..23a8797 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -37,7 +37,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
librtemsbsp_a_SOURCES += startup/pmc.c
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/csb337/clock/clock.c
librtemsbsp_a_SOURCES += timer/timer.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 4aafdd2..612afe1 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
# clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/edb7312/clock/clockdrv.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index 428083e..83bbda0 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
librtemsbsp_a_SOURCES += ../../shared/console-polled.c
librtemsbsp_a_SOURCES += console/console-io.c
# clock
-librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
# timer
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
# start hooks
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 8f9b9c8..ec5d8c9 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c
librtemsbsp_a_SOURCES += startup/memmap.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/gumstix/clock/clock.c
librtemsbsp_a_SOURCES += timer/timer.c
#console
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index d2f4d69..31ee769 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -60,7 +60,7 @@ librtemsbsp_a_SOURCES += console/console-config.c
librtemsbsp_a_SOURCES += console/uart.c
# Clock
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
# Timer
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 8831327..49e6620 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -64,8 +64,8 @@ librtemsbsp_a_SOURCES += ../../shared/console-termios.c
librtemsbsp_a_SOURCES += console/console-config.c
# Clock
-librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
# RTC
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index abef3b3..ee2b7b4 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -79,8 +79,8 @@ librtemsbsp_a_SOURCES += console/uart-probe-2.c
librtemsbsp_a_SOURCES += console/uart-probe-3.c
# Clock
-librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
# RTC
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index 6d9e37b..743b072 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -65,7 +65,7 @@ librtemsbsp_a_SOURCES += console/console-config.c
librtemsbsp_a_SOURCES += console/hsu.c
# Clock
-librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
# RTC
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 38d9d66..58cfe1f 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -82,7 +82,7 @@ librtemsbsp_a_SOURCES += misc/mailbox.c
librtemsbsp_a_SOURCES += misc/vc.c
# clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/raspberrypi/clock/clockdrv.c
# Timer
librtemsbsp_a_SOURCES += misc/timer.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index ee4fdf0..da8ef3a 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/rtl22xx/clock/clockdrv.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
diff --git a/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c b/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c
index 09516b4..f9b2d08 100644
--- a/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c
+++ b/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c
@@ -25,7 +25,7 @@
static struct timecounter a9mpcore_tc;
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
void Clock_isr(rtems_irq_hdl_param arg);
__attribute__ ((weak)) uint32_t a9mpcore_clock_periphclk(void)
@@ -209,4 +209,4 @@ static void a9mpcore_clock_cleanup(void)
a9mpcore_clock_cleanup()
/* Include shared source clock driver code */
-#include "../../shared/clockdrv_shell.h"
+#include "../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c b/c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c
index 21ba3f1..8a992d4 100644
--- a/c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c
+++ b/c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c
@@ -42,7 +42,7 @@ typedef struct {
static arm_gt_clock_context arm_gt_clock_instance;
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
void Clock_isr(rtems_irq_hdl_param arg);
static inline uint64_t arm_gt_clock_get_compare_value(void)
@@ -199,4 +199,4 @@ RTEMS_SYSINIT_ITEM(
arm_gt_clock_handler_install()
/* Include shared source clock driver code */
-#include "../../shared/clockdrv_shell.h"
+#include "../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 326cf4c..a9c4378 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -28,8 +28,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += clock/clockdrv.c
-librtemsbsp_a_SOURCES += clock/support.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/smdk2410/clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/smdk2410/clock/support.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index 6201008..640cb59 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -64,7 +64,7 @@ librtemsbsp_a_SOURCES += i2c/i2c.c
librtemsbsp_a_SOURCES += i2c/i2c-config.c
# Clock
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
# Timer
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 95ebb22..3857fc4 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -67,7 +67,7 @@ librtemsbsp_a_SOURCES += console/printk-support.c
librtemsbsp_a_SOURCES += console/tms570-sci.c
# Clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/tms570/clock/clock.c
# RTC
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index 56a0414..b90849e 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -42,7 +42,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
# clock
-librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
# Timer
librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 58fcf44..37a7203 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -48,8 +48,8 @@ project_lib_LIBRARIES = librtemsbsp.a
librtemsbsp_a_SOURCES =
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
-librtemsbsp_a_SOURCES += clock/todcfg.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/i386/pc386/clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/i386/pc386/clock/todcfg.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
if RTEMS_VGA
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index f0b47d8..20102da 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../shared/startup/bspreset.c
# clock
-librtemsbsp_a_SOURCES += ../shared/clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/lm32/shared/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += ../shared/console/console.c
librtemsbsp_a_SOURCES += ../shared/console/uart.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c b/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c
index bc9821d..c138309 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c
+++ b/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c
@@ -49,4 +49,4 @@ static void Clock_driver_support_initialize_hardware(void)
#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index 8861518..1f1f714 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -23,7 +23,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += startup/crtn.S
-librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
librtemsbsp_a_SOURCES += ../../shared/console-polled.c
librtemsbsp_a_SOURCES += console/console-io.c
librtemsbsp_a_SOURCES += console/syscalls.S
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index 8acc204..c96fe93 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
# clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/av5282/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
# timer
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index 5c72278..c3df136 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += startup/dumpanic.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/gen68340/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += console/m340uart.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index 7a23649..e00a213 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/gen68360/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index e830005..a20f56a 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
# clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/genmcf548x/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
# timer
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index 85dd4a4..98b8993 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
# clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf52235/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
# debugio
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index d069c37..99b996c 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -23,7 +23,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5225x/clock/clock.c
librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += console/debugio.c
librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index 425178f..c4caf60 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += startup/copyvectors.c
# clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5235/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
# timer
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index 56a0a54..5a82f88 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
# clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5329/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
# timer
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 6bf5360..462628e 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mrm332/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += console/sci.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 29091a5..d8397be 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme147/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index bd35f1f..d699428 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# clock
-librtemsbsp_a_SOURCES += ../mvme147/clock/ckinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += ../mvme147/console/console.c
librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 61d2842..8af4d1d 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme162/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += console/console.c
# timer
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index 72f88a5..1632a35 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme167/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += console/console.c
# timer
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 755fe69..237e209 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
# clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/uC5282/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
# timer
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index b32949b..58d0ada 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
# clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/csb350/clock/clockdrv.c
# console
librtemsbsp_a_SOURCES += console/console-io.c
librtemsbsp_a_SOURCES += ../../shared/console-polled.c
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index 4c1883d..f789d08 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../shared/startup/idttlb.S
librtemsbsp_a_SOURCES += ../shared/irq/exception.S
librtemsbsp_a_SOURCES += startup/usc.S
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/hurricane/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += console/console.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 15e3bd0..67b357e 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -25,7 +25,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
# clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/jmr3904/clock/clockdrv.c
# console
librtemsbsp_a_SOURCES += ../../shared/console-polled.c
librtemsbsp_a_SOURCES += console/console-io.c
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index bb0b991..c875d4b 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -34,8 +34,8 @@ librtemsbsp_a_SOURCES += startup/inittlb.c
librtemsbsp_a_SOURCES += ../shared/startup/idttlb.S
# clock
-librtemsbsp_a_SOURCES += ../shared/clock/clockdrv.c
-librtemsbsp_a_SOURCES += ../shared/clock/mips_timer.S
+librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/shared/clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/shared/clock/mips_timer.S
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index 46e5158..fbf3027 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../shared/startup/idttlb.S
librtemsbsp_a_SOURCES += ../shared/startup/idtmem.S
librtemsbsp_a_SOURCES += ../shared/irq/exception.S
# clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4925/clock/clockdrv.c
# console
librtemsbsp_a_SOURCES += console/console-io.c
# liblnk
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index 00bb39d..6061fe1 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -32,7 +32,7 @@ librtemsbsp_a_SOURCES += ../shared/startup/idttlb.S
librtemsbsp_a_SOURCES += ../shared/startup/idtmem.S
librtemsbsp_a_SOURCES += ../shared/irq/exception.S
# clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4938/clock/clockdrv.c
# console
librtemsbsp_a_SOURCES += console/console-io.c
# liblnk
diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index 4576fdb..cf68a64 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.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
librtemsbsp_a_SOURCES += console/console-io.c
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index 233830a..c05ddd1 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += startup/setvec.c
# clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/nios2/nios2_iss/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += ../../shared/console-polled.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
index 4377484..6ce91f2 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -21,7 +21,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += startup/setvec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/no_cpu/no_bsp/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += console/console.c
# timer
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index df69ff7..4f1fbe0 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -58,7 +58,7 @@ librtemsbsp_a_SOURCES += console/uart.c
librtemsbsp_a_SOURCES += timer/timer.c
# clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/or1k/generic_or1k/clock/clockdrv.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index 2101af1..bc57470 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -55,7 +55,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += startup/bspclean.c
#pclock
-librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
#console
librtemsbsp_a_SOURCES += ../shared/console/uart.c
@@ -101,7 +101,7 @@ librtemsbsp_a_SOURCES += tod/todcfg.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 6713285..d17a851 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -54,7 +54,7 @@ librtemsbsp_a_SOURCES += bestcomm/tasksetup_pci_rx.c
librtemsbsp_a_SOURCES += bestcomm/tasksetup_pci_tx.c
# clock
# clock
-librtemsbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
# i2c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 663549a..c8a37b7 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -44,7 +44,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-uboot-board-inf
librtemsbsp_a_SOURCES += ../shared/uboot_getenv.c
# clock
-librtemsbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
# irq
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index d32a346..c37a6e6 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -42,7 +42,7 @@ librtemsbsp_a_SOURCES += network/network.c
endif
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc403.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc403.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index c5c507a..32f74ce 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -51,7 +51,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
librtemsbsp_a_SOURCES += ../shared/tod/todcfg.c
# pclock
-librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c
@@ -87,7 +87,7 @@ endif
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 6a06edf..551d972 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -69,7 +69,7 @@ librtemsbsp_a_SOURCES += startup/start-flash.S
librtemsbsp_a_SOURCES += startup/start-watchdog.c
# clock
-librtemsbsp_a_SOURCES += clock/clock-config.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/mpc55xxevb/clock/clock-config.c
# console
librtemsbsp_a_SOURCES += console/console-config.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 2ca4171..785bf3d 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -22,7 +22,7 @@ project_lib_LIBRARIES = librtemsbsp.a
librtemsbsp_a_SOURCES =
# clock
-librtemsbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 04f0f83..9ef0095 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -49,7 +49,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
librtemsbsp_a_SOURCES += tod/todcfg.c
# pclock
-librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += ../shared/console/uart.c
@@ -85,7 +85,7 @@ librtemsbsp_a_SOURCES += network/tsec.c
endif
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 2876afb..d947fbc 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c
librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
# pclock
-librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += ../shared/console/uart.c
@@ -77,7 +77,7 @@ dist_project_lib_DATA += ../shared/startup/linkcmds.share
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index db19b05..6253231 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# pclock
-librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += ../../shared/console-polled.c
# debugio
@@ -61,7 +61,7 @@ endif
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index c17c54a..ef4dc0d 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += startup/cmain.c
librtemsbsp_a_SOURCES += startup/bspstart.c
# pclock
-librtemsbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
# console
librtemsbsp_a_SOURCES += ../../shared/console-polled.c
librtemsbsp_a_SOURCES += console/console-io.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 0ac8c1d..e0c1ce8 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -55,7 +55,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c
librtemsbsp_a_SOURCES += startup/bsprestart.c
# Clock
-librtemsbsp_a_SOURCES += clock/clock-config.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/qoriq/clock/clock-config.c
# Timer
librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index b8911c7..8fbbd11 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -17,7 +17,7 @@ project_lib_LIBRARIES = librtemsbsp.a
librtemsbsp_a_SOURCES =
# pclock
-librtemsbsp_a_SOURCES += clock/p_clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/ss555/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
# startup
@@ -35,7 +35,7 @@ librtemsbsp_a_SOURCES += startup/tm27supp.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_print.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/clock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/clock/clock.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/console-generic.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq_asm.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 6ae8ef3..3815ecc 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -37,7 +37,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += startup/bspreset.c
# Clock
-librtemsbsp_a_SOURCES += clock/clock-config.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/t32mppc/clock/clock-config.c
# Timer
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 79d29d3..0f0af60 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -28,8 +28,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
librtemsbsp_a_SOURCES += irq/irq.c
# clock
-librtemsbsp_a_SOURCES += ../shared/clock/clock.c
-librtemsbsp_a_SOURCES += clock/p_clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/tqm8xx/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += console/console.c
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index cf97061..a999d0f 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -48,7 +48,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
librtemsbsp_a_SOURCES += irq/irq_init.c
# clock
-librtemsbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
if HAS_NETWORKING
librtemsbsp_a_SOURCES += =
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index f509486..c987148 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -41,7 +41,7 @@ librtemsbsp_a_SOURCES += irq/irq_init.c
librtemsbsp_a_SOURCES += mmu/mmu.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc403.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc403.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 52a1e6c..b16b466 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
librtemsbsp_a_SOURCES += start/start.S
# clock & timer
-librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += startup/dummy_console.c
@@ -43,7 +43,7 @@ librtemsbsp_a_SOURCES += irq/irq_init.c
librtemsbsp_a_SOURCES += mmu/mmu.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc-dec.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index d884bd8..356b560 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
@@ -42,7 +42,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
# clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/riscv/riscv_generic/clock/clockdrv.c
# Timer
librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index dba3efa..d258a65 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 76fc51d..205e13c 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 7bbe0da..94c0601 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 0c834a7..4d39908 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
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 887ebea..89c7cd6 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -48,7 +48,7 @@ librtemsbsp_a_SOURCES += console/erc32_console.c
# debugio
librtemsbsp_a_SOURCES += console/debugputs.c
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/erc32/clock/ckinit.c
# timer
librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 1092015..4df4cd9 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -45,7 +45,7 @@ librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += console/debugputs.c
# clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/leon2/clock/ckinit.c
# IRQ
librtemsbsp_a_SOURCES += ../shared/irq/genirq.c
librtemsbsp_a_SOURCES += ../shared/irq/irq-shared.c
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 173457b..6432fcd 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -64,7 +64,7 @@ librtemsbsp_a_SOURCES += ../shared/timer/gptimer.c
librtemsbsp_a_SOURCES += ../shared/timer/tlib.c
librtemsbsp_a_SOURCES += ../shared/timer/tlib_ckinit.c
# non-Driver Manager Clock Implementation
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/leon3/clock/ckinit.c
# console
librtemsbsp_a_SOURCES += ../../shared/console-termios.c
diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
index af4d34b..3f56d72 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
+++ b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
@@ -401,7 +401,7 @@ static const struct ops ops_irqamp = {
};
#endif
-/** Interface to the Clock Driver Shell (clockdrv_shell.h) **/
+/** Interface to the Clock Driver Shell (dev/clock/clockimpl.h) **/
#define Clock_driver_support_find_timer() \
do { \
rtems_device_driver ret; \
@@ -447,7 +447,7 @@ static const struct ops ops_irqamp = {
} \
} while (0)
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
#endif /* RTEMS_DRVMGR_STARTUP */
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index 011fa14..7ff741f 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -35,7 +35,7 @@ librtemsbsp_a_SOURCES += ../shared/helenos/boot/sparc64/loader/ofwasm.S
librtemsbsp_a_SOURCES += start/bspinit.S
librtemsbsp_a_SOURCES += ../shared/asm/asm.S
-librtemsbsp_a_SOURCES += ../shared/clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc64/shared/clock/ckinit.c
librtemsbsp_a_SOURCES += ../shared/console/conscfg.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 1572e43..1e7c503 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -46,7 +46,7 @@ librtemsbsp_a_SOURCES += ../shared/helenos/kernel/sparc64/src/cache.S
librtemsbsp_a_SOURCES += ../shared/helenos/kernel/sparc64/src/sun4u/takemmu.S
librtemsbsp_a_SOURCES += ../shared/start/trap_table.S
-librtemsbsp_a_SOURCES += ../shared/clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc64/shared/clock/ckinit.c
librtemsbsp_a_SOURCES += ../shared/console/conscfg.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index cc73de0..8efdb42 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c
librtemsbsp_a_SOURCES += ../shared/crt1.c
librtemsbsp_a_SOURCES += startup/trap.S
-librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
librtemsbsp_a_SOURCES += ../../shared/console-polled.c
librtemsbsp_a_SOURCES += console/console-io.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
More information about the vc
mailing list