diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-24 07:06:36 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-24 10:24:18 +0200 |
commit | 03e1d8378ecee81bd6ac40b41145c36dfd8752a4 (patch) | |
tree | bae7c12cdecdbb64a969c9db98526cb5ed47a512 | |
parent | bsps/arm: Remove unused shared/comm/uart.c (diff) | |
download | rtems-03e1d8378ecee81bd6ac40b41145c36dfd8752a4.tar.bz2 |
bsps/powerpc: Move bootloader to bsps
This bootloader is only used by the motorola_powerpc BSP.
This patch is a part of the BSP source reorganization.
Update #3285.
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/README (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/README) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/bootldr.h (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/em86.c (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/em86.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/em86real.S (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/exception.S (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/exception.S) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/head.S (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/head.S) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/lib.c (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/lib.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/misc.c (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/misc.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/mm.c (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/mm.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/pci.c (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/pci.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/pci.h (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/pci.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/ppcboot.lds) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/qemu_fakeres.c (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakeres.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/qemu_fakerom.S (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakerom.S) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/zlib.c (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/bootloader/zlib.h (renamed from c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/console/console.inl (renamed from bsps/powerpc/motorola_powerpc/dev/console.inl) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/console/keyboard.h (renamed from bsps/powerpc/motorola_powerpc/dev/keyboard.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/console/polled_io.c (renamed from bsps/powerpc/motorola_powerpc/dev/polled_io.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am | 25 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am | 4 |
22 files changed, 16 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/README b/bsps/powerpc/motorola_powerpc/bootloader/README index 23af0c9a9e..23af0c9a9e 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/README +++ b/bsps/powerpc/motorola_powerpc/bootloader/README diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h b/bsps/powerpc/motorola_powerpc/bootloader/bootldr.h index c2e95d53a5..c2e95d53a5 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h +++ b/bsps/powerpc/motorola_powerpc/bootloader/bootldr.h diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c b/bsps/powerpc/motorola_powerpc/bootloader/em86.c index 5ce4b0cc34..5ce4b0cc34 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c +++ b/bsps/powerpc/motorola_powerpc/bootloader/em86.c diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S b/bsps/powerpc/motorola_powerpc/bootloader/em86real.S index e640541fe2..e640541fe2 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S +++ b/bsps/powerpc/motorola_powerpc/bootloader/em86real.S diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S b/bsps/powerpc/motorola_powerpc/bootloader/exception.S index 0442354552..0442354552 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S +++ b/bsps/powerpc/motorola_powerpc/bootloader/exception.S diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S b/bsps/powerpc/motorola_powerpc/bootloader/head.S index 974b78a51c..974b78a51c 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S +++ b/bsps/powerpc/motorola_powerpc/bootloader/head.S diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c b/bsps/powerpc/motorola_powerpc/bootloader/lib.c index a414c486a9..a414c486a9 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c +++ b/bsps/powerpc/motorola_powerpc/bootloader/lib.c diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/bsps/powerpc/motorola_powerpc/bootloader/misc.c index 508467209b..508467209b 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c +++ b/bsps/powerpc/motorola_powerpc/bootloader/misc.c diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c b/bsps/powerpc/motorola_powerpc/bootloader/mm.c index e954218ab1..e954218ab1 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c +++ b/bsps/powerpc/motorola_powerpc/bootloader/mm.c diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/bsps/powerpc/motorola_powerpc/bootloader/pci.c index c9daca419c..c9daca419c 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c +++ b/bsps/powerpc/motorola_powerpc/bootloader/pci.c diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h b/bsps/powerpc/motorola_powerpc/bootloader/pci.h index 4281a13090..4281a13090 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h +++ b/bsps/powerpc/motorola_powerpc/bootloader/pci.h diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/ppcboot.lds b/bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds index b47e01f172..b47e01f172 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/ppcboot.lds +++ b/bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakeres.c b/bsps/powerpc/motorola_powerpc/bootloader/qemu_fakeres.c index 51f03a070f..51f03a070f 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakeres.c +++ b/bsps/powerpc/motorola_powerpc/bootloader/qemu_fakeres.c diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakerom.S b/bsps/powerpc/motorola_powerpc/bootloader/qemu_fakerom.S index b77c3bd138..b77c3bd138 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakerom.S +++ b/bsps/powerpc/motorola_powerpc/bootloader/qemu_fakerom.S diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c b/bsps/powerpc/motorola_powerpc/bootloader/zlib.c index 9d7efe6afc..9d7efe6afc 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c +++ b/bsps/powerpc/motorola_powerpc/bootloader/zlib.c diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h b/bsps/powerpc/motorola_powerpc/bootloader/zlib.h index f778b3dcd5..f778b3dcd5 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h +++ b/bsps/powerpc/motorola_powerpc/bootloader/zlib.h diff --git a/bsps/powerpc/motorola_powerpc/dev/console.inl b/bsps/powerpc/motorola_powerpc/console/console.inl index 177444e870..177444e870 100644 --- a/bsps/powerpc/motorola_powerpc/dev/console.inl +++ b/bsps/powerpc/motorola_powerpc/console/console.inl diff --git a/bsps/powerpc/motorola_powerpc/dev/keyboard.h b/bsps/powerpc/motorola_powerpc/console/keyboard.h index 0a38d0136d..0a38d0136d 100644 --- a/bsps/powerpc/motorola_powerpc/dev/keyboard.h +++ b/bsps/powerpc/motorola_powerpc/console/keyboard.h diff --git a/bsps/powerpc/motorola_powerpc/dev/polled_io.c b/bsps/powerpc/motorola_powerpc/console/polled_io.c index c718459f13..c718459f13 100644 --- a/bsps/powerpc/motorola_powerpc/dev/polled_io.c +++ b/bsps/powerpc/motorola_powerpc/console/polled_io.c diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index fba8eefc01..5560b1f96f 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -54,7 +54,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/rtc/todcfg.c librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c # console -librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/console/polled_io.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c 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 052b4f2ccc..f522135436 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am @@ -5,16 +5,17 @@ AUTOMAKE_OPTIONS = no-exeext noinst_PROGRAMS = bootloader ## IMPORTANT: head.S must be first, T. Straumann 12/17/2001 -bootloader_SOURCES = ../../../powerpc/shared/bootloader/head.S \ - ../../../powerpc/shared/bootloader/exception.S \ - ../../../powerpc/shared/bootloader/em86real.S \ - ../../../powerpc/shared/bootloader/misc.c \ - ../../../powerpc/shared/bootloader/pci.c \ - ../../../powerpc/shared/bootloader/zlib.c \ - ../../../powerpc/shared/bootloader/mm.c \ - ../../../powerpc/shared/bootloader/em86.c \ - ../../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c \ - ../../../powerpc/shared/bootloader/lib.c +bootloader_SOURCES = +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/head.S +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/exception.S +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/em86real.S +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/misc.c +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/pci.c +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/zlib.c +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/mm.c +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/em86.c +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/console/polled_io.c +bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/lib.c # ---- # Remove references to EABI when compiling bootloader @@ -43,7 +44,7 @@ bootloader.$(OBJEXT): bootloader$(EXEEXT) cp $< $@ project_lib_DATA = bootloader.$(OBJEXT) -project_lib_DATA += ../../shared/bootloader/ppcboot.lds +project_lib_DATA += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds all-local: $(TMPINSTALL_FILES) @@ -58,7 +59,7 @@ $(PROJECT_LIB)/bootloader.$(OBJEXT): bootloader.$(OBJEXT) $(PROJECT_LIB)/$(dirst $(INSTALL_DATA) $< $(PROJECT_LIB)/bootloader.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/bootloader.$(OBJEXT) -$(PROJECT_LIB)/ppcboot.lds: ../../shared/bootloader/ppcboot.lds $(PROJECT_LIB)/$(dirstamp) +$(PROJECT_LIB)/ppcboot.lds: ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/ppcboot.lds TMPINSTALL_FILES += $(PROJECT_LIB)/ppcboot.lds diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am index 7a5730a9d6..591cb899d3 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am @@ -12,10 +12,10 @@ project_lib_DATA += qemu_fakerom.bin ## IMPORTANT: head.S must be first, T. Straumann 12/17/2001 -qemu_fakerom.$(OBJEXT): ../../../powerpc/shared/bootloader/qemu_fakerom.S +qemu_fakerom.$(OBJEXT): ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/qemu_fakerom.S $(CPPASCOMPILE) -c -o $@ $^ -qemu_fakeres.$(OBJEXT): ../../../powerpc/shared/bootloader/qemu_fakeres.c +qemu_fakeres.$(OBJEXT): ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/qemu_fakeres.c $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $@ $^ qemu_fakerom.elf: qemu_fakerom.$(OBJEXT) qemu_fakeres.$(OBJEXT) |