[rtems commit] bsps: Move console drivers to bsps

Sebastian Huber sebh at rtems.org
Fri Apr 20 13:28:45 UTC 2018


Module:    rtems
Branch:    master
Commit:    d7d66d7d4523b904c8ccc6aea3709dc0d5aa5bdc
Changeset: http://git.rtems.org/rtems/commit/?id=d7d66d7d4523b904c8ccc6aea3709dc0d5aa5bdc

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Apr 19 06:28:01 2018 +0200

bsps: Move console drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

---

 .../arm/altera-cyclone-v/console/console-config.c  |  0
 .../libbsp => bsps}/arm/atsam/console/console.c    |  0
 .../arm/atsam/console/debug-console.c              |  0
 .../arm/beagle/console/console-config.c            |  0
 .../lib/libbsp => bsps}/arm/csb336/console/uart.c  |  0
 .../lib/libbsp => bsps}/arm/csb337/console/dbgu.c  |  0
 .../libbsp => bsps}/arm/csb337/console/fbcons.c    |  0
 .../libbsp => bsps}/arm/csb337/console/sed1356.c   |  0
 .../lib/libbsp => bsps}/arm/csb337/console/uarts.c |  0
 .../lib/libbsp => bsps}/arm/csb337/console/usart.c |  0
 .../lib/libbsp => bsps}/arm/edb7312/console/uart.c |  0
 .../arm/gdbarmsim/console/console-io.c             |  0
 .../libbsp => bsps}/arm/gumstix/console/ffuart.c   |  0
 .../libbsp => bsps}/arm/gumstix/console/uarts.c    |  0
 .../arm/imx/console/console-config.c               |  0
 .../arm/lm3s69xx/console/console-config.c          |  0
 .../libbsp => bsps}/arm/lm3s69xx/console/uart.c    |  0
 .../arm/lpc176x/console/console-config.c           |  0
 .../arm/lpc24xx/console/console-config.c           |  0
 .../arm/lpc24xx/console/uart-probe-1.c             |  0
 .../arm/lpc24xx/console/uart-probe-2.c             |  0
 .../arm/lpc24xx/console/uart-probe-3.c             |  0
 .../arm/lpc32xx/console/console-config.c           |  0
 .../lib/libbsp => bsps}/arm/lpc32xx/console/hsu.c  |  0
 .../arm/raspberrypi/console/console-config.c       |  0
 .../arm/raspberrypi/console/console_select.c       |  2 +-
 .../libbsp => bsps}/arm/raspberrypi/console/fb.c   |  0
 .../arm/raspberrypi/console/fbcons.c               |  0
 .../arm/raspberrypi/console/font_data.h            |  0
 .../arm/raspberrypi/console/outch.c                |  0
 .../arm/raspberrypi/console/usart.c                |  0
 .../arm/realview-pbx-a9/console/console-config.c   |  0
 .../arm/rtl22xx/console/lpc22xx_uart.h             |  0
 .../lib/libbsp => bsps}/arm/rtl22xx/console/uart.c |  0
 .../libbsp => bsps}/arm/smdk2410/console/uart.c    |  0
 .../arm/stm32f4/console/console-config.c           |  0
 .../libbsp => bsps}/arm/stm32f4/console/usart.c    |  0
 .../arm/tms570/console/printk-support.c            |  0
 .../arm/tms570/console/tms570-sci.c                |  0
 .../arm/xilinx-zynq/console/console-config.c       |  0
 .../arm/xilinx-zynq/console/debug-console.c        |  0
 .../arm/xilinx-zynq/console/zynq-uart.c            |  0
 .../bfin/TLL6527M/console/console.c                |  0
 .../bfin/bf537Stamp/console/console.c              |  0
 .../bfin/eZKit533/console/console-io.c             |  0
 .../epiphany/epiphany_sim/console/console-io.c     |  0
 .../libbsp => bsps}/i386/pc386/console/conscfg.c   |  2 +-
 .../i386/pc386/console/console_control.c           |  2 +-
 .../i386/pc386/console/console_select.c            |  2 +-
 .../libbsp => bsps}/i386/pc386/console/defkeymap.c |  0
 .../i386/pc386/console/exar17d15x.c                |  2 +-
 .../libbsp => bsps}/i386/pc386/console/fb_cirrus.c |  0
 .../i386/pc386/console/fb_vesa_rm.c                |  0
 .../libbsp => bsps}/i386/pc386/console/fb_vga.c    |  0
 .../i386/pc386/console/gdb_select.c                |  2 +-
 .../libbsp => bsps}/i386/pc386/console/i386kbd.h   |  0
 .../lib/libbsp => bsps}/i386/pc386/console/inch.c  |  0
 .../i386/pc386/console/kbd_parser.c                |  0
 .../libbsp => bsps}/i386/pc386/console/keyboard.c  |  0
 .../lib/libbsp => bsps}/i386/pc386/console/outch.c |  0
 .../libbsp => bsps}/i386/pc386/console/pc_keyb.c   |  0
 .../i386/pc386/console/printk_support.c            |  2 +-
 .../libbsp => bsps}/i386/pc386/console/ps2_mouse.c |  0
 .../libbsp => bsps}/i386/pc386/console/ps2_mouse.h |  0
 .../libbsp => bsps}/i386/pc386/console/rtd316.c    |  2 +-
 .../i386/pc386/console/serial_mouse_config.c       |  2 +-
 .../i386/pc386/console/uart_bus_pci.c              |  2 +-
 .../libbsp => bsps}/i386/pc386/console/vgacons.c   |  0
 .../libbsp => bsps}/i386/pc386/console/vgainit.c   |  0
 .../libbsp => bsps}/i386/pc386/console/videoAsm.S  |  0
 {c/src/lib/libbsp => bsps}/i386/pc386/console/vt.c |  0
 .../libbsp => bsps}/lm32/shared/console/console.c  |  0
 .../lib/libbsp => bsps}/lm32/shared/console/uart.c |  0
 .../lib/libbsp => bsps}/lm32/shared/console/uart.h |  0
 .../m32c/m32cbsp/console/console-io.c              |  0
 .../m32c/m32cbsp/console/syscalls.S                |  0
 .../libbsp => bsps}/m68k/av5282/console/console.c  |  0
 .../m68k/csb360/console/console-io.c               |  0
 .../m68k/gen68340/console/console.c                |  0
 .../m68k/gen68340/console/m340uart.c               |  0
 .../m68k/gen68360/console/console.c                |  0
 .../m68k/genmcf548x/console/console.c              |  0
 .../m68k/mcf5206elite/console/console.c            |  0
 .../m68k/mcf52235/console/console.c                |  0
 .../m68k/mcf52235/console/debugio.c                |  0
 .../m68k/mcf5225x/console/console.c                |  0
 .../m68k/mcf5225x/console/debugio.c                |  0
 .../libbsp => bsps}/m68k/mcf5235/console/console.c |  0
 .../libbsp => bsps}/m68k/mcf5329/console/console.c |  0
 .../libbsp => bsps}/m68k/mrm332/console/console.c  |  0
 .../lib/libbsp => bsps}/m68k/mrm332/console/sci.c  |  0
 .../lib/libbsp => bsps}/m68k/mrm332/console/sci.h  |  0
 .../libbsp => bsps}/m68k/mvme147/console/console.c |  0
 .../libbsp => bsps}/m68k/mvme162/console/console.c |  0
 .../m68k/mvme167/console/console-recording.h       |  0
 .../libbsp => bsps}/m68k/mvme167/console/console.c |  0
 .../libbsp => bsps}/m68k/uC5282/console/console.c  |  0
 .../mips/csb350/console/console-io.c               |  0
 .../mips/hurricane/console/console.c               |  0
 .../mips/jmr3904/console/console-io.c              |  0
 .../libbsp => bsps}/mips/malta/console/conscfg.c   |  0
 .../mips/malta/console/printk_support.c            |  0
 .../mips/rbtx4925/console/console-io.c             |  0
 .../mips/rbtx4938/console/console-io.c             |  0
 .../mips/rbtx4938/console/yamon_api.h              |  0
 .../moxie/moxiesim/console/console-io.c            |  0
 .../moxie/moxiesim/console/syscalls.S              |  0
 .../nios2/nios2_iss/console/console.c              |  0
 .../no_cpu/no_bsp/console/console.c                |  0
 .../or1k/generic_or1k/console/console-config.c     |  0
 .../or1k/generic_or1k/console/uart.c               |  0
 .../powerpc/gen5200/console/console.c              |  0
 .../powerpc/gen83xx/console/console-config.c       |  0
 .../powerpc/mpc55xxevb/console/console-config.c    |  0
 .../powerpc/mpc55xxevb/console/console-esci.c      |  0
 .../powerpc/mpc55xxevb/console/console-generic.c   |  0
 .../powerpc/mpc55xxevb/console/console-linflex.c   |  0
 .../powerpc/mpc8260ads/console/console.c           |  0
 .../powerpc/psim/console/console-io.c              |  0
 .../libbsp => bsps}/powerpc/psim/console/consupp.S |  0
 .../powerpc/qemuppc/console/console-io.c           |  0
 .../powerpc/qoriq/console/console-config.c         |  0
 .../powerpc/qoriq/console/uart-bridge-master.c     |  0
 .../powerpc/qoriq/console/uart-bridge-slave.c      |  0
 .../powerpc/shared/console/console.c               |  0
 .../libbsp => bsps}/powerpc/shared/console/uart.c  |  0
 .../powerpc/ss555/console/console.c                |  0
 .../powerpc/t32mppc/console/console.c              |  0
 .../powerpc/tqm8xx/console/console.c               |  0
 .../powerpc/virtex/console/consolelite.c           |  0
 .../riscv/riscv_generic/console/console-io.c       |  0
 {c/src/lib/libbsp => bsps}/sh/gensh1/console/sci.c |  0
 .../lib/libbsp => bsps}/sh/gensh2/console/config.c |  0
 {c/src/lib/libbsp => bsps}/sh/gensh2/console/sci.c |  0
 .../sh/gensh2/console/sci_termios.c                |  0
 .../libbsp => bsps}/sh/gensh4/console/console.c    |  0
 .../libbsp => bsps}/sh/gensh4/console/sh4uart.c    |  0
 .../sh/shsim/console/console-debugio.c             |  0
 .../libbsp => bsps}/sh/shsim/console/console-io.c  |  0
 .../sh/shsim/console/console-support.S             |  0
 .../shared/dev/serial}/console-output-char.c       |  0
 .../shared/dev/serial}/console-polled.c            |  0
 .../shared/dev/serial}/console-termios-init.c      |  0
 .../shared/dev/serial}/console-termios.c           |  0
 .../shared/dev/serial/getserialmouseps2.c          |  0
 .../shared/dev/serial/printk-dummy.c               |  0
 .../sparc/erc32/console/debugputs.c                |  0
 .../sparc/erc32/console/erc32_console.c            |  0
 .../libbsp => bsps}/sparc/leon2/console/console.c  |  0
 .../sparc/leon2/console/debugputs.c                |  0
 .../libbsp => bsps}/sparc/leon3/console/console.c  |  0
 .../sparc/leon3/console/printk_support.c           |  0
 .../sparc64/shared/console/conscfg.c               |  0
 .../v850/gdbv850sim/console/console-io.c           |  0
 c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am  |  6 +--
 c/src/lib/libbsp/arm/atsam/Makefile.am             |  6 +--
 c/src/lib/libbsp/arm/beagle/Makefile.am            |  2 +-
 c/src/lib/libbsp/arm/csb336/Makefile.am            |  2 +-
 c/src/lib/libbsp/arm/csb337/Makefile.am            | 10 ++---
 c/src/lib/libbsp/arm/edb7312/Makefile.am           |  2 +-
 c/src/lib/libbsp/arm/gdbarmsim/Makefile.am         |  4 +-
 c/src/lib/libbsp/arm/gumstix/Makefile.am           |  4 +-
 c/src/lib/libbsp/arm/imx/Makefile.am               |  4 +-
 c/src/lib/libbsp/arm/lm3s69xx/Makefile.am          |  4 +-
 c/src/lib/libbsp/arm/lpc176x/Makefile.am           |  6 +--
 c/src/lib/libbsp/arm/lpc24xx/Makefile.am           | 12 +++---
 c/src/lib/libbsp/arm/lpc32xx/Makefile.am           |  8 ++--
 c/src/lib/libbsp/arm/raspberrypi/Makefile.am       | 14 +++----
 c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am   |  8 ++--
 c/src/lib/libbsp/arm/rtl22xx/Makefile.am           |  2 +-
 c/src/lib/libbsp/arm/smdk2410/Makefile.am          |  2 +-
 c/src/lib/libbsp/arm/stm32f4/Makefile.am           |  4 +-
 c/src/lib/libbsp/arm/tms570/Makefile.am            |  6 +--
 c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am       |  8 ++--
 c/src/lib/libbsp/bfin/TLL6527M/Makefile.am         |  2 +-
 c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am       |  2 +-
 c/src/lib/libbsp/bfin/eZKit533/Makefile.am         |  2 +-
 c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am |  4 +-
 c/src/lib/libbsp/i386/pc386/Makefile.am            | 46 +++++++++++-----------
 c/src/lib/libbsp/lm32/lm32_evr/Makefile.am         |  4 +-
 c/src/lib/libbsp/m32c/m32cbsp/Makefile.am          |  6 +--
 c/src/lib/libbsp/m68k/av5282/Makefile.am           |  2 +-
 c/src/lib/libbsp/m68k/csb360/Makefile.am           |  4 +-
 c/src/lib/libbsp/m68k/gen68340/Makefile.am         |  6 +--
 c/src/lib/libbsp/m68k/gen68360/Makefile.am         |  4 +-
 c/src/lib/libbsp/m68k/genmcf548x/Makefile.am       |  2 +-
 c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am     |  4 +-
 c/src/lib/libbsp/m68k/mcf52235/Makefile.am         |  4 +-
 c/src/lib/libbsp/m68k/mcf5225x/Makefile.am         |  4 +-
 c/src/lib/libbsp/m68k/mcf5235/Makefile.am          |  2 +-
 c/src/lib/libbsp/m68k/mcf5329/Makefile.am          |  2 +-
 c/src/lib/libbsp/m68k/mrm332/Makefile.am           |  4 +-
 c/src/lib/libbsp/m68k/mvme147/Makefile.am          |  4 +-
 c/src/lib/libbsp/m68k/mvme147s/Makefile.am         |  2 +-
 c/src/lib/libbsp/m68k/mvme162/Makefile.am          |  2 +-
 c/src/lib/libbsp/m68k/mvme167/Makefile.am          |  2 +-
 c/src/lib/libbsp/m68k/uC5282/Makefile.am           |  2 +-
 c/src/lib/libbsp/mips/csb350/Makefile.am           |  4 +-
 c/src/lib/libbsp/mips/hurricane/Makefile.am        |  2 +-
 c/src/lib/libbsp/mips/jmr3904/Makefile.am          |  4 +-
 c/src/lib/libbsp/mips/malta/Makefile.am            |  4 +-
 c/src/lib/libbsp/mips/rbtx4925/Makefile.am         |  2 +-
 c/src/lib/libbsp/mips/rbtx4938/Makefile.am         |  2 +-
 c/src/lib/libbsp/moxie/moxiesim/Makefile.am        |  6 +--
 c/src/lib/libbsp/nios2/nios2_iss/Makefile.am       |  4 +-
 c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am         |  2 +-
 c/src/lib/libbsp/or1k/generic_or1k/Makefile.am     |  4 +-
 c/src/lib/libbsp/powerpc/beatnik/Makefile.am       |  4 +-
 c/src/lib/libbsp/powerpc/gen5200/Makefile.am       |  2 +-
 c/src/lib/libbsp/powerpc/gen83xx/Makefile.am       |  6 +--
 c/src/lib/libbsp/powerpc/haleakala/Makefile.am     |  4 +-
 .../libbsp/powerpc/motorola_powerpc/Makefile.am    |  4 +-
 c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am    |  8 ++--
 c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am    |  2 +-
 c/src/lib/libbsp/powerpc/mvme3100/Makefile.am      |  4 +-
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am      |  4 +-
 c/src/lib/libbsp/powerpc/psim/Makefile.am          |  6 +--
 c/src/lib/libbsp/powerpc/qemuppc/Makefile.am       |  4 +-
 c/src/lib/libbsp/powerpc/qoriq/Makefile.am         | 10 ++---
 c/src/lib/libbsp/powerpc/ss555/Makefile.am         |  2 +-
 c/src/lib/libbsp/powerpc/t32mppc/Makefile.am       |  4 +-
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am        |  2 +-
 c/src/lib/libbsp/powerpc/virtex/Makefile.am        |  2 +-
 c/src/lib/libbsp/powerpc/virtex4/Makefile.am       |  2 +-
 c/src/lib/libbsp/powerpc/virtex5/Makefile.am       |  2 +-
 c/src/lib/libbsp/riscv/riscv_generic/Makefile.am   |  4 +-
 c/src/lib/libbsp/sh/gensh1/Makefile.am             |  4 +-
 c/src/lib/libbsp/sh/gensh2/Makefile.am             |  8 ++--
 c/src/lib/libbsp/sh/gensh4/Makefile.am             |  6 +--
 c/src/lib/libbsp/sh/shsim/Makefile.am              |  8 ++--
 c/src/lib/libbsp/sparc/erc32/Makefile.am           |  4 +-
 c/src/lib/libbsp/sparc/leon2/Makefile.am           |  4 +-
 c/src/lib/libbsp/sparc/leon3/Makefile.am           |  6 +--
 c/src/lib/libbsp/sparc64/niagara/Makefile.am       |  2 +-
 c/src/lib/libbsp/sparc64/usiii/Makefile.am         |  2 +-
 c/src/lib/libbsp/v850/gdbv850sim/Makefile.am       |  4 +-
 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
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/console/debug-console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb336/console/uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/console/dbgu.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/console/fbcons.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/console/sed1356.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/console/uarts.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/console/usart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/edb7312/console/uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/gdbarmsim/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/console/ffuart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/console/uarts.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/console/uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-1.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-2.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/console/uart-probe-3.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/console/hsu.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/console/console-config.c
rename to 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
similarity index 97%
rename from c/src/lib/libbsp/arm/raspberrypi/console/console_select.c
rename to bsps/arm/raspberrypi/console/console_select.c
index 42c4944..bd246ca 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
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/console/fb.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/console/fbcons.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/console/font_data.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/console/outch.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/console/usart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/rtl22xx/console/lpc22xx_uart.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/rtl22xx/console/uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/console/uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/console/usart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/console/printk-support.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/console/tms570-sci.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/console/debug-console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/console/zynq-uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/bfin/TLL6527M/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/bfin/bf537Stamp/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/bfin/eZKit533/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/epiphany/epiphany_sim/console/console-io.c
rename to 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
similarity index 99%
rename from c/src/lib/libbsp/i386/pc386/console/conscfg.c
rename to bsps/i386/pc386/console/conscfg.c
index 07602a3..a4ae886 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
similarity index 95%
rename from c/src/lib/libbsp/i386/pc386/console/console_control.c
rename to bsps/i386/pc386/console/console_control.c
index 2d1912d..a04ae2bc 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
similarity index 98%
rename from c/src/lib/libbsp/i386/pc386/console/console_select.c
rename to bsps/i386/pc386/console/console_select.c
index bde99a4..1c064fb 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/defkeymap.c
rename to 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
similarity index 98%
rename from c/src/lib/libbsp/i386/pc386/console/exar17d15x.c
rename to bsps/i386/pc386/console/exar17d15x.c
index d9929c3..5cf615a 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/fb_cirrus.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/fb_vga.c
rename to 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
similarity index 98%
rename from c/src/lib/libbsp/i386/pc386/console/gdb_select.c
rename to bsps/i386/pc386/console/gdb_select.c
index adc9969..0fe3b2c 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/i386kbd.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/inch.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/kbd_parser.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/keyboard.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/outch.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/pc_keyb.c
rename to 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
similarity index 95%
rename from c/src/lib/libbsp/i386/pc386/console/printk_support.c
rename to bsps/i386/pc386/console/printk_support.c
index f6ef656..d7bc329 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/ps2_mouse.h
rename to 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
similarity index 97%
rename from c/src/lib/libbsp/i386/pc386/console/rtd316.c
rename to bsps/i386/pc386/console/rtd316.c
index 3b4e3c6..c8f3c3a 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
similarity index 93%
rename from c/src/lib/libbsp/i386/pc386/console/serial_mouse_config.c
rename to bsps/i386/pc386/console/serial_mouse_config.c
index 492d038..a8a0313 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
similarity index 99%
rename from c/src/lib/libbsp/i386/pc386/console/uart_bus_pci.c
rename to bsps/i386/pc386/console/uart_bus_pci.c
index ac0c3bf..2ad8323 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/vgacons.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/vgainit.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/videoAsm.S
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/vt.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/console/uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/console/uart.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m32c/m32cbsp/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m32c/m32cbsp/console/syscalls.S
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/av5282/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/csb360/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/console/m340uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68360/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/genmcf548x/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf52235/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf52235/console/debugio.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5225x/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5225x/console/debugio.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5235/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5329/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mrm332/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mrm332/console/sci.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mrm332/console/sci.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme162/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme167/console/console-recording.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme167/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/uC5282/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/mips/csb350/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/mips/jmr3904/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/console/conscfg.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/console/printk_support.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4925/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4938/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4938/console/yamon_api.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/moxie/moxiesim/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/moxie/moxiesim/console/syscalls.S
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/nios2/nios2_iss/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/no_cpu/no_bsp/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/console/uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/console/consupp.S
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qemuppc/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/console/console-config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/console/uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/ss555/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/t32mppc/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/console/consolelite.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/riscv/riscv_generic/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/console/sci.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/console/config.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/console/sci.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/console/sci_termios.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/console/sh4uart.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/shsim/console/console-debugio.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/shsim/console/console-io.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sh/shsim/console/console-support.S
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/shared/console-output-char.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/shared/console-polled.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/shared/console-termios-init.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/shared/console-termios.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/shared/get-serial-mouse-ps2.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/shared/dummy_printk_support.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/erc32/console/debugputs.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/erc32/console/erc32_console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon2/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon2/console/debugputs.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/console/console.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/console/printk_support.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/console/conscfg.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c
rename to 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 8fff55e..6344934 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 4472869..758b84b 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 079bc3d..9e35129 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 04deee4..45f9ce3 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 23a8797..523f4a5 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 612afe1..6404930 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 83bbda0..68521ca 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 ec5d8c9..d262811 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 c02152f..2d62ed4 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 31ee769..52bbb89 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 49e6620..ba2475f 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 ee2b7b4..a597be7 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 743b072..d076070 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 58cfe1f..106c0b4 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 7f23534..bc1e043 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 da8ef3a..e64bbee 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 a9c4378..748cde9 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 640cb59..760b387 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 3857fc4..106d6c1 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 823c92b..0b468fd 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 a1fedd7..b47be73 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 d86fd55..e8c3e18 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 f74b1d6..d5a0685 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 b90849e..4b001ac 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 37a7203..aa10b8f 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 20102da..d294f35 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 1f1f714..feaa618 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 c96fe93..4ad8a6a 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 cce7610..3fd41e5 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 c3df136..ab20c9d 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 e00a213..42b1c51 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 a20f56a..3ba91a7 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 12ddd03..465a4f8 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 98b8993..c9138f2 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 99b996c..f93dd98 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 c4caf60..abc3b77 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 5a82f88..1be8675 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 462628e..4677565 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 d8397be..846c77e 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 d699428..f985e54 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 8af4d1d..72313a9 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 1632a35..ac80bf6 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 237e209..de7e43a 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 58d0ada..49d2853 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 f789d08..b396391 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 67b357e..5b9516b 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 c875d4b..c955b58 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 fbf3027..76b2ef7 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 6061fe1..6af4ffc 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 cf68a64..16ce5b6 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 c05ddd1..2fe8023 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 6ce91f2..8b2b05c 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 4f1fbe0..dd8b7a5 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 97219cc..bb295f3 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 11d011f..2138ad0 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 da72a62..2560753 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 f4718f5..be8b838 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 e459962..3ed73e6 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 a33b0c6..9f6798c 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 c7b537f..621e61e 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 38d0197..6491639 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 3c24c3a..6873db1 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 0c7702a..5b7e654 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 8c58ab7..9a30993 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 e0c1ce8..770df93 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 1c5142c..a9b5397 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 3815ecc..5590cf9 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 9589d38..1c0dfe5 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 41e0e09..f9c98b5 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 c15d2b3..e8584ac 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 5c59319..45a5da5 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 356b560..48b6634 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 d258a65..f128180 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 205e13c..9a67271 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 94c0601..92a9cdf 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 4d39908..edd911a 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 89c7cd6..489772f 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 4df4cd9..a20cd32 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 6432fcd..7c76d72 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 7ff741f..a0614da 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 1e7c503..e693732 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 8efdb42..367f838 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




More information about the vc mailing list