bsps: Move console drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

62 files changed, 58 insertions, 58 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/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