From 7a8e71bd708ac77653b578c250e76c4c3271ca92 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 24 Apr 2018 07:36:46 +0200 Subject: [PATCH] bsps/i386: Move shared files to bsps This patch is a part of the BSP source reorganization. Update #3285. --- .../comm => bsps/i386/pc386/console}/GDB.HOWTO | 0 .../comm => bsps/i386/pc386/console}/gdb_glue.c | 0 .../i386/pc386/console}/i386-stub-glue.c | 2 +- .../comm => bsps/i386/pc386/console}/i386-stub.c | 0 .../comm => bsps/i386/pc386/console}/tty_drv.c | 0 .../comm => bsps/i386/pc386/console}/uart.c | 0 .../README => bsps/i386/pc386/start/README-SMP | 0 .../smp => bsps/i386/pc386/start}/getcpuid.c | 0 .../i386/pc386/start}/realmode_int.c | 0 .../smp => bsps/i386/pc386/start}/smp-imps.c | 0 c/src/lib/libbsp/i386/pc386/Makefile.am | 16 ++++++++-------- 11 files changed, 9 insertions(+), 9 deletions(-) rename {c/src/lib/libbsp/i386/shared/comm => bsps/i386/pc386/console}/GDB.HOWTO (100%) rename {c/src/lib/libbsp/i386/shared/comm => bsps/i386/pc386/console}/gdb_glue.c (100%) rename {c/src/lib/libbsp/i386/shared/comm => bsps/i386/pc386/console}/i386-stub-glue.c (99%) rename {c/src/lib/libbsp/i386/shared/comm => bsps/i386/pc386/console}/i386-stub.c (100%) rename {c/src/lib/libbsp/i386/shared/comm => bsps/i386/pc386/console}/tty_drv.c (100%) rename {c/src/lib/libbsp/i386/shared/comm => bsps/i386/pc386/console}/uart.c (100%) rename c/src/lib/libbsp/i386/shared/smp/README => bsps/i386/pc386/start/README-SMP (100%) rename {c/src/lib/libbsp/i386/shared/smp => bsps/i386/pc386/start}/getcpuid.c (100%) rename {c/src/lib/libbsp/i386/shared/realmode_int => bsps/i386/pc386/start}/realmode_int.c (100%) rename {c/src/lib/libbsp/i386/shared/smp => bsps/i386/pc386/start}/smp-imps.c (100%) diff --git a/c/src/lib/libbsp/i386/shared/comm/GDB.HOWTO b/bsps/i386/pc386/console/GDB.HOWTO similarity index 100% rename from c/src/lib/libbsp/i386/shared/comm/GDB.HOWTO rename to bsps/i386/pc386/console/GDB.HOWTO diff --git a/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c b/bsps/i386/pc386/console/gdb_glue.c similarity index 100% rename from c/src/lib/libbsp/i386/shared/comm/gdb_glue.c rename to bsps/i386/pc386/console/gdb_glue.c diff --git a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c b/bsps/i386/pc386/console/i386-stub-glue.c similarity index 99% rename from c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c rename to bsps/i386/pc386/console/i386-stub-glue.c index 96105e8a21..868ae6384d 100644 --- a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c +++ b/bsps/i386/pc386/console/i386-stub-glue.c @@ -12,7 +12,7 @@ #include #include -#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" +#include "../../../shared/dev/serial/legacy-console.h" int putDebugChar(int ch); /* write a single character */ int getDebugChar(void); /* read and return a single char */ diff --git a/c/src/lib/libbsp/i386/shared/comm/i386-stub.c b/bsps/i386/pc386/console/i386-stub.c similarity index 100% rename from c/src/lib/libbsp/i386/shared/comm/i386-stub.c rename to bsps/i386/pc386/console/i386-stub.c diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c b/bsps/i386/pc386/console/tty_drv.c similarity index 100% rename from c/src/lib/libbsp/i386/shared/comm/tty_drv.c rename to bsps/i386/pc386/console/tty_drv.c diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/bsps/i386/pc386/console/uart.c similarity index 100% rename from c/src/lib/libbsp/i386/shared/comm/uart.c rename to bsps/i386/pc386/console/uart.c diff --git a/c/src/lib/libbsp/i386/shared/smp/README b/bsps/i386/pc386/start/README-SMP similarity index 100% rename from c/src/lib/libbsp/i386/shared/smp/README rename to bsps/i386/pc386/start/README-SMP diff --git a/c/src/lib/libbsp/i386/shared/smp/getcpuid.c b/bsps/i386/pc386/start/getcpuid.c similarity index 100% rename from c/src/lib/libbsp/i386/shared/smp/getcpuid.c rename to bsps/i386/pc386/start/getcpuid.c diff --git a/c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.c b/bsps/i386/pc386/start/realmode_int.c similarity index 100% rename from c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.c rename to bsps/i386/pc386/start/realmode_int.c diff --git a/c/src/lib/libbsp/i386/shared/smp/smp-imps.c b/bsps/i386/pc386/start/smp-imps.c similarity index 100% rename from c/src/lib/libbsp/i386/shared/smp/smp-imps.c rename to bsps/i386/pc386/start/smp-imps.c diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index b15092e7f9..94eef01035 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -77,9 +77,9 @@ endif # console (non-graphics support) 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/i386/pc386/console/uart.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/tty_drv.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/realmode_int.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/console_select.c librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/console_control.c @@ -91,9 +91,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/uart_bus_pci. librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/gdb_select.c # gdb -librtemsbsp_a_SOURCES += ../shared/comm/i386-stub.c -librtemsbsp_a_SOURCES += ../shared/comm/i386-stub-glue.c -librtemsbsp_a_SOURCES += ../shared/comm/gdb_glue.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/i386-stub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/i386-stub-glue.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/console/gdb_glue.c # gnat @@ -132,8 +132,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/ata/idecfg.c endif if HAS_SMP -librtemsbsp_a_SOURCES += ../shared/smp/getcpuid.c -librtemsbsp_a_SOURCES += ../shared/smp/smp-imps.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/getcpuid.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/smp-imps.c project_lib_DATA += appstart.$(OBJEXT) appcpustart.$(OBJEXT): ../../../../../../bsps/i386/pc386/start/start16.S