summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/motorola_powerpc
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-04-07 19:38:55 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-04-12 07:09:11 +0200
commitb46f943c56a3bc5fafaa2ec475577da6fa8f3475 (patch)
tree7cc3db0cb7b818cc537addb1d225dc61c4898cf7 /c/src/lib/libbsp/powerpc/motorola_powerpc
parentbsp/beatnik: Avoid RTEMS_RELLDFLAGS (diff)
downloadrtems-b46f943c56a3bc5fafaa2ec475577da6fa8f3475.tar.bz2
bsp/motorola_powerpc: Move polled_io.c
This file was used by this BSP only. Avoid RTEMS_RELLDFLAGS. This patch is a part of the BSP source reorganization. Update #3285.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc')
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am2
2 files changed, 2 insertions, 11 deletions
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 \