Changeset b46f943c in rtems

Timestamp:

04/07/18 17:38:55 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

1032bf9

Parents:

efb893f

git-author:

Sebastian Huber <sebastian.huber@…> (04/07/18 17:38:55)

git-committer:

Sebastian Huber <sebastian.huber@…> (04/12/18 05:09:11)

Message:

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.

Files:

• bsps/powerpc/motorola_powerpc/dev/console.inl (moved) (moved from c/src/lib/libbsp/powerpc/shared/console/console.inl)
• bsps/powerpc/motorola_powerpc/dev/keyboard.h (moved) (moved from c/src/lib/libbsp/powerpc/shared/console/keyboard.h)
• bsps/powerpc/motorola_powerpc/dev/polled_io.c (moved) (moved from c/src/lib/libbsp/powerpc/shared/console/polled_io.c) (1 diff)
• c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am (modified) (2 diffs)
• c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am (modified) (1 diff)

bsps/powerpc/motorola_powerpc/dev/polled_io.c

@@ -24 +24 @@
 #include <bsp.h>
 #include <libcpu/spr.h>
+
+#ifndef __BOOT__
+#define STATIC_LOG_ALLOC
+#endif
 
 #ifdef BSP_KBD_IOBASE

c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am

@@ -55 +55 @@
 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
@@ -111 +105 @@
 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

c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am

@@ -14 +14 @@
     ../../../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 \