diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-07 19:38:55 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-12 07:09:11 +0200 |
commit | b46f943c56a3bc5fafaa2ec475577da6fa8f3475 (patch) | |
tree | 7cc3db0cb7b818cc537addb1d225dc61c4898cf7 /c/src/lib/libbsp/powerpc | |
parent | bsp/beatnik: Avoid RTEMS_RELLDFLAGS (diff) | |
download | rtems-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 '')
-rw-r--r-- | bsps/powerpc/motorola_powerpc/dev/console.inl (renamed from c/src/lib/libbsp/powerpc/shared/console/console.inl) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/dev/keyboard.h (renamed from c/src/lib/libbsp/powerpc/shared/console/keyboard.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/dev/polled_io.c (renamed from c/src/lib/libbsp/powerpc/shared/console/polled_io.c) | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.inl b/bsps/powerpc/motorola_powerpc/dev/console.inl index 177444e870..177444e870 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/console.inl +++ b/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 index 0a38d0136d..0a38d0136d 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/keyboard.h +++ b/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 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 \ |