86 files changed, 49 insertions, 49 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/timer/timer.c b/bsps/arm/csb336/btimer/btimer.c
index 66ff4a0bf4..66ff4a0bf4 100644
--- a/c/src/lib/libbsp/arm/csb336/timer/timer.c
+++ b/bsps/arm/csb336/btimer/btimer.c
diff --git a/c/src/lib/libbsp/arm/csb337/timer/timer.c b/bsps/arm/csb337/btimer/btimer.c
index c65dd8096a..c65dd8096a 100644
--- a/c/src/lib/libbsp/arm/csb337/timer/timer.c
+++ b/bsps/arm/csb337/btimer/btimer.c
diff --git a/c/src/lib/libbsp/arm/edb7312/timer/timer.c b/bsps/arm/edb7312/btimer/btimer.c
index b795122ff3..b795122ff3 100644
--- a/c/src/lib/libbsp/arm/edb7312/timer/timer.c
+++ b/bsps/arm/edb7312/btimer/btimer.c
diff --git a/c/src/lib/libbsp/arm/gumstix/timer/timer.c b/bsps/arm/gumstix/btimer/btimer.c
index 7eb3d5b811..7eb3d5b811 100644
--- a/c/src/lib/libbsp/arm/gumstix/timer/timer.c
+++ b/bsps/arm/gumstix/btimer/btimer.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/timer/timer.c b/bsps/arm/lpc176x/btimer/btimer.c
index 36c720b4fb..36c720b4fb 100644
--- a/c/src/lib/libbsp/arm/lpc176x/timer/timer.c
+++ b/bsps/arm/lpc176x/btimer/btimer.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/timer/timer.c b/bsps/arm/rtl22xx/btimer/btimer.c
index ad73aeda3c..ad73aeda3c 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/timer/timer.c
+++ b/bsps/arm/rtl22xx/btimer/btimer.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/timer/lpc_timer.h b/bsps/arm/rtl22xx/btimer/lpc_timer.h
index 364812ddb8..364812ddb8 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/timer/lpc_timer.h
+++ b/bsps/arm/rtl22xx/btimer/lpc_timer.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/timer/timer.c b/bsps/arm/smdk2410/btimer/btimer.c
index 2bc599df75..2bc599df75 100644
--- a/c/src/lib/libbsp/arm/smdk2410/timer/timer.c
+++ b/bsps/arm/smdk2410/btimer/btimer.c
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/timer/timer.c b/bsps/epiphany/epiphany_sim/btimer/btimer.c
index 5df9448e01..5df9448e01 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/timer/timer.c
+++ b/bsps/epiphany/epiphany_sim/btimer/btimer.c
diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/bsps/i386/pc386/btimer/btimer.c
index 16d3d66176..16d3d66176 100644
--- a/c/src/lib/libbsp/i386/pc386/timer/timer.c
+++ b/bsps/i386/pc386/btimer/btimer.c
diff --git a/c/src/lib/libbsp/i386/pc386/timer/timerisr.S b/bsps/i386/pc386/btimer/timerisr.S
index da2a07845a..da2a07845a 100644
--- a/c/src/lib/libbsp/i386/pc386/timer/timerisr.S
+++ b/bsps/i386/pc386/btimer/timerisr.S
diff --git a/c/src/lib/libbsp/lm32/shared/timer/timer.c b/bsps/lm32/shared/btimer/btimer.c
index e1980a7077..e1980a7077 100644
--- a/c/src/lib/libbsp/lm32/shared/timer/timer.c
+++ b/bsps/lm32/shared/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c b/bsps/m32c/m32cbsp/btimer/btimer.c
index a27d9ffb1b..a27d9ffb1b 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c
+++ b/bsps/m32c/m32cbsp/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/av5282/timer/timer.c b/bsps/m68k/av5282/btimer/btimer.c
index 8a8323e547..8a8323e547 100644
--- a/c/src/lib/libbsp/m68k/av5282/timer/timer.c
+++ b/bsps/m68k/av5282/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/bsps/m68k/gen68340/btimer/btimer.c
index 23cddd95b0..23cddd95b0 100644
--- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
+++ b/bsps/m68k/gen68340/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c b/bsps/m68k/gen68360/btimer/btimer.c
index 40a3e0a4c1..40a3e0a4c1 100644
--- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
+++ b/bsps/m68k/gen68360/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c b/bsps/m68k/genmcf548x/btimer/btimer.c
index acac6f8f9b..acac6f8f9b 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
+++ b/bsps/m68k/genmcf548x/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c b/bsps/m68k/mcf52235/btimer/btimer.c
index f9122542c2..f9122542c2 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
+++ b/bsps/m68k/mcf52235/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c b/bsps/m68k/mcf5225x/btimer/btimer.c
index ac0ca6d7d0..ac0ca6d7d0 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c
+++ b/bsps/m68k/mcf5225x/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c b/bsps/m68k/mcf5235/btimer/btimer.c
index 6aae8e99e6..6aae8e99e6 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c
+++ b/bsps/m68k/mcf5235/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c b/bsps/m68k/mcf5329/btimer/btimer.c
index 0f762c0a6a..0f762c0a6a 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
+++ b/bsps/m68k/mcf5329/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c b/bsps/m68k/mrm332/btimer/btimer.c
index 8c14f8fe58..8c14f8fe58 100644
--- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
+++ b/bsps/m68k/mrm332/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c b/bsps/m68k/mvme147/btimer/btimer.c
index 9d48fa7075..9d48fa7075 100644
--- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
+++ b/bsps/m68k/mvme147/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.S b/bsps/m68k/mvme147/btimer/timerisr.S
index 418cf64108..418cf64108 100644
--- a/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.S
+++ b/bsps/m68k/mvme147/btimer/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c b/bsps/m68k/mvme162/btimer/btimer.c
index c7dce0475d..c7dce0475d 100644
--- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
+++ b/bsps/m68k/mvme162/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timerisr.S b/bsps/m68k/mvme162/btimer/timerisr.S
index c433d91c59..c433d91c59 100644
--- a/c/src/lib/libbsp/m68k/mvme162/timer/timerisr.S
+++ b/bsps/m68k/mvme162/btimer/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c b/bsps/m68k/mvme167/btimer/btimer.c
index ed2ce26e51..ed2ce26e51 100644
--- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
+++ b/bsps/m68k/mvme167/btimer/btimer.c
diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S b/bsps/m68k/mvme167/btimer/timerisr.S
index d96f0996a5..d96f0996a5 100644
--- a/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S
+++ b/bsps/m68k/mvme167/btimer/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c b/bsps/m68k/uC5282/btimer/btimer.c
index e01b9c8269..e01b9c8269 100644
--- a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c
+++ b/bsps/m68k/uC5282/btimer/btimer.c
diff --git a/c/src/lib/libbsp/mips/csb350/timer/timer.c b/bsps/mips/csb350/btimer/btimer.c
index 30dbfe836b..30dbfe836b 100644
--- a/c/src/lib/libbsp/mips/csb350/timer/timer.c
+++ b/bsps/mips/csb350/btimer/btimer.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c b/bsps/mips/jmr3904/btimer/btimer.c
index ca97cd3a0b..ca97cd3a0b 100644
--- a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c
+++ b/bsps/mips/jmr3904/btimer/btimer.c
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c b/bsps/nios2/nios2_iss/btimer/btimer.c
index fbb20d892b..fbb20d892b 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
+++ b/bsps/nios2/nios2_iss/btimer/btimer.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c b/bsps/no_cpu/no_bsp/btimer/btimer.c
index e9b59dc756..e9b59dc756 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c
+++ b/bsps/no_cpu/no_bsp/btimer/btimer.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c b/bsps/no_cpu/no_bsp/btimer/timerisr.c
index 5ca7152a54..5ca7152a54 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c
+++ b/bsps/no_cpu/no_bsp/btimer/timerisr.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/timer/timer.c b/bsps/or1k/generic_or1k/btimer/btimer.c
index 872f1af7be..872f1af7be 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/timer/timer.c
+++ b/bsps/or1k/generic_or1k/btimer/btimer.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/timer/timer.c b/bsps/powerpc/qoriq/btimer/btimer.c
index e8927c1194..e8927c1194 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/timer/timer.c
+++ b/bsps/powerpc/qoriq/btimer/btimer.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c b/bsps/powerpc/tqm8xx/btimer/btimer.c
index 06c43c56be..06c43c56be 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c
+++ b/bsps/powerpc/tqm8xx/btimer/btimer.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/timer/timer.c b/bsps/riscv/riscv_generic/btimer/btimer.c
index 4dd3193685..4dd3193685 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/timer/timer.c
+++ b/bsps/riscv/riscv_generic/btimer/btimer.c
diff --git a/c/src/lib/libbsp/sh/gensh1/timer/timer.c b/bsps/sh/gensh1/btimer/btimer.c
index 94a834cb1e..94a834cb1e 100644
--- a/c/src/lib/libbsp/sh/gensh1/timer/timer.c
+++ b/bsps/sh/gensh1/btimer/btimer.c
diff --git a/c/src/lib/libbsp/sh/gensh2/timer/timer.c b/bsps/sh/gensh2/btimer/btimer.c
index 152c99b1aa..152c99b1aa 100644
--- a/c/src/lib/libbsp/sh/gensh2/timer/timer.c
+++ b/bsps/sh/gensh2/btimer/btimer.c
diff --git a/c/src/lib/libbsp/sh/gensh4/timer/timer.c b/bsps/sh/gensh4/btimer/btimer.c
index ef462c780c..ef462c780c 100644
--- a/c/src/lib/libbsp/sh/gensh4/timer/timer.c
+++ b/bsps/sh/gensh4/btimer/btimer.c
diff --git a/c/src/lib/libbsp/sparc/erc32/timer/timer.c b/bsps/sparc/erc32/btimer/btimer.c
index 05728f8acc..05728f8acc 100644
--- a/c/src/lib/libbsp/sparc/erc32/timer/timer.c
+++ b/bsps/sparc/erc32/btimer/btimer.c
diff --git a/c/src/lib/libbsp/sparc/leon2/timer/timer.c b/bsps/sparc/leon2/btimer/btimer.c
index de115c965a..de115c965a 100644
--- a/c/src/lib/libbsp/sparc/leon2/timer/timer.c
+++ b/bsps/sparc/leon2/btimer/btimer.c
diff --git a/c/src/lib/libbsp/sparc/leon3/timer/timer.c b/bsps/sparc/leon3/btimer/btimer.c
index 40bdeb87bb..40bdeb87bb 100644
--- a/c/src/lib/libbsp/sparc/leon3/timer/timer.c
+++ b/bsps/sparc/leon3/btimer/btimer.c
diff --git a/c/src/lib/libbsp/sparc/leon3/timer/watchdog.c b/bsps/sparc/leon3/btimer/watchdog.c
index 5ce8e32354..5ce8e32354 100644
--- a/c/src/lib/libbsp/sparc/leon3/timer/watchdog.c
+++ b/bsps/sparc/leon3/btimer/watchdog.c
diff --git a/c/src/lib/libbsp/sparc/shared/timer/gptimer.c b/bsps/sparc/shared/btimer/gptimer.c
index 08e498178e..08e498178e 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/gptimer.c
+++ b/bsps/sparc/shared/btimer/gptimer.c
diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib.c b/bsps/sparc/shared/btimer/tlib.c
index a0525d072d..a0525d072d 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/tlib.c
+++ b/bsps/sparc/shared/btimer/tlib.c
diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c b/bsps/sparc/shared/btimer/tlib_ckinit.c
index 3f56d725d9..3f56d725d9 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
+++ b/bsps/sparc/shared/btimer/tlib_ckinit.c
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 58bab61c7f..8702c2cbb6 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -28,7 +28,7 @@ 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 +=../../../../../../bsps/arm/csb336/clock/clockdrv.c
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb336/btimer/btimer.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb336/console/uart.c
 # IRQ
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index c837aef45a..2d9394965c 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -38,7 +38,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/start/pmc.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/csb337/clock/clock.c
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/btimer/btimer.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/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index ce0e11324a..eb15e50200 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/console/uart.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/btimer/btimer.c
 
 # irq
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 4f36cded13..6eac30b7c9 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/start/memmap.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/gumstix/clock/clock.c
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/btimer/btimer.c
 
 #console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 6597630f80..1437b12ea3 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -84,7 +84,7 @@ librtemsbsp_a_SOURCES += pwmout/pwmout.c
 librtemsbsp_a_SOURCES += adc/adc.c
 
 # Timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/btimer/btimer.c
 
 # Benchmark Timer
 librtemsbsp_a_SOURCES += benchmark_timer/benchmark_timer.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index aff940c6ab..7a8ff9e58e 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 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 += ../../../../../../bsps/arm/rtl22xx/btimer/btimer.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/rtl22xx/clock/clockdrv.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index dcfae9b564..6fe9190c4b 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 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 += ../../../../../../bsps/arm/smdk2410/btimer/btimer.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/smdk2410/clock/clockdrv.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/smdk2410/clock/support.c
 # console
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index 634d7ac546..271dc7f089 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -45,7 +45,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 
 # Timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/epiphany/epiphany_sim/btimer/btimer.c
 
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 094697ed57..2e9441e5bc 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -122,8 +122,8 @@ librtemsbsp_a_SOURCES += ../shared/irq/irq_asm.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += timer/timerisr.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/btimer/btimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/btimer/timerisr.S
 
 if HAS_IDE
 # ide
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index 0ea3b97df1..70950b8e0b 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/lm32/shared/clock/ckinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/console/uart.c
 # timer
-librtemsbsp_a_SOURCES += ../shared/timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/btimer/btimer.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index ac4a6c3836..1ab878b278 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/console/console-io.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/console/syscalls.S
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/btimer/btimer.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index 21cd09cd05..91f578f08a 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/av5282/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/av5282/console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/av5282/btimer/btimer.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index 4ed9b832b4..632cbca479 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68340/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68340/console/m340uart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68340/btimer/btimer.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index 7b27745ac6..d78babc776 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -35,7 +35,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/gen68360/clock/clock.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68360/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68360/btimer/btimer.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 01d369d5ef..a031241dc9 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -35,7 +35,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/genmcf548x/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/btimer/btimer.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index 9773a7d9f6..dee7622e3c 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -35,7 +35,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf52235/console/console.c
 # debugio
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf52235/console/debugio.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf52235/btimer/btimer.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf5223x.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index 003c91780c..792af31c3a 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5225x/clock/clock.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5225x/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5225x/console/debugio.c
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5225x/btimer/btimer.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf5225x.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index a243dbe0fb..e6b30e5470 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -35,7 +35,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5235/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5235/console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5235/btimer/btimer.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index 2e5d6100bf..7dd2265c7f 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5329/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5329/console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5329/btimer/btimer.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 73aa3bc3be..c8bc78929e 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mrm332/console/sci.c
 # spurious
 librtemsbsp_a_SOURCES += spurious/spinit.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mrm332/btimer/btimer.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 336ebd9f72..527cd535db 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -33,8 +33,8 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme147/clock/ckinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += timer/timerisr.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147/btimer/btimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147/btimer/timerisr.S
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index f94d3557c2..3847969efc 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -33,8 +33,8 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme162/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += timer/timerisr.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/btimer/btimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/btimer/timerisr.S
 # tod
 librtemsbsp_a_SOURCES += tod/tod.c
 
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index 7cca60608f..665b65fcea 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -31,8 +31,8 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme167/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme167/console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += timer/timerisr.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme167/btimer/btimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme167/btimer/timerisr.S
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 71612329b7..0838c41756 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/uC5282/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/uC5282/console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/uC5282/btimer/btimer.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index a5c9de4e71..f8a6874390 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/csb350/clock/clockdrv.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/csb350/console/console-io.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/csb350/btimer/btimer.c
 #isr
 librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
 librtemsbsp_a_SOURCES += ../shared/irq/irq.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index b0bb53711a..ccffd01669 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/jmr3904/clock/clockdrv.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/console/console-io.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/btimer/btimer.c
 #isr
 librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
 librtemsbsp_a_SOURCES += ../shared/irq/irq.c
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index 77dcb81762..2db43898da 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/nios2/nios2_iss/clock/clock.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/nios2/nios2_iss/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/nios2/nios2_iss/btimer/btimer.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.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 2976ad672e..e0d7676fe6 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -25,8 +25,8 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/no_cpu/no_bsp/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += timer/timerisr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/btimer/btimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/btimer/timerisr.c
 # shmsupp
 librtemsbsp_a_SOURCES += shmsupp/addrconv.c
 librtemsbsp_a_SOURCES += shmsupp/getcfg.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index 6a0fe40683..629e72bdaf 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -55,7 +55,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/console/consol
 librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/console/uart.c
 
 # Timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/btimer/btimer.c
 
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/or1k/generic_or1k/clock/clockdrv.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index cd245dfc79..d64191285f 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -58,7 +58,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/bsprestart.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/qoriq/clock/clock-config.c
 
 # Timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/btimer/btimer.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 2e94f2beb4..bc7e02426b 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -36,7 +36,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/console/console.c
 # spi
 librtemsbsp_a_SOURCES += spi/spi.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/btimer/btimer.c
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspidle.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index 43c36ef155..80afe8dd39 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
@@ -45,7 +45,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES +=../../../../../../bsps/riscv/riscv_generic/clock/clockdrv.c
 
 # Timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/btimer/btimer.c
 
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index ea1891aede..529169fb58 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -35,7 +35,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh1/clock/ckinit.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh1/clock/delay.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/start/cpu_asm.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/start/ispsh7032.c
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/btimer/btimer.c
 # scitab
 librtemsbsp_a_SOURCES += scitab.c
 # console
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index b7e45f6c27..dcb93de404 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -37,7 +37,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh2/clock/ckinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/start/cpu_asm.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/start/ispsh7045.c
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/btimer/btimer.c
 # scitab
 librtemsbsp_a_SOURCES += scitab.c
 # console
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index 33d9a539dc..9b8252b801 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/start/cpu_asm.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/start/ispsh7750.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh4/clock/ckinit.c
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/btimer/btimer.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 3171e0b697..7668a98610 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -50,7 +50,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/console/debugputs.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/erc32/clock/ckinit.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/btimer/btimer.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../shared/irq/irq-shared.c
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 34cd6fcd12..7e5d8b6363 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -66,8 +66,8 @@ librtemsbsp_a_SOURCES += ../shared/amba/ambapp_show.c
 librtemsbsp_a_SOURCES += ../shared/amba/ahbstat.c
 
 # Clock Driver and Timer Library
-librtemsbsp_a_SOURCES += ../shared/timer/gptimer.c
-librtemsbsp_a_SOURCES += ../shared/timer/tlib.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/gptimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/tlib.c
 
 # PCI
 librtemsbsp_a_SOURCES += ../shared/pci/grpci2.c
@@ -137,7 +137,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/cache.c
 # griommu
 librtemsbsp_a_SOURCES += ../shared/iommu/griommu.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/btimer/btimer.c
 
 # TM/TC
 librtemsbsp_a_SOURCES += ../shared/tmtc/grtc.c
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index df75c03552..71a020cd17 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -60,9 +60,9 @@ librtemsbsp_a_SOURCES += ../shared/amba/ambapp_show.c
 librtemsbsp_a_SOURCES += ../shared/amba/ahbstat.c
 
 # Clock Driver and Timer Library
-librtemsbsp_a_SOURCES += ../shared/timer/gptimer.c
-librtemsbsp_a_SOURCES += ../shared/timer/tlib.c
-librtemsbsp_a_SOURCES += ../shared/timer/tlib_ckinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/gptimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/tlib.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/tlib_ckinit.c
 # non-Driver Manager Clock Implementation
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/leon3/clock/ckinit.c
 
@@ -151,8 +151,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/cache.c
 # griommu
 librtemsbsp_a_SOURCES += ../shared/iommu/griommu.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += timer/watchdog.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/btimer/btimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/btimer/watchdog.c
 
 # GR712
 librtemsbsp_a_SOURCES += ../shared/ascs/grascs.c