bsps: Move console drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

236 files changed, 204 insertions, 204 deletions

diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c b/bsps/arm/altera-cyclone-v/console/console-config.c
index e4dfec9f62..e4dfec9f62 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c
+++ b/bsps/arm/altera-cyclone-v/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/atsam/console/console.c b/bsps/arm/atsam/console/console.c
index d51d2ace7d..d51d2ace7d 100644
--- a/c/src/lib/libbsp/arm/atsam/console/console.c
+++ b/bsps/arm/atsam/console/console.c
diff --git a/c/src/lib/libbsp/arm/atsam/console/debug-console.c b/bsps/arm/atsam/console/debug-console.c
index a405fe9665..a405fe9665 100644
--- a/c/src/lib/libbsp/arm/atsam/console/debug-console.c
+++ b/bsps/arm/atsam/console/debug-console.c
diff --git a/c/src/lib/libbsp/arm/beagle/console/console-config.c b/bsps/arm/beagle/console/console-config.c
index 78af5f6a93..78af5f6a93 100644
--- a/c/src/lib/libbsp/arm/beagle/console/console-config.c
+++ b/bsps/arm/beagle/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/csb336/console/uart.c b/bsps/arm/csb336/console/uart.c
index 8d8a0c1ed0..8d8a0c1ed0 100644
--- a/c/src/lib/libbsp/arm/csb336/console/uart.c
+++ b/bsps/arm/csb336/console/uart.c
diff --git a/c/src/lib/libbsp/arm/csb337/console/dbgu.c b/bsps/arm/csb337/console/dbgu.c
index 1a16762e32..1a16762e32 100644
--- a/c/src/lib/libbsp/arm/csb337/console/dbgu.c
+++ b/bsps/arm/csb337/console/dbgu.c
diff --git a/c/src/lib/libbsp/arm/csb337/console/fbcons.c b/bsps/arm/csb337/console/fbcons.c
index 62e840938d..62e840938d 100644
--- a/c/src/lib/libbsp/arm/csb337/console/fbcons.c
+++ b/bsps/arm/csb337/console/fbcons.c
diff --git a/c/src/lib/libbsp/arm/csb337/console/sed1356.c b/bsps/arm/csb337/console/sed1356.c
index f87a322a01..f87a322a01 100644
--- a/c/src/lib/libbsp/arm/csb337/console/sed1356.c
+++ b/bsps/arm/csb337/console/sed1356.c
diff --git a/c/src/lib/libbsp/arm/csb337/console/uarts.c b/bsps/arm/csb337/console/uarts.c
index b705a477b7..b705a477b7 100644
--- a/c/src/lib/libbsp/arm/csb337/console/uarts.c
+++ b/bsps/arm/csb337/console/uarts.c
diff --git a/c/src/lib/libbsp/arm/csb337/console/usart.c b/bsps/arm/csb337/console/usart.c
index 23b877ce64..23b877ce64 100644
--- a/c/src/lib/libbsp/arm/csb337/console/usart.c
+++ b/bsps/arm/csb337/console/usart.c
diff --git a/c/src/lib/libbsp/arm/edb7312/console/uart.c b/bsps/arm/edb7312/console/uart.c
index 4ba71c8cc2..4ba71c8cc2 100644
--- a/c/src/lib/libbsp/arm/edb7312/console/uart.c
+++ b/bsps/arm/edb7312/console/uart.c
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/console/console-io.c b/bsps/arm/gdbarmsim/console/console-io.c
index 8bea74d934..8bea74d934 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/console/console-io.c
+++ b/bsps/arm/gdbarmsim/console/console-io.c
diff --git a/c/src/lib/libbsp/arm/gumstix/console/ffuart.c b/bsps/arm/gumstix/console/ffuart.c
index 335fc6f4de..335fc6f4de 100644
--- a/c/src/lib/libbsp/arm/gumstix/console/ffuart.c
+++ b/bsps/arm/gumstix/console/ffuart.c
diff --git a/c/src/lib/libbsp/arm/gumstix/console/uarts.c b/bsps/arm/gumstix/console/uarts.c
index 08408695e0..08408695e0 100644
--- a/c/src/lib/libbsp/arm/gumstix/console/uarts.c
+++ b/bsps/arm/gumstix/console/uarts.c
diff --git a/c/src/lib/libbsp/arm/imx/console/console-config.c b/bsps/arm/imx/console/console-config.c
index 0731446f08..0731446f08 100644
--- a/c/src/lib/libbsp/arm/imx/console/console-config.c
+++ b/bsps/arm/imx/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c b/bsps/arm/lm3s69xx/console/console-config.c
index b702f0cd66..b702f0cd66 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c
+++ b/bsps/arm/lm3s69xx/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/console/uart.c b/bsps/arm/lm3s69xx/console/uart.c
index 67a85f4e96..67a85f4e96 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/console/uart.c
+++ b/bsps/arm/lm3s69xx/console/uart.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/console/console-config.c b/bsps/arm/lpc176x/console/console-config.c
index c80932daf7..c80932daf7 100644
--- a/c/src/lib/libbsp/arm/lpc176x/console/console-config.c
+++ b/bsps/arm/lpc176x/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/console/console-config.c b/bsps/arm/lpc24xx/console/console-config.c
index de94552c27..de94552c27 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/console/console-config.c
+++ b/bsps/arm/lpc24xx/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-1.c b/bsps/arm/lpc24xx/console/uart-probe-1.c
index 3b5f08059f..3b5f08059f 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-1.c
+++ b/bsps/arm/lpc24xx/console/uart-probe-1.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-2.c b/bsps/arm/lpc24xx/console/uart-probe-2.c
index d45dbb755b..d45dbb755b 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-2.c
+++ b/bsps/arm/lpc24xx/console/uart-probe-2.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-3.c b/bsps/arm/lpc24xx/console/uart-probe-3.c
index fad932ef9e..fad932ef9e 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-3.c
+++ b/bsps/arm/lpc24xx/console/uart-probe-3.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c b/bsps/arm/lpc32xx/console/console-config.c
index 17e6b0af8f..17e6b0af8f 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c
+++ b/bsps/arm/lpc32xx/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/console/hsu.c b/bsps/arm/lpc32xx/console/hsu.c
index b2044e0753..b2044e0753 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/console/hsu.c
+++ b/bsps/arm/lpc32xx/console/hsu.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/console-config.c b/bsps/arm/raspberrypi/console/console-config.c
index d2186c918b..d2186c918b 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/console-config.c
+++ b/bsps/arm/raspberrypi/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/console_select.c b/bsps/arm/raspberrypi/console/console_select.c
index 42c4944ebe..bd246ca868 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/console_select.c
+++ b/bsps/arm/raspberrypi/console/console_select.c
@@ -26,7 +26,7 @@
 
 #include <rtems/termiostypes.h>
 #include <libchip/serial.h>
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 #include <bsp/rpi-fb.h>
 
 rtems_device_minor_number BSPPrintkPort = 0;
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/fb.c b/bsps/arm/raspberrypi/console/fb.c
index 815d17e8ca..815d17e8ca 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/fb.c
+++ b/bsps/arm/raspberrypi/console/fb.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/fbcons.c b/bsps/arm/raspberrypi/console/fbcons.c
index 3669ba458d..3669ba458d 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/fbcons.c
+++ b/bsps/arm/raspberrypi/console/fbcons.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/font_data.h b/bsps/arm/raspberrypi/console/font_data.h
index 852310cbf9..852310cbf9 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/font_data.h
+++ b/bsps/arm/raspberrypi/console/font_data.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/outch.c b/bsps/arm/raspberrypi/console/outch.c
index 20601384c7..20601384c7 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/outch.c
+++ b/bsps/arm/raspberrypi/console/outch.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/usart.c b/bsps/arm/raspberrypi/console/usart.c
index 25fb523621..25fb523621 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/usart.c
+++ b/bsps/arm/raspberrypi/console/usart.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c b/bsps/arm/realview-pbx-a9/console/console-config.c
index 66dcfa6803..66dcfa6803 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c
+++ b/bsps/arm/realview-pbx-a9/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/console/lpc22xx_uart.h b/bsps/arm/rtl22xx/console/lpc22xx_uart.h
index f6ae249672..f6ae249672 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/console/lpc22xx_uart.h
+++ b/bsps/arm/rtl22xx/console/lpc22xx_uart.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/console/uart.c b/bsps/arm/rtl22xx/console/uart.c
index 2952e74508..2952e74508 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/console/uart.c
+++ b/bsps/arm/rtl22xx/console/uart.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/console/uart.c b/bsps/arm/smdk2410/console/uart.c
index 06adecf239..06adecf239 100644
--- a/c/src/lib/libbsp/arm/smdk2410/console/uart.c
+++ b/bsps/arm/smdk2410/console/uart.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/console/console-config.c b/bsps/arm/stm32f4/console/console-config.c
index 6bf2d7e3b5..6bf2d7e3b5 100644
--- a/c/src/lib/libbsp/arm/stm32f4/console/console-config.c
+++ b/bsps/arm/stm32f4/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/console/usart.c b/bsps/arm/stm32f4/console/usart.c
index 24e010d6bf..24e010d6bf 100644
--- a/c/src/lib/libbsp/arm/stm32f4/console/usart.c
+++ b/bsps/arm/stm32f4/console/usart.c
diff --git a/c/src/lib/libbsp/arm/tms570/console/printk-support.c b/bsps/arm/tms570/console/printk-support.c
index 529c5dba20..529c5dba20 100644
--- a/c/src/lib/libbsp/arm/tms570/console/printk-support.c
+++ b/bsps/arm/tms570/console/printk-support.c
diff --git a/c/src/lib/libbsp/arm/tms570/console/tms570-sci.c b/bsps/arm/tms570/console/tms570-sci.c
index 48986e9a2e..48986e9a2e 100644
--- a/c/src/lib/libbsp/arm/tms570/console/tms570-sci.c
+++ b/bsps/arm/tms570/console/tms570-sci.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/console/console-config.c b/bsps/arm/xilinx-zynq/console/console-config.c
index ce7da2f114..ce7da2f114 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/console/console-config.c
+++ b/bsps/arm/xilinx-zynq/console/console-config.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/console/debug-console.c b/bsps/arm/xilinx-zynq/console/debug-console.c
index 38c0050e90..38c0050e90 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/console/debug-console.c
+++ b/bsps/arm/xilinx-zynq/console/debug-console.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/console/zynq-uart.c b/bsps/arm/xilinx-zynq/console/zynq-uart.c
index fa91f3f46e..fa91f3f46e 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/console/zynq-uart.c
+++ b/bsps/arm/xilinx-zynq/console/zynq-uart.c
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/console/console.c b/bsps/bfin/TLL6527M/console/console.c
index 1871bdbb9d..1871bdbb9d 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/console/console.c
+++ b/bsps/bfin/TLL6527M/console/console.c
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c b/bsps/bfin/bf537Stamp/console/console.c
index e9fe24cda1..e9fe24cda1 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c
+++ b/bsps/bfin/bf537Stamp/console/console.c
diff --git a/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c b/bsps/bfin/eZKit533/console/console-io.c
index 5bafb3a094..5bafb3a094 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c
+++ b/bsps/bfin/eZKit533/console/console-io.c
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/console/console-io.c b/bsps/epiphany/epiphany_sim/console/console-io.c
index e3da54389f..e3da54389f 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/console/console-io.c
+++ b/bsps/epiphany/epiphany_sim/console/console-io.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/conscfg.c b/bsps/i386/pc386/console/conscfg.c
index 07602a3436..a4ae88626f 100644
--- a/c/src/lib/libbsp/i386/pc386/console/conscfg.c
+++ b/bsps/i386/pc386/console/conscfg.c
@@ -23,7 +23,7 @@
 #include <rtems/vgacons.h>
 #endif
 #include <bsp/irq.h>
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 
 #if BSP_ENABLE_VGA
 #define VGA_CONSOLE_FUNCTIONS  &vgacons_fns
diff --git a/c/src/lib/libbsp/i386/pc386/console/console_control.c b/bsps/i386/pc386/console/console_control.c
index 2d1912d3b1..a04ae2bc3b 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console_control.c
+++ b/bsps/i386/pc386/console/console_control.c
@@ -30,7 +30,7 @@
 #if BSP_ENABLE_VGA
 #include <rtems/keyboard.h>
 #endif
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 
 /*
  *  console_control
diff --git a/c/src/lib/libbsp/i386/pc386/console/console_select.c b/bsps/i386/pc386/console/console_select.c
index bde99a4c51..1c064fb271 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console_select.c
+++ b/bsps/i386/pc386/console/console_select.c
@@ -29,7 +29,7 @@
 #include <rtems/termiostypes.h>
 #include <bsp/bspimpl.h>
 
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 #ifdef RTEMS_RUNTIME_CONSOLE_SELECT
   #include <crt.h>
 #endif
diff --git a/c/src/lib/libbsp/i386/pc386/console/defkeymap.c b/bsps/i386/pc386/console/defkeymap.c
index a6bf5103a1..a6bf5103a1 100644
--- a/c/src/lib/libbsp/i386/pc386/console/defkeymap.c
+++ b/bsps/i386/pc386/console/defkeymap.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.c b/bsps/i386/pc386/console/exar17d15x.c
index d9929c36b4..5cf615ac86 100644
--- a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.c
+++ b/bsps/i386/pc386/console/exar17d15x.c
@@ -27,7 +27,7 @@
 #include <rtems/bspIo.h>
 #include <rtems/pci.h>
 #include <bsp/exar17d15x.h>
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 
 #define MAX_BOARDS 4
 
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_cirrus.c b/bsps/i386/pc386/console/fb_cirrus.c
index bb05b5a338..bb05b5a338 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_cirrus.c
+++ b/bsps/i386/pc386/console/fb_cirrus.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c b/bsps/i386/pc386/console/fb_vesa_rm.c
index 1c42956fce..1c42956fce 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c
+++ b/bsps/i386/pc386/console/fb_vesa_rm.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c b/bsps/i386/pc386/console/fb_vga.c
index 75ad56eb98..75ad56eb98 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
+++ b/bsps/i386/pc386/console/fb_vga.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/gdb_select.c b/bsps/i386/pc386/console/gdb_select.c
index adc996913b..0fe3b2cdad 100644
--- a/c/src/lib/libbsp/i386/pc386/console/gdb_select.c
+++ b/bsps/i386/pc386/console/gdb_select.c
@@ -30,7 +30,7 @@
 #include <libchip/ns16550.h>
 #include <bsp/bspimpl.h>
 
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 
 /*
  * Used in the stub to print output.
diff --git a/c/src/lib/libbsp/i386/pc386/console/i386kbd.h b/bsps/i386/pc386/console/i386kbd.h
index 627b37c750..627b37c750 100644
--- a/c/src/lib/libbsp/i386/pc386/console/i386kbd.h
+++ b/bsps/i386/pc386/console/i386kbd.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/inch.c b/bsps/i386/pc386/console/inch.c
index f5d5079236..f5d5079236 100644
--- a/c/src/lib/libbsp/i386/pc386/console/inch.c
+++ b/bsps/i386/pc386/console/inch.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/kbd_parser.c b/bsps/i386/pc386/console/kbd_parser.c
index f3d2f9c55a..f3d2f9c55a 100644
--- a/c/src/lib/libbsp/i386/pc386/console/kbd_parser.c
+++ b/bsps/i386/pc386/console/kbd_parser.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/keyboard.c b/bsps/i386/pc386/console/keyboard.c
index 0c8991b829..0c8991b829 100644
--- a/c/src/lib/libbsp/i386/pc386/console/keyboard.c
+++ b/bsps/i386/pc386/console/keyboard.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/outch.c b/bsps/i386/pc386/console/outch.c
index 90ffedf250..90ffedf250 100644
--- a/c/src/lib/libbsp/i386/pc386/console/outch.c
+++ b/bsps/i386/pc386/console/outch.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/pc_keyb.c b/bsps/i386/pc386/console/pc_keyb.c
index b6f0eb216a..b6f0eb216a 100644
--- a/c/src/lib/libbsp/i386/pc386/console/pc_keyb.c
+++ b/bsps/i386/pc386/console/pc_keyb.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/printk_support.c b/bsps/i386/pc386/console/printk_support.c
index f6ef656583..d7bc329868 100644
--- a/c/src/lib/libbsp/i386/pc386/console/printk_support.c
+++ b/bsps/i386/pc386/console/printk_support.c
@@ -25,7 +25,7 @@
 #include <bsp.h>
 #include <libchip/serial.h>
 #include <libchip/ns16550.h>
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 
 rtems_device_minor_number BSPPrintkPort = 0;
 
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c b/bsps/i386/pc386/console/ps2_mouse.c
index 6a3f8551b4..6a3f8551b4 100644
--- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
+++ b/bsps/i386/pc386/console/ps2_mouse.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.h b/bsps/i386/pc386/console/ps2_mouse.h
index dd61e8a367..dd61e8a367 100644
--- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.h
+++ b/bsps/i386/pc386/console/ps2_mouse.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/rtd316.c b/bsps/i386/pc386/console/rtd316.c
index 3b4e3c6ab4..c8f3c3a6ef 100644
--- a/c/src/lib/libbsp/i386/pc386/console/rtd316.c
+++ b/bsps/i386/pc386/console/rtd316.c
@@ -26,7 +26,7 @@
 #include <rtems/bspIo.h>
 #include <bsp/rtd316.h>
 #include <rtems/score/i386.h>
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 
 #define RTD_CLOCK_RATE  (460800 * 32)
 
diff --git a/c/src/lib/libbsp/i386/pc386/console/serial_mouse_config.c b/bsps/i386/pc386/console/serial_mouse_config.c
index 492d038bd4..a8a0313954 100644
--- a/c/src/lib/libbsp/i386/pc386/console/serial_mouse_config.c
+++ b/bsps/i386/pc386/console/serial_mouse_config.c
@@ -15,7 +15,7 @@
 #include <fcntl.h>
 
 #include <libchip/serial.h>
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 
 /* select which serial port the mouse is connected to */
 #if defined(SERIAL_MOUSE_COM2)
diff --git a/c/src/lib/libbsp/i386/pc386/console/uart_bus_pci.c b/bsps/i386/pc386/console/uart_bus_pci.c
index ac0c3bf86e..2ad8323f05 100644
--- a/c/src/lib/libbsp/i386/pc386/console/uart_bus_pci.c
+++ b/bsps/i386/pc386/console/uart_bus_pci.c
@@ -236,7 +236,7 @@ DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, NULL, NULL);
 #include <libchip/ns16550.h>
 #include <rtems/bspIo.h>
 #include <rtems/pci.h>
-#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
+#include "../../shared/dev/serial/legacy-console.h"
 
 #define MAX_BOARDS 4
 
diff --git a/c/src/lib/libbsp/i386/pc386/console/vgacons.c b/bsps/i386/pc386/console/vgacons.c
index 2886496e51..2886496e51 100644
--- a/c/src/lib/libbsp/i386/pc386/console/vgacons.c
+++ b/bsps/i386/pc386/console/vgacons.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/vgainit.c b/bsps/i386/pc386/console/vgainit.c
index ce83ae59b1..ce83ae59b1 100644
--- a/c/src/lib/libbsp/i386/pc386/console/vgainit.c
+++ b/bsps/i386/pc386/console/vgainit.c
diff --git a/c/src/lib/libbsp/i386/pc386/console/videoAsm.S b/bsps/i386/pc386/console/videoAsm.S
index 03f31f879b..03f31f879b 100644
--- a/c/src/lib/libbsp/i386/pc386/console/videoAsm.S
+++ b/bsps/i386/pc386/console/videoAsm.S
diff --git a/c/src/lib/libbsp/i386/pc386/console/vt.c b/bsps/i386/pc386/console/vt.c
index 022cb5d461..022cb5d461 100644
--- a/c/src/lib/libbsp/i386/pc386/console/vt.c
+++ b/bsps/i386/pc386/console/vt.c
diff --git a/c/src/lib/libbsp/lm32/shared/console/console.c b/bsps/lm32/shared/console/console.c
index d49ca346b6..d49ca346b6 100644
--- a/c/src/lib/libbsp/lm32/shared/console/console.c
+++ b/bsps/lm32/shared/console/console.c
diff --git a/c/src/lib/libbsp/lm32/shared/console/uart.c b/bsps/lm32/shared/console/uart.c
index 9adbd4063d..9adbd4063d 100644
--- a/c/src/lib/libbsp/lm32/shared/console/uart.c
+++ b/bsps/lm32/shared/console/uart.c
diff --git a/c/src/lib/libbsp/lm32/shared/console/uart.h b/bsps/lm32/shared/console/uart.h
index baafde13e2..baafde13e2 100644
--- a/c/src/lib/libbsp/lm32/shared/console/uart.h
+++ b/bsps/lm32/shared/console/uart.h
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/console/console-io.c b/bsps/m32c/m32cbsp/console/console-io.c
index 745493c43a..745493c43a 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/console/console-io.c
+++ b/bsps/m32c/m32cbsp/console/console-io.c
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/console/syscalls.S b/bsps/m32c/m32cbsp/console/syscalls.S
index f4cabac940..f4cabac940 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/console/syscalls.S
+++ b/bsps/m32c/m32cbsp/console/syscalls.S
diff --git a/c/src/lib/libbsp/m68k/av5282/console/console.c b/bsps/m68k/av5282/console/console.c
index dd557660f8..dd557660f8 100644
--- a/c/src/lib/libbsp/m68k/av5282/console/console.c
+++ b/bsps/m68k/av5282/console/console.c
diff --git a/c/src/lib/libbsp/m68k/csb360/console/console-io.c b/bsps/m68k/csb360/console/console-io.c
index 9b0aeac5bb..9b0aeac5bb 100644
--- a/c/src/lib/libbsp/m68k/csb360/console/console-io.c
+++ b/bsps/m68k/csb360/console/console-io.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/bsps/m68k/gen68340/console/console.c
index d6634b1079..d6634b1079 100644
--- a/c/src/lib/libbsp/m68k/gen68340/console/console.c
+++ b/bsps/m68k/gen68340/console/console.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c b/bsps/m68k/gen68340/console/m340uart.c
index 56ad29c256..56ad29c256 100644
--- a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c
+++ b/bsps/m68k/gen68340/console/m340uart.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/console/console.c b/bsps/m68k/gen68360/console/console.c
index 36d8470168..36d8470168 100644
--- a/c/src/lib/libbsp/m68k/gen68360/console/console.c
+++ b/bsps/m68k/gen68360/console/console.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/console/console.c b/bsps/m68k/genmcf548x/console/console.c
index 32e5601a17..32e5601a17 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/console/console.c
+++ b/bsps/m68k/genmcf548x/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c b/bsps/m68k/mcf5206elite/console/console.c
index bbf343d0f3..bbf343d0f3 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c
+++ b/bsps/m68k/mcf5206elite/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/console/console.c b/bsps/m68k/mcf52235/console/console.c
index c2b6e36bfa..c2b6e36bfa 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/console/console.c
+++ b/bsps/m68k/mcf52235/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/console/debugio.c b/bsps/m68k/mcf52235/console/debugio.c
index 1fbf4b09d7..1fbf4b09d7 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/console/debugio.c
+++ b/bsps/m68k/mcf52235/console/debugio.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/console/console.c b/bsps/m68k/mcf5225x/console/console.c
index 9e36e3945a..9e36e3945a 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/console/console.c
+++ b/bsps/m68k/mcf5225x/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/console/debugio.c b/bsps/m68k/mcf5225x/console/debugio.c
index b91048a310..b91048a310 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/console/debugio.c
+++ b/bsps/m68k/mcf5225x/console/debugio.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/console/console.c b/bsps/m68k/mcf5235/console/console.c
index 38317130cb..38317130cb 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/console/console.c
+++ b/bsps/m68k/mcf5235/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mcf5329/console/console.c b/bsps/m68k/mcf5329/console/console.c
index 797e5b0606..797e5b0606 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/console/console.c
+++ b/bsps/m68k/mcf5329/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mrm332/console/console.c b/bsps/m68k/mrm332/console/console.c
index 7b5ae7d51c..7b5ae7d51c 100644
--- a/c/src/lib/libbsp/m68k/mrm332/console/console.c
+++ b/bsps/m68k/mrm332/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mrm332/console/sci.c b/bsps/m68k/mrm332/console/sci.c
index c6b4933f13..c6b4933f13 100644
--- a/c/src/lib/libbsp/m68k/mrm332/console/sci.c
+++ b/bsps/m68k/mrm332/console/sci.c
diff --git a/c/src/lib/libbsp/m68k/mrm332/console/sci.h b/bsps/m68k/mrm332/console/sci.h
index 93893ecbfc..93893ecbfc 100644
--- a/c/src/lib/libbsp/m68k/mrm332/console/sci.h
+++ b/bsps/m68k/mrm332/console/sci.h
diff --git a/c/src/lib/libbsp/m68k/mvme147/console/console.c b/bsps/m68k/mvme147/console/console.c
index f26ca6485a..f26ca6485a 100644
--- a/c/src/lib/libbsp/m68k/mvme147/console/console.c
+++ b/bsps/m68k/mvme147/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/console/console.c b/bsps/m68k/mvme162/console/console.c
index 985254d483..985254d483 100644
--- a/c/src/lib/libbsp/m68k/mvme162/console/console.c
+++ b/bsps/m68k/mvme162/console/console.c
diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h b/bsps/m68k/mvme167/console/console-recording.h
index 4d8d3fc66c..4d8d3fc66c 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h
+++ b/bsps/m68k/mvme167/console/console-recording.h
diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console.c b/bsps/m68k/mvme167/console/console.c
index 0499ac46b3..0499ac46b3 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/console.c
+++ b/bsps/m68k/mvme167/console/console.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/console/console.c b/bsps/m68k/uC5282/console/console.c
index 276d0c6f18..276d0c6f18 100644
--- a/c/src/lib/libbsp/m68k/uC5282/console/console.c
+++ b/bsps/m68k/uC5282/console/console.c
diff --git a/c/src/lib/libbsp/mips/csb350/console/console-io.c b/bsps/mips/csb350/console/console-io.c
index e1beff8460..e1beff8460 100644
--- a/c/src/lib/libbsp/mips/csb350/console/console-io.c
+++ b/bsps/mips/csb350/console/console-io.c
diff --git a/c/src/lib/libbsp/mips/hurricane/console/console.c b/bsps/mips/hurricane/console/console.c
index 219cc964c0..219cc964c0 100644
--- a/c/src/lib/libbsp/mips/hurricane/console/console.c
+++ b/bsps/mips/hurricane/console/console.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/console/console-io.c b/bsps/mips/jmr3904/console/console-io.c
index a7f3204d25..a7f3204d25 100644
--- a/c/src/lib/libbsp/mips/jmr3904/console/console-io.c
+++ b/bsps/mips/jmr3904/console/console-io.c
diff --git a/c/src/lib/libbsp/mips/malta/console/conscfg.c b/bsps/mips/malta/console/conscfg.c
index 8d84c9321c..8d84c9321c 100644
--- a/c/src/lib/libbsp/mips/malta/console/conscfg.c
+++ b/bsps/mips/malta/console/conscfg.c
diff --git a/c/src/lib/libbsp/mips/malta/console/printk_support.c b/bsps/mips/malta/console/printk_support.c
index e548485222..e548485222 100644
--- a/c/src/lib/libbsp/mips/malta/console/printk_support.c
+++ b/bsps/mips/malta/console/printk_support.c
diff --git a/c/src/lib/libbsp/mips/rbtx4925/console/console-io.c b/bsps/mips/rbtx4925/console/console-io.c
index 75cca1ebbd..75cca1ebbd 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/console/console-io.c
+++ b/bsps/mips/rbtx4925/console/console-io.c
diff --git a/c/src/lib/libbsp/mips/rbtx4938/console/console-io.c b/bsps/mips/rbtx4938/console/console-io.c
index b0dbc3b365..b0dbc3b365 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/console/console-io.c
+++ b/bsps/mips/rbtx4938/console/console-io.c
diff --git a/c/src/lib/libbsp/mips/rbtx4938/console/yamon_api.h b/bsps/mips/rbtx4938/console/yamon_api.h
index 529cf16a3f..529cf16a3f 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/console/yamon_api.h
+++ b/bsps/mips/rbtx4938/console/yamon_api.h
diff --git a/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c b/bsps/moxie/moxiesim/console/console-io.c
index de058eba8b..de058eba8b 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c
+++ b/bsps/moxie/moxiesim/console/console-io.c
diff --git a/c/src/lib/libbsp/moxie/moxiesim/console/syscalls.S b/bsps/moxie/moxiesim/console/syscalls.S
index f9a63a29b5..f9a63a29b5 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/console/syscalls.S
+++ b/bsps/moxie/moxiesim/console/syscalls.S
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/console/console.c b/bsps/nios2/nios2_iss/console/console.c
index 9197c6486c..9197c6486c 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/console/console.c
+++ b/bsps/nios2/nios2_iss/console/console.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/console/console.c b/bsps/no_cpu/no_bsp/console/console.c
index 41c17c29ef..41c17c29ef 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/console/console.c
+++ b/bsps/no_cpu/no_bsp/console/console.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/console/console-config.c b/bsps/or1k/generic_or1k/console/console-config.c
index 5fc75dcf0c..5fc75dcf0c 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/console/console-config.c
+++ b/bsps/or1k/generic_or1k/console/console-config.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/console/uart.c b/bsps/or1k/generic_or1k/console/uart.c
index 6f8a49443d..6f8a49443d 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/console/uart.c
+++ b/bsps/or1k/generic_or1k/console/uart.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/console/console.c b/bsps/powerpc/gen5200/console/console.c
index d7325032c4..d7325032c4 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c
+++ b/bsps/powerpc/gen5200/console/console.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/console/console-config.c b/bsps/powerpc/gen83xx/console/console-config.c
index d0071cd220..d0071cd220 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/console/console-config.c
+++ b/bsps/powerpc/gen83xx/console/console-config.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-config.c b/bsps/powerpc/mpc55xxevb/console/console-config.c
index d0ea250917..d0ea250917 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-config.c
+++ b/bsps/powerpc/mpc55xxevb/console/console-config.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c b/bsps/powerpc/mpc55xxevb/console/console-esci.c
index 9e6646fb65..9e6646fb65 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c
+++ b/bsps/powerpc/mpc55xxevb/console/console-esci.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c b/bsps/powerpc/mpc55xxevb/console/console-generic.c
index 71385adf2b..71385adf2b 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
+++ b/bsps/powerpc/mpc55xxevb/console/console-generic.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c b/bsps/powerpc/mpc55xxevb/console/console-linflex.c
index 02978be524..02978be524 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c
+++ b/bsps/powerpc/mpc55xxevb/console/console-linflex.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c b/bsps/powerpc/mpc8260ads/console/console.c
index 873c38dc3e..873c38dc3e 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
+++ b/bsps/powerpc/mpc8260ads/console/console.c
diff --git a/c/src/lib/libbsp/powerpc/psim/console/console-io.c b/bsps/powerpc/psim/console/console-io.c
index 512b90dde2..512b90dde2 100644
--- a/c/src/lib/libbsp/powerpc/psim/console/console-io.c
+++ b/bsps/powerpc/psim/console/console-io.c
diff --git a/c/src/lib/libbsp/powerpc/psim/console/consupp.S b/bsps/powerpc/psim/console/consupp.S
index bb9e834fc6..bb9e834fc6 100644
--- a/c/src/lib/libbsp/powerpc/psim/console/consupp.S
+++ b/bsps/powerpc/psim/console/consupp.S
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/console/console-io.c b/bsps/powerpc/qemuppc/console/console-io.c
index 738bd27966..738bd27966 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/console/console-io.c
+++ b/bsps/powerpc/qemuppc/console/console-io.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c b/bsps/powerpc/qoriq/console/console-config.c
index 4c1ca1d3f6..4c1ca1d3f6 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c
+++ b/bsps/powerpc/qoriq/console/console-config.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c b/bsps/powerpc/qoriq/console/uart-bridge-master.c
index 588e0a42ad..588e0a42ad 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c
+++ b/bsps/powerpc/qoriq/console/uart-bridge-master.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c b/bsps/powerpc/qoriq/console/uart-bridge-slave.c
index 44d4cfb712..44d4cfb712 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c
+++ b/bsps/powerpc/qoriq/console/uart-bridge-slave.c
diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.c b/bsps/powerpc/shared/console/console.c
index f275683cc2..f275683cc2 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/console.c
+++ b/bsps/powerpc/shared/console/console.c
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.c b/bsps/powerpc/shared/console/uart.c
index 62212b98db..62212b98db 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.c
+++ b/bsps/powerpc/shared/console/uart.c
diff --git a/c/src/lib/libbsp/powerpc/ss555/console/console.c b/bsps/powerpc/ss555/console/console.c
index e13e4734ea..e13e4734ea 100644
--- a/c/src/lib/libbsp/powerpc/ss555/console/console.c
+++ b/bsps/powerpc/ss555/console/console.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/console/console.c b/bsps/powerpc/t32mppc/console/console.c
index 5fbd648765..5fbd648765 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/console/console.c
+++ b/bsps/powerpc/t32mppc/console/console.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c b/bsps/powerpc/tqm8xx/console/console.c
index 5a681b19fb..5a681b19fb 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
+++ b/bsps/powerpc/tqm8xx/console/console.c
diff --git a/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c b/bsps/powerpc/virtex/console/consolelite.c
index 4d0b2db17f..4d0b2db17f 100644
--- a/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c
+++ b/bsps/powerpc/virtex/console/consolelite.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/console/console-io.c b/bsps/riscv/riscv_generic/console/console-io.c
index ded68ef7d2..ded68ef7d2 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/console/console-io.c
+++ b/bsps/riscv/riscv_generic/console/console-io.c
diff --git a/c/src/lib/libbsp/sh/gensh1/console/sci.c b/bsps/sh/gensh1/console/sci.c
index 04d9ca5c70..04d9ca5c70 100644
--- a/c/src/lib/libbsp/sh/gensh1/console/sci.c
+++ b/bsps/sh/gensh1/console/sci.c
diff --git a/c/src/lib/libbsp/sh/gensh2/console/config.c b/bsps/sh/gensh2/console/config.c
index a2f25742dd..a2f25742dd 100644
--- a/c/src/lib/libbsp/sh/gensh2/console/config.c
+++ b/bsps/sh/gensh2/console/config.c
diff --git a/c/src/lib/libbsp/sh/gensh2/console/sci.c b/bsps/sh/gensh2/console/sci.c
index 143fc1bb94..143fc1bb94 100644
--- a/c/src/lib/libbsp/sh/gensh2/console/sci.c
+++ b/bsps/sh/gensh2/console/sci.c
diff --git a/c/src/lib/libbsp/sh/gensh2/console/sci_termios.c b/bsps/sh/gensh2/console/sci_termios.c
index 5d588065af..5d588065af 100644
--- a/c/src/lib/libbsp/sh/gensh2/console/sci_termios.c
+++ b/bsps/sh/gensh2/console/sci_termios.c
diff --git a/c/src/lib/libbsp/sh/gensh4/console/console.c b/bsps/sh/gensh4/console/console.c
index 917556df4e..917556df4e 100644
--- a/c/src/lib/libbsp/sh/gensh4/console/console.c
+++ b/bsps/sh/gensh4/console/console.c
diff --git a/c/src/lib/libbsp/sh/gensh4/console/sh4uart.c b/bsps/sh/gensh4/console/sh4uart.c
index 7acc1de337..7acc1de337 100644
--- a/c/src/lib/libbsp/sh/gensh4/console/sh4uart.c
+++ b/bsps/sh/gensh4/console/sh4uart.c
diff --git a/c/src/lib/libbsp/sh/shsim/console/console-debugio.c b/bsps/sh/shsim/console/console-debugio.c
index 0a81dbe45b..0a81dbe45b 100644
--- a/c/src/lib/libbsp/sh/shsim/console/console-debugio.c
+++ b/bsps/sh/shsim/console/console-debugio.c
diff --git a/c/src/lib/libbsp/sh/shsim/console/console-io.c b/bsps/sh/shsim/console/console-io.c
index 71b089fdf7..71b089fdf7 100644
--- a/c/src/lib/libbsp/sh/shsim/console/console-io.c
+++ b/bsps/sh/shsim/console/console-io.c
diff --git a/c/src/lib/libbsp/sh/shsim/console/console-support.S b/bsps/sh/shsim/console/console-support.S
index 63f72f794b..63f72f794b 100644
--- a/c/src/lib/libbsp/sh/shsim/console/console-support.S
+++ b/bsps/sh/shsim/console/console-support.S
diff --git a/c/src/lib/libbsp/shared/console-output-char.c b/bsps/shared/dev/serial/console-output-char.c
index fec204663a..fec204663a 100644
--- a/c/src/lib/libbsp/shared/console-output-char.c
+++ b/bsps/shared/dev/serial/console-output-char.c
diff --git a/c/src/lib/libbsp/shared/console-polled.c b/bsps/shared/dev/serial/console-polled.c
index 26c9817bdb..26c9817bdb 100644
--- a/c/src/lib/libbsp/shared/console-polled.c
+++ b/bsps/shared/dev/serial/console-polled.c
diff --git a/c/src/lib/libbsp/shared/console-termios-init.c b/bsps/shared/dev/serial/console-termios-init.c
index a01a75abf2..a01a75abf2 100644
--- a/c/src/lib/libbsp/shared/console-termios-init.c
+++ b/bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/shared/console-termios.c b/bsps/shared/dev/serial/console-termios.c
index 1e755d91c9..1e755d91c9 100644
--- a/c/src/lib/libbsp/shared/console-termios.c
+++ b/bsps/shared/dev/serial/console-termios.c
diff --git a/c/src/lib/libbsp/shared/get-serial-mouse-ps2.c b/bsps/shared/dev/serial/getserialmouseps2.c
index dc30deecbf..dc30deecbf 100644
--- a/c/src/lib/libbsp/shared/get-serial-mouse-ps2.c
+++ b/bsps/shared/dev/serial/getserialmouseps2.c
diff --git a/c/src/lib/libbsp/shared/dummy_printk_support.c b/bsps/shared/dev/serial/printk-dummy.c
index 8273edb83a..8273edb83a 100644
--- a/c/src/lib/libbsp/shared/dummy_printk_support.c
+++ b/bsps/shared/dev/serial/printk-dummy.c
diff --git a/c/src/lib/libbsp/sparc/erc32/console/debugputs.c b/bsps/sparc/erc32/console/debugputs.c
index 57c00048a5..57c00048a5 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
+++ b/bsps/sparc/erc32/console/debugputs.c
diff --git a/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c b/bsps/sparc/erc32/console/erc32_console.c
index 81dfe026fb..81dfe026fb 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c
+++ b/bsps/sparc/erc32/console/erc32_console.c
diff --git a/c/src/lib/libbsp/sparc/leon2/console/console.c b/bsps/sparc/leon2/console/console.c
index 611dbfa5f3..611dbfa5f3 100644
--- a/c/src/lib/libbsp/sparc/leon2/console/console.c
+++ b/bsps/sparc/leon2/console/console.c
diff --git a/c/src/lib/libbsp/sparc/leon2/console/debugputs.c b/bsps/sparc/leon2/console/debugputs.c
index c5919f275e..c5919f275e 100644
--- a/c/src/lib/libbsp/sparc/leon2/console/debugputs.c
+++ b/bsps/sparc/leon2/console/debugputs.c
diff --git a/c/src/lib/libbsp/sparc/leon3/console/console.c b/bsps/sparc/leon3/console/console.c
index acab893399..acab893399 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/console.c
+++ b/bsps/sparc/leon3/console/console.c
diff --git a/c/src/lib/libbsp/sparc/leon3/console/printk_support.c b/bsps/sparc/leon3/console/printk_support.c
index f7e1fb683f..f7e1fb683f 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
+++ b/bsps/sparc/leon3/console/printk_support.c
diff --git a/c/src/lib/libbsp/sparc64/shared/console/conscfg.c b/bsps/sparc64/shared/console/conscfg.c
index 560bdc05bf..560bdc05bf 100644
--- a/c/src/lib/libbsp/sparc64/shared/console/conscfg.c
+++ b/bsps/sparc64/shared/console/conscfg.c
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c b/bsps/v850/gdbv850sim/console/console-io.c
index c1f51a34d7..c1f51a34d7 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c
+++ b/bsps/v850/gdbv850sim/console/console-io.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
index 8fff55e7c8..63449347ad 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -106,9 +106,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/console/console-config.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index 4472869d5c..758b84b343 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -113,9 +113,9 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
 librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += console/debug-console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/console/debug-console.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index 079bc3d342..9e351295a3 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -65,7 +65,7 @@ librtemsbsp_a_SOURCES += irq.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/console/console-config.c
 
 # I2C
 librtemsbsp_a_SOURCES += i2c/bbb-i2c.c
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 04deee4f90..45f9ce342e 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/csb336/clock/clockdrv.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
-librtemsbsp_a_SOURCES += console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb336/console/uart.c
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 23a87975bb..523f4a5523 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -43,15 +43,15 @@ librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/uarts.c
-librtemsbsp_a_SOURCES += console/dbgu.c
-librtemsbsp_a_SOURCES += console/usart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/uarts.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/dbgu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/usart.c
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 if ENABLE_LCD
-librtemsbsp_a_SOURCES += console/sed1356.c
-librtemsbsp_a_SOURCES += console/fbcons.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/sed1356.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/fbcons.c
 endif
 # umon
 if ENABLE_UMON
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 612afe1f99..6404930f8f 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -32,7 +32,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/edb7312/clock/clockdrv.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/console/uart.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index 83bbda0094..68521ca1c2 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -28,8 +28,8 @@ librtemsbsp_a_SOURCES += startup/syscalls.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c
-librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gdbarmsim/console/console-io.c
 # clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 # timer
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index ec5d8c910e..d262811e47 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -33,8 +33,8 @@ librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/uarts.c
-librtemsbsp_a_SOURCES += console/ffuart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/console/uarts.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/console/ffuart.c
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index c02152f8ca..2d62ed445d 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -56,8 +56,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/console/console-config.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../shared/arm-generic-timer-clock-config.c
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index 31ee769f16..52bbb89ce3 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -56,8 +56,8 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/console-config.c
-librtemsbsp_a_SOURCES += console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/console/uart.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 49e6620a9e..ba2475febb 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -59,9 +59,9 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/console/console-config.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index ee2b7b4da0..a597be7e05 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -71,12 +71,12 @@ librtemsbsp_a_SOURCES += irq/irq.c
 librtemsbsp_a_SOURCES += irq/irq-dispatch.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console-config.c
-librtemsbsp_a_SOURCES += console/uart-probe-1.c
-librtemsbsp_a_SOURCES += console/uart-probe-2.c
-librtemsbsp_a_SOURCES += console/uart-probe-3.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/console/uart-probe-1.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/console/uart-probe-2.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/console/uart-probe-3.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index 743b0722b3..d07607060d 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -59,10 +59,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console-config.c
-librtemsbsp_a_SOURCES += console/hsu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/console/hsu.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 58cfe1f237..106c0b43f9 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -16,7 +16,7 @@ dist_project_lib_DATA = startup/bsp_specs
 # Header                                                     #
 ###############################################################################
 
-noinst_HEADERS = console/font_data.h
+noinst_HEADERS = ../../../../../../bsps/arm/raspberrypi/console/font_data.h
 
 ###############################################################################
 # Data                                                       #
@@ -68,12 +68,12 @@ librtemsbsp_a_SOURCES += irq/irq.c
 # Console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
-librtemsbsp_a_SOURCES += console/console-config.c
-librtemsbsp_a_SOURCES += console/console_select.c
-librtemsbsp_a_SOURCES += console/usart.c
-librtemsbsp_a_SOURCES += console/fb.c
-librtemsbsp_a_SOURCES += console/fbcons.c
-librtemsbsp_a_SOURCES += console/outch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/console/console_select.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/console/usart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/console/fb.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/console/fbcons.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/console/outch.c
 
 # Mailbox
 librtemsbsp_a_SOURCES += misc/mailbox.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
index 7f235343e5..bc1e0437cb 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -61,12 +61,12 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += ../../shared/get-serial-mouse-ps2.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/getserialmouseps2.c
 librtemsbsp_a_SOURCES += ../shared/arm-pl011.c
 librtemsbsp_a_SOURCES += ../shared/arm-pl050.c
-librtemsbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/realview-pbx-a9/console/console-config.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index da8ef3aef1..e64bbeee9f 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/rtl22xx/clock/clockdrv.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/rtl22xx/console/uart.c
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index a9c43789f4..748cde9c94 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/smdk2410/clock/support.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/smdk2410/console/uart.c
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index 640cb59adf..760b387a18 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -56,8 +56,8 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/console-config.c
-librtemsbsp_a_SOURCES += console/usart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/console/usart.c
 
 # I2C
 librtemsbsp_a_SOURCES += i2c/i2c.c
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 3857fc4fda..106d6c1d9e 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -62,9 +62,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/printk-support.c
-librtemsbsp_a_SOURCES += console/tms570-sci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/tms570/console/printk-support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/tms570/console/tms570-sci.c
 
 # Clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/tms570/clock/clock.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 823c92be4b..0b468fd12e 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -59,10 +59,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console-config.c
-librtemsbsp_a_SOURCES += console/debug-console.c
-librtemsbsp_a_SOURCES += console/zynq-uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/console/debug-console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/console/zynq-uart.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index a1fedd768e..b47be73d17 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
@@ -25,7 +25,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/TLL6527M/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/TLL6527M/start/interrupt.c
 
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index d86fd55243..e8c3e183f2 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/bf537Stamp/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/interrupt.c
 
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index f74b1d6710..d5a0685958 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
-librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/eZKit533/console/console-io.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/interrupt.c
 
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index b90849e4e2..4b001ac26c 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -48,7 +48,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 librtemsbsp_a_SOURCES += timer/timer.c
 
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
@@ -58,7 +58,7 @@ librtemsbsp_a_SOURCES += irq/irq.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 # debugio
-librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/epiphany/epiphany_sim/console/console-io.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 37a7203ea6..aa10b8f2ad 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -53,42 +53,42 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/i386/pc386/clock/todcfg.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
 
 if RTEMS_VGA
-librtemsbsp_a_SOURCES += console/inch.c
-librtemsbsp_a_SOURCES += console/outch.c
-librtemsbsp_a_SOURCES += console/defkeymap.c
-librtemsbsp_a_SOURCES += console/keyboard.c
-librtemsbsp_a_SOURCES += console/pc_keyb.c
-librtemsbsp_a_SOURCES += console/ps2_mouse.c
-librtemsbsp_a_SOURCES += console/vgainit.c
-librtemsbsp_a_SOURCES += console/vt.c
-librtemsbsp_a_SOURCES += console/videoAsm.S
-librtemsbsp_a_SOURCES += console/kbd_parser.c
-librtemsbsp_a_SOURCES += console/vgacons.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/inch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/outch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/defkeymap.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/keyboard.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/pc_keyb.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/ps2_mouse.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/vgainit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/vt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/videoAsm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/kbd_parser.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/vgacons.c
 if USE_VGA
-librtemsbsp_a_SOURCES += console/fb_vga.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/fb_vga.c
 endif
 if USE_CIRRUS_GD5446
-librtemsbsp_a_SOURCES += console/fb_cirrus.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/fb_cirrus.c
 endif
 if USE_VBE_RM
-librtemsbsp_a_SOURCES += console/fb_vesa_rm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/fb_vesa_rm.c
 endif
 endif
 
 # console (non-graphics support)
-librtemsbsp_a_SOURCES += console/serial_mouse_config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/serial_mouse_config.c
 librtemsbsp_a_SOURCES += ../shared/comm/uart.c
 librtemsbsp_a_SOURCES += ../shared/comm/tty_drv.c
 librtemsbsp_a_SOURCES += ../shared/realmode_int/realmode_int.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
-librtemsbsp_a_SOURCES += console/console_select.c
-librtemsbsp_a_SOURCES += console/console_control.c
-librtemsbsp_a_SOURCES += console/conscfg.c
-librtemsbsp_a_SOURCES += console/printk_support.c
-librtemsbsp_a_SOURCES += console/exar17d15x.c
-librtemsbsp_a_SOURCES += console/rtd316.c
-librtemsbsp_a_SOURCES += console/uart_bus_pci.c
-librtemsbsp_a_SOURCES += console/gdb_select.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/console_select.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/console_control.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/conscfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/printk_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/exar17d15x.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/rtd316.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/uart_bus_pci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/gdb_select.c
 
 # gdb
 librtemsbsp_a_SOURCES += ../shared/comm/i386-stub.c
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index 20102dac31..d294f3503e 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -30,8 +30,8 @@ librtemsbsp_a_SOURCES += ../shared/startup/bspreset.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/lm32/shared/clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += ../shared/console/console.c
-librtemsbsp_a_SOURCES += ../shared/console/uart.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
 
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index 1f1f71422a..feaa61884b 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -24,9 +24,9 @@ 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 += ../../../../../../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
+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
 
 # Cache
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index c96fe93459..4ad8a6a915 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/av5282/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/av5282/console/console.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index cce7610faf..3fd41e5d4c 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -27,8 +27,8 @@ 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
 # console
-librtemsbsp_a_SOURCES += console/console-io.c
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index c3df13693d..ab20c9dda3 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -30,9 +30,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/gen68340/clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += console/m340uart.c
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
+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
 
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index e00a21342e..42b1c51f5f 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -32,8 +32,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/gen68360/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.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
 
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index a20f56ad89..3ba91a7f92 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/genmcf548x/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/console/console.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 12ddd0340f..465a4f8b53 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -32,8 +32,8 @@ 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
 # console
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 # i2c
 librtemsbsp_a_SOURCES += i2c/i2c.c
 librtemsbsp_a_SOURCES += i2c/i2cdrv.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index 98b8993521..c9138f2d66 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -31,9 +31,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf52235/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf52235/console/console.c
 # debugio
-librtemsbsp_a_SOURCES += console/debugio.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf52235/console/debugio.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index 99b996c1f4..f93dd98d5f 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -24,8 +24,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.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 += ../../../../../../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/shared/cache/cache-mcf5225x.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index c4caf60792..abc3b777d2 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES += startup/copyvectors.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5235/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5235/console/console.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index 5a82f8849f..1be86750a6 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5329/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5329/console/console.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 462628eba3..4677565797 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -29,8 +29,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mrm332/clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += console/sci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mrm332/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mrm332/console/sci.c
 # spurious
 librtemsbsp_a_SOURCES += spurious/spinit.c
 # timer
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index d8397be9a4..846c77e37c 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -30,8 +30,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme147/clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.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
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index d6994289b8..f985e5454a 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -32,7 +32,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.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
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 # timer
 librtemsbsp_a_SOURCES += ../mvme147/timer/timer.c
 librtemsbsp_a_SOURCES += ../mvme147/timer/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 8af4d1d415..72313a9473 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme162/clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/console/console.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += timer/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index 1632a35b8b..ac80bf6014 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme167/clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme167/console/console.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += timer/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 237e2096c1..de7e43acb8 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/uC5282/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/uC5282/console/console.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index 58d0ada987..49d28530d0 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -28,8 +28,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/csb350/clock/clockdrv.c
 # console
-librtemsbsp_a_SOURCES += console/console-io.c
-librtemsbsp_a_SOURCES += ../../shared/console-polled.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
 #isr
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index f789d0835e..b3963916a4 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES += startup/usc.S
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/hurricane/clock/ckinit.c
 
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/hurricane/console/console.c
 # liblnk
 librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S
 librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 67b357e470..5b9516beaf 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -27,8 +27,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/jmr3904/clock/clockdrv.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c
-librtemsbsp_a_SOURCES += console/console-io.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
 #isr
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index c875d4b09c..c955b58a4a 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -41,8 +41,8 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/shared/clock/mips_timer.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/conscfg.c
-librtemsbsp_a_SOURCES += console/printk_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/console/conscfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/console/printk_support.c
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index fbf3027670..76b2ef77d1 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES += ../shared/irq/exception.S
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4925/clock/clockdrv.c
 # console
-librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4925/console/console-io.c
 # liblnk
 librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S
 librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index 6061fe10df..6af4ffc71d 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES += ../shared/irq/exception.S
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4938/clock/clockdrv.c
 # console
-librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/console/console-io.c
 # liblnk
 librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S
 librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S
diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index cf68a64180..16ce5b6d5e 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -30,9 +30,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 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
-librtemsbsp_a_SOURCES += console/syscalls.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/moxie/moxiesim/console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/moxie/moxiesim/console/syscalls.S
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index c05ddd151f..2fe8023b42 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -31,8 +31,8 @@ librtemsbsp_a_SOURCES += startup/setvec.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/nios2/nios2_iss/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += ../../shared/console-polled.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
 
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 6ce91f2d65..8b2b05c7e2 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -23,7 +23,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/no_cpu/no_bsp/clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/console/console.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += timer/timerisr.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index 4f1fbe083b..dd8b7a5c75 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -51,8 +51,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/console-config.c
-librtemsbsp_a_SOURCES += console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/console/uart.c
 
 # Timer
 librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index 97219cc82b..bb295f3a80 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -58,8 +58,8 @@ librtemsbsp_a_SOURCES += startup/bspclean.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
 #console
-librtemsbsp_a_SOURCES += ../shared/console/uart.c
-librtemsbsp_a_SOURCES += ../shared/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
 
 #irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 11d011fc34..2138ad053a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -56,7 +56,7 @@ librtemsbsp_a_SOURCES += bestcomm/tasksetup_pci_tx.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/console/console.c
 # i2c
 librtemsbsp_a_SOURCES += i2c/i2c.c
 librtemsbsp_a_SOURCES += i2c/i2cdrv.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index da72a62062..25607537dc 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -51,9 +51,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/console/console-config.c
 
 # bsp_i2c
 librtemsbsp_a_SOURCES += i2c/i2c_init.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index f4718f5e42..be8b8388ad 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -30,8 +30,8 @@ librtemsbsp_a_SOURCES += mmu/mmu_405asm.S
 librtemsbsp_a_SOURCES += dlentry/dlentry.S
 
 # console
-librtemsbsp_a_SOURCES += ../shared/console/uart.c
-librtemsbsp_a_SOURCES += ../shared/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index e459962c7e..3ed73e63c2 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -55,8 +55,8 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c
-librtemsbsp_a_SOURCES += ../shared/console/uart.c
-librtemsbsp_a_SOURCES += ../shared/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
 
 # irq
 librtemsbsp_a_SOURCES += ../shared/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index a33b0c6c23..9f6798c1bb 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -72,10 +72,10 @@ librtemsbsp_a_SOURCES += startup/start-watchdog.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/mpc55xxevb/clock/clock-config.c
 
 # console
-librtemsbsp_a_SOURCES += console/console-config.c
-librtemsbsp_a_SOURCES += console/console-esci.c
-librtemsbsp_a_SOURCES += console/console-generic.c
-librtemsbsp_a_SOURCES += console/console-linflex.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/console/console-esci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/console/console-generic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/console/console-linflex.c
 
 # irq_generic
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index c7b537f8e4..621e61e350 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -25,7 +25,7 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
 
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/console/console.c
 
 # irq
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 38d0197fc8..6491639c3f 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -52,8 +52,8 @@ librtemsbsp_a_SOURCES += tod/todcfg.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../shared/console/uart.c
-librtemsbsp_a_SOURCES += ../shared/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 3c24c3aa9d..6873db182f 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -29,8 +29,8 @@ librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../shared/console/uart.c
-librtemsbsp_a_SOURCES += ../shared/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
 
 # pci
 librtemsbsp_a_SOURCES += pci/pci.c
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 0c7702a5af..5b7e65463e 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -32,10 +32,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 # debugio
-librtemsbsp_a_SOURCES += console/console-io.c
-librtemsbsp_a_SOURCES += console/consupp.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/console/consupp.S
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 8c58ab79b6..9a3099377a 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -31,8 +31,8 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
 # pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c
-librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qemuppc/console/console-io.c
 
 # irq
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index e0c1ce87fc..770df931c6 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -65,11 +65,11 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/uart-bridge-master.c
-librtemsbsp_a_SOURCES += console/uart-bridge-slave.c
-librtemsbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/console/uart-bridge-master.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/console/uart-bridge-slave.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/console/console-config.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 1c5142c263..a9b5397c9f 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -19,7 +19,7 @@ librtemsbsp_a_SOURCES =
 # pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/ss555/clock/p_clock.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/console/console.c
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += startup/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 3815ecce79..5590cf9fcf 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -47,8 +47,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/t32mppc/console/console.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 9589d38e8d..1c0dfe5da3 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -32,7 +32,7 @@ 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
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/console/console.c
 # spi
 librtemsbsp_a_SOURCES += spi/spi.c
 # timer
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 41e0e095c4..f9c98b5ec4 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -41,7 +41,7 @@ librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/consolelite.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex/console/consolelite.c
 
 # irq
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index c15d2b39c8..e8584ac178 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -32,7 +32,7 @@ librtemsbsp_a_SOURCES += start/start.S
 
 # console
 librtemsbsp_a_SOURCES += startup/dummy_console.c
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 5c5931943a..45a5da547d 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
 # console
 librtemsbsp_a_SOURCES += startup/dummy_console.c
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index 356b56064a..48b6634192 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
@@ -48,7 +48,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/riscv/riscv_generic/clock/clockdr
 librtemsbsp_a_SOURCES += timer/timer.c
 
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
@@ -58,7 +58,7 @@ librtemsbsp_a_SOURCES += irq/irq.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 # debugio
-librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/console/console-io.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index d258a65c6e..f128180cbb 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -40,9 +40,9 @@ librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += scitab.c
 # console
 librtemsbsp_a_SOURCES += ../shared/console.c
-librtemsbsp_a_SOURCES += console/sci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/console/sci.c
 # debugio
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index 205e13ca8c..9a67271b6d 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -42,11 +42,11 @@ librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += scitab.c
 # console
 librtemsbsp_a_SOURCES += ../shared/console.c
-librtemsbsp_a_SOURCES += console/config.c
-librtemsbsp_a_SOURCES += console/sci.c
-librtemsbsp_a_SOURCES += console/sci_termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/console/config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/console/sci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/console/sci_termios.c
 # debugio
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index 94c0601cc8..92a9cdf6e7 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -30,9 +30,9 @@ librtemsbsp_a_SOURCES += startup/ispsh7750.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh4/clock/ckinit.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
-librtemsbsp_a_SOURCES += console/sh4uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/console/sh4uart.c
 # hw_init
 librtemsbsp_a_SOURCES += hw_init/hw_init.c
 
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 4d399083a1..edd911aaad 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -32,10 +32,10 @@ librtemsbsp_a_SOURCES += startup/ispshgdb.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
-librtemsbsp_a_SOURCES += console/console-support.S
-librtemsbsp_a_SOURCES += console/console-debugio.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shsim/console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shsim/console/console-support.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shsim/console/console-debugio.c
 
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 89c7cd642b..489772f892 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -44,9 +44,9 @@ librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-librtemsbsp_a_SOURCES += console/erc32_console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/console/erc32_console.c
 # debugio
-librtemsbsp_a_SOURCES += console/debugputs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/console/debugputs.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/erc32/clock/ckinit.c
 # timer
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 4df4cd917f..a20cd32605 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -42,8 +42,8 @@ librtemsbsp_a_SOURCES += ../shared/irq_asm.S
 librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
 librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
 # console
-librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += console/debugputs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/console/debugputs.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/leon2/clock/ckinit.c
 # IRQ
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 6432fcde9a..7c76d726f0 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -67,12 +67,12 @@ librtemsbsp_a_SOURCES += ../shared/timer/tlib_ckinit.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/leon3/clock/ckinit.c
 
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-termios.c
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/console/console.c
 librtemsbsp_a_SOURCES += ../shared/uart/cons.c
 librtemsbsp_a_SOURCES += ../shared/uart/apbuart_cons.c
 # debugio
-librtemsbsp_a_SOURCES += console/printk_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/console/printk_support.c
 
 # IRQ
 librtemsbsp_a_SOURCES += startup/eirq.c
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index 7ff741fe12..a0614da7ba 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -37,7 +37,7 @@ librtemsbsp_a_SOURCES += ../shared/asm/asm.S
 
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc64/shared/clock/ckinit.c
 
-librtemsbsp_a_SOURCES += ../shared/console/conscfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/console/conscfg.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 1e7c503ea0..e693732c05 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -48,7 +48,7 @@ librtemsbsp_a_SOURCES += ../shared/start/trap_table.S
 
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc64/shared/clock/ckinit.c
 
-librtemsbsp_a_SOURCES += ../shared/console/conscfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/console/conscfg.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index 8efdb42f0a..367f838c5d 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -27,8 +27,8 @@ librtemsbsp_a_SOURCES += ../shared/crt1.c
 librtemsbsp_a_SOURCES += startup/trap.S
 
 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/serial/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/v850/gdbv850sim/console/console-io.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 
 # Cache