This file was used by this BSP only. Avoid RTEMS_RELLDFLAGS.
This patch is a part of the BSP source reorganization.
Update #3285.
---
.../console => bsps/powerpc/motorola_powerpc/dev}/console.inl | 0
.../console => bsps/powerpc/motorola_powerpc/dev}/keyboard.h | 0
.../console => bsps/powerpc/motorola_powerpc/dev}/polled_io.c | 4 ++++
c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 11 +----------
.../libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am | 2 +-
5 files changed, 6 insertions(+), 11 deletions(-)
rename {c/src/lib/libbsp/powerpc/shared/console =>
bsps/powerpc/motorola_powerpc/dev}/console.inl (100%)
rename {c/src/lib/libbsp/powerpc/shared/console =>
bsps/powerpc/motorola_powerpc/dev}/keyboard.h (100%)
rename {c/src/lib/libbsp/powerpc/shared/console =>
bsps/powerpc/motorola_powerpc/dev}/polled_io.c (99%)
diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.inl
b/bsps/powerpc/motorola_powerpc/dev/console.inl
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/console/console.inl
rename to bsps/powerpc/motorola_powerpc/dev/console.inl
diff --git a/c/src/lib/libbsp/powerpc/shared/console/keyboard.h
b/bsps/powerpc/motorola_powerpc/dev/keyboard.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/console/keyboard.h
rename to bsps/powerpc/motorola_powerpc/dev/keyboard.h
diff --git a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c
b/bsps/powerpc/motorola_powerpc/dev/polled_io.c
similarity index 99%
rename from c/src/lib/libbsp/powerpc/shared/console/polled_io.c
rename to bsps/powerpc/motorola_powerpc/dev/polled_io.c
index 331515b9ef..c718459f13 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c
+++ b/bsps/powerpc/motorola_powerpc/dev/polled_io.c
@@ -24,6 +24,10 @@
#include <bsp.h>
#include <libcpu/spr.h>
+#ifndef __BOOT__
+#define STATIC_LOG_ALLOC
+#endif
+
#ifdef BSP_KBD_IOBASE
#define USE_KBD_SUPPORT
#endif
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 75e4332284..4fd24a3978 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -54,14 +54,8 @@ librtemsbsp_a_SOURCES += ../../shared/tod.c
../../powerpc/shared/tod/todcfg.c
# pclock
librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
-# Needs conditional compilation
-polledIO_CPPFLAGS = -DSTATIC_LOG_ALLOC
-noinst_PROGRAMS += polledIO.rel
-polledIO_rel_SOURCES = ../../powerpc/shared/console/polled_io.c
-polledIO_rel_CPPFLAGS = $(AM_CPPFLAGS) $(polledIO_CPPFLAGS)
-polledIO_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
# console
+librtemsbsp_a_SOURCES +=
../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c
librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
librtemsbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
@@ -110,9 +104,6 @@ librtemsbsp_a_SOURCES +=
../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
librtemsbsp_a_SOURCES +=
../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
-librtemsbsp_a_LIBADD = polledIO.rel
-
-
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
include $(top_srcdir)/../../../../automake/subdirs.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
index 97f4925f0e..ba22593785 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -13,7 +13,7 @@ bootloader_SOURCES =
../../../powerpc/shared/bootloader/head.S \
../../../powerpc/shared/bootloader/zlib.c \
../../../powerpc/shared/bootloader/mm.c \
../../../powerpc/shared/bootloader/em86.c \
- ../../../powerpc/shared/console/polled_io.c \
+ ../../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c \
../../../powerpc/shared/bootloader/lib.c \
../../../powerpc/shared/bootloader/bootldr.h \
../../../powerpc/shared/bootloader/zlib.h \
--
2.12.3
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
