--- qemu/roms/openbios/include/libopenbios/ofmem.h	2018/04/24 19:19:39	1.1.1.1
+++ qemu/roms/openbios/include/libopenbios/ofmem.h	2018/04/24 19:37:16	1.1.1.2
@@ -67,15 +67,15 @@ extern phys_addr_t 	ofmem_arch_get_phys_
 extern ucell		ofmem_arch_get_iomem_base(void);
 extern ucell		ofmem_arch_get_iomem_top(void);
 extern retain_t*	ofmem_arch_get_retained(void);
-extern int			ofmem_arch_get_physaddr_cellsize(void);
-extern int			ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value);
+extern int		ofmem_arch_get_physaddr_cellsize(void);
+extern int		ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value);
 extern int		ofmem_arch_get_available_entry_size(phandle_t ph);
 extern void 		ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size);
 extern int 		ofmem_arch_get_translation_entry_size(void);
 extern void 		ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t);
 extern ucell    	ofmem_arch_default_translation_mode( phys_addr_t phys );
 extern ucell    	ofmem_arch_io_translation_mode( phys_addr_t phys );
-extern void     	ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size,
+extern void     	ofmem_arch_map_pages(phys_addr_t phys, ucell virt, ucell size,
                                            ucell mode);
 extern void     	ofmem_arch_unmap_pages(ucell virt, ucell size);
 /* sparc64 uses this method */
@@ -129,25 +129,9 @@ extern phandle_t s_phandle_mmu;
 /* Currently the same for all architectures */
 #define PAGE_SHIFT   12
 
-#ifdef CONFIG_PPC
-unsigned long get_ram_top( void );
-unsigned long get_ram_bottom( void );
-
-#elif defined(CONFIG_SPARC32)
-
-/* arch/sparc32/lib.c */
-struct mem;
-extern struct mem cdvmem;
-
-void mem_init(struct mem *t, char *begin, char *limit);
-void *mem_alloc(struct mem *t, int size, int align);
-#endif
-
-#ifdef PAGE_SHIFT
 #define PAGE_SIZE    (1 << PAGE_SHIFT)
 #define PAGE_MASK    (~(PAGE_SIZE - 1))
 #define PAGE_ALIGN(addr)  (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
-#endif
 
 #if defined(CONFIG_DEBUG_OFMEM)
 # define OFMEM_TRACE(fmt, ...) do { printk("OFMEM: " fmt, ## __VA_ARGS__); } while (0)