diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-04-18 20:55:13 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-04-18 20:55:13 +0000 |
commit | cd35cf9fb3eb0d3af1fe56102db7e46ace3f1e5d (patch) | |
tree | fe76fd577d11b153bf0817edd1f529f2eef14702 /c/src/lib/libbsp | |
parent | 2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-cd35cf9fb3eb0d3af1fe56102db7e46ace3f1e5d.tar.bz2 |
2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bootloader/exception.S: Reflect changes to <rtems/score/cpu.h>.
* bootloader/head.S: Ditto.
* bootloader/misc.c: Ditto.
* console/polled_io.c: Ditto.
* irq/irq.c: Ditto.
* irq/irq_asm.S: Ditto.
* irq/irq_init.c: Include <rtems/bspIo.h>.
* start/start.S: Reflect changes to <rtems/score/cpu.h>.
* vectors/vectors.S: Ditto.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/ChangeLog | 12 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/exception.S | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/head.S | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/misc.c | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/console/polled_io.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/irq/irq.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/irq/irq_init.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/start/start.S | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/vectors/vectors.S | 5 |
10 files changed, 28 insertions, 17 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog index b0486a29ab..e578413fe4 100644 --- a/c/src/lib/libbsp/powerpc/shared/ChangeLog +++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog @@ -1,3 +1,15 @@ + vendor/device/instance. + +2001-05-09 Joel Sherrill <joel@OARcorp.com> + + * startup/linkcmds: In support of gcc 3.1, added one of more + of the sections .jcr, .rodata*, .data.*, .gnu.linkonce.s2.*, + .gnu.linkonce.sb2.*, and .gnu.linkonce.s.*. Spacing corrections + and direction of segments to memory regions may also have been + addressed. This was a sweep across all BSPs. + +2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * bootloader/exception.S: Reflect changes to <rtems/score/cpu.h>. * bootloader/head.S: Ditto. * bootloader/misc.c: Ditto. diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S b/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S index 5835ea48a2..ad43683507 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S @@ -104,8 +104,8 @@ */ #define DIRTY_MEANS_WRITABLE -#include <libcpu/cpu.h> -#include "asm.h" +#include <asm.h> +#include <rtems/score/cpu.h> #include "bootldr.h" /* diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S index 232232be50..abc5737d43 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S @@ -15,10 +15,9 @@ * $Id$ */ +#include <asm.h> +#include <rtems/score/cpu.h> #include "bootldr.h" -#include <libcpu/cpu.h> -#include <rtems/score/targopts.h> -#include "asm.h" #undef TEST_PPCBUG_CALLS #define FRAME_SIZE 32 diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c index e71858bc83..88b7528fca 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c @@ -15,14 +15,15 @@ * $Id$ */ +#include <rtems/system.h> #include <sys/types.h> #include <string.h> -#include <libcpu/cpu.h> #include "bootldr.h" #include <libcpu/spr.h> #include "zlib.h" #include <libcpu/page.h> #include <libcpu/byteorder.h> +#include <rtems/bspIo.h> SPR_RW(DEC) SPR_RO(PVR) diff --git a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c index ecd6dd5f88..2f1a399e71 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c +++ b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c @@ -15,10 +15,10 @@ * $Id$ */ +#include <rtems/system.h> #include <sys/types.h> #include <libcpu/byteorder.h> #include <libcpu/page.h> -#include <libcpu/cpu.h> #include <libcpu/mmu.h> #include "keyboard.h" #include <libcpu/io.h> diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.c b/c/src/lib/libbsp/powerpc/shared/irq/irq.c index 4c2226a48f..b2c97de842 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.c @@ -11,6 +11,7 @@ * $Id$ */ +#include <rtems/system.h> #include <bsp.h> #include <bsp/irq.h> #include <bsp/openpic.h> @@ -18,7 +19,6 @@ #include <rtems/score/apiext.h> #include <libcpu/raw_exception.h> #include <bsp/vectors.h> -#include <libcpu/cpu.h> #define RAVEN_INTR_ACK_REG 0xfeff0030 diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S index 914ab67a4d..9a44367deb 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S +++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S @@ -13,11 +13,10 @@ * $Id$ */ +#include <asm.h> +#include <rtems/score/cpu.h> #include <bsp/vectors.h> -#include <libcpu/cpu.h> #include <libcpu/raw_exception.h> -#include <rtems/score/cpuopts.h> /* for PPC_HAS_FPU */ -#include "asm.h" #define SYNC \ diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c index 1dd30bc583..00ad78b319 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c @@ -14,6 +14,7 @@ * * $Id$ */ + #include <bsp/consoleIo.h> #include <libcpu/io.h> #include <libcpu/spr.h> @@ -24,6 +25,7 @@ #include <bsp.h> #include <libcpu/raw_exception.h> #include <bsp/motorola.h> +#include <rtems/bspIo.h> /* #define SHOW_ISA_PCI_BRIDGE_SETTINGS diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S index 845dbf7d58..f2cedc9a6c 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/start.S +++ b/c/src/lib/libbsp/powerpc/shared/start/start.S @@ -11,10 +11,9 @@ * */ -#include <libcpu/cpu.h> +#include <asm.h> +#include <rtems/score/cpu.h> #include <libcpu/io.h> -#include <asm.h> /* for targopts.h and PPC_HAS_FPU */ -#include <rtems/score/cpu.h> /* for CPU_MINIMUM_STACK_FRAME_SIZE */ #define SYNC \ sync; \ diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S index fca0cbfac1..d33f8549fb 100644 --- a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S +++ b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S @@ -10,10 +10,9 @@ +#include <asm.h> +#include <rtems/score/cpu.h> #include <bsp/vectors.h> -#include <libcpu/cpu.h> -#include <rtems/score/targopts.h> -#include "asm.h" #define SYNC \ |