diff options
| author | Joel Sherrill <joel@rtems.org> | 2018-03-28 11:17:45 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2018-03-28 11:17:45 -0500 |
| commit | 0b8a6d77a894fcfd5ba92b64ae1d66faff57c0c7 (patch) | |
| tree | 5846fe63910f384228b72d48346a33100e0d841c /c | |
| parent | bsps/riscv: Fix warnings (diff) | |
| download | rtems-0b8a6d77a894fcfd5ba92b64ae1d66faff57c0c7.tar.bz2 | |
Eliminate PowerPC libcpu/page.h
Started to eliminate warnings and then realized that only one one-line
macro in the file was used by a few files. The rest of the file was
was not needed. Eliminate the file.
Closes #3354.
Diffstat (limited to 'c')
5 files changed, 9 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c index 111e02bd9e..508467209b 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c @@ -19,11 +19,13 @@ #include "bootldr.h" #include <libcpu/spr.h> #include "zlib.h" -#include <libcpu/page.h> #include <libcpu/byteorder.h> #include <rtems/bspIo.h> #include <bsp.h> +/* to align the pointer to the (next) page boundary */ +#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) + SPR_RO(PPC_PVR) struct inode; diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c b/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c index ea3cdde529..e954218ab1 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c @@ -41,9 +41,11 @@ #include <libcpu/spr.h> #include "bootldr.h" #include <libcpu/mmu.h> -#include <libcpu/page.h> #include <limits.h> +/* to align the pointer to the (next) page boundary */ +#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) + extern void (tlb_handlers)(void); extern void (_handler_glue)(void); diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c index 0c9472eb30..c9daca419c 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c @@ -19,7 +19,6 @@ #include "bootldr.h" #include "pci.h" #include <libcpu/io.h> -#include <libcpu/page.h> #include <bsp/consoleIo.h> #include <string.h> #include <bsp.h> 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 1086e59468..331515b9ef 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c +++ b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c @@ -16,7 +16,6 @@ #include <rtems/system.h> #include <sys/types.h> #include <libcpu/byteorder.h> -#include <libcpu/page.h> #include <libcpu/mmu.h> #include <libcpu/io.h> #include <string.h> diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c index 66bb8efb29..8a8407bd49 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c @@ -1,6 +1,5 @@ #include <rtems.h> #include <libcpu/mmu.h> -#include <libcpu/page.h> #include <rtems/bspIo.h> #include <libcpu/pte121.h> @@ -15,6 +14,9 @@ * Also, the 'setup' routine must reduce * *pmemsize by the size of the page table. */ +/* to align the pointer to the (next) page boundary */ +#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) + /* * Authorship |