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.

8 files changed, 13 insertions, 76 deletions

diff --git a/bsps/powerpc/beatnik/include/bsp.h b/bsps/powerpc/beatnik/include/bsp.h
index 8301b975da..4a475eb783 100644
--- a/bsps/powerpc/beatnik/include/bsp.h
+++ b/bsps/powerpc/beatnik/include/bsp.h
@@ -133,11 +133,11 @@ extern void BSP_motload_pci_fixup(void);
 #define BSP_I2C_THM_NAME              BSP_I2C_DS1621_NAME
 #define BSP_I2C_DS1621_RAW_NAME       "ds1621-raw"
 
-#define  BSP_I2C_VPD_EEPROM_DEV_NAME      (BSP_I2C_BUS0_NAME ", "BSP_I2C_VPD_EEPROM_NAME)
-#define  BSP_I2C_USR_EEPROM_DEV_NAME      (BSP_I2C_BUS0_NAME ", "BSP_I2C_USR_EEPROM_NAME)
-#define  BSP_I2C_DS1621_DEV_NAME          (BSP_I2C_BUS0_NAME ", "BSP_I2C_DS1621_NAME)
+#define  BSP_I2C_VPD_EEPROM_DEV_NAME      (BSP_I2C_BUS0_NAME ", " BSP_I2C_VPD_EEPROM_NAME)
+#define  BSP_I2C_USR_EEPROM_DEV_NAME      (BSP_I2C_BUS0_NAME ", " BSP_I2C_USR_EEPROM_NAME)
+#define  BSP_I2C_DS1621_DEV_NAME          (BSP_I2C_BUS0_NAME ", " BSP_I2C_DS1621_NAME)
 #define BSP_I2C_THM_DEV_NAME              BSP_I2C_DS1621_DEV_NAME
-#define  BSP_I2C_DS1621_RAW_DEV_NAME      (BSP_I2C_BUS0_NAME ", "BSP_I2C_DS1621_RAW_NAME)
+#define  BSP_I2C_DS1621_RAW_DEV_NAME      (BSP_I2C_BUS0_NAME ", " BSP_I2C_DS1621_RAW_NAME)
 
 
 /* Initialize the I2C driver and register all devices 
diff --git a/bsps/powerpc/headers.am b/bsps/powerpc/headers.am
index cb54160139..17122404e3 100644
--- a/bsps/powerpc/headers.am
+++ b/bsps/powerpc/headers.am
@@ -37,7 +37,6 @@ include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/e500_mmu.h
 include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/io.h
 include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/irq.h
 include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/mmu.h
-include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/page.h
 include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/pgtable.h
 include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/powerpc-utility.h
 include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/pte121.h
diff --git a/bsps/powerpc/include/libcpu/page.h b/bsps/powerpc/include/libcpu/page.h
deleted file mode 100644
index 3efbdef5bc..0000000000
--- a/bsps/powerpc/include/libcpu/page.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * page.h
- *
- *	PowerPC memory management structures
- *
- * It is a stripped down version of linux ppc file...
- *
- * Copyright (C) 1999  Eric Valette (valette@crf.canon.fr)
- *                     Canon Centre Recherche France.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef _LIBCPU_PAGE_H
-#define _LIBCPU_PAGE_H
-
-/* PAGE_SHIFT determines the page size */
-#define PAGE_SHIFT	12
-#define PAGE_SIZE	(1UL << PAGE_SHIFT)
-#define PAGE_MASK	(~(PAGE_SIZE-1))
-
-#define PAGE_OFFSET	0xc0000000
-
-
-#ifndef ASM
-/*
- * .. while these make it easier on the compiler
- */
-typedef unsigned long pte_t;
-typedef unsigned long pmd_t;
-typedef unsigned long pgd_t;
-typedef unsigned long pgprot_t;
-
-#define pte_val(x)	(x)
-#define pmd_val(x)	(x)
-#define pgd_val(x)	(x)
-#define pgprot_val(x)	(x)
-
-#define __pte(x)	(x)
-#define __pmd(x)	(x)
-#define __pgd(x)	(x)
-#define __pgprot(x)	(x)
-
-
-/* align addr on a size boundry - adjust address up if needed -- Cort */
-#define _ALIGN(addr,size)	(((addr)+size-1)&(~(size-1)))
-
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
-
-#define clear_page(page)        memset((void *)(page), 0, PAGE_SIZE)
-#define copy_page(to,from)	memcpy((void *)(to), (void *)(from), PAGE_SIZE)
-/* map phys->virtual and virtual->phys for RAM pages */
-
-#define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
-#define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
-
-#define MAP_NR(addr)		(((unsigned long)addr-PAGE_OFFSET) >> PAGE_SHIFT)
-#define MAP_PAGE_RESERVED	(1<<15)
-
-extern unsigned long get_zero_page_fast(void);
-#endif /* ASM */
-#endif /* _LIBCPU_PAGE_H */
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