merge mainline and various cleanups

include/grub/mips/qemu_mips/memory.h

@@ -28,38 +28,7 @@
 #define GRUB_MACHINE_MEMORY_STACK_HIGH       0x80f00000
 #define GRUB_MACHINE_MEMORY_USABLE       0x81000000
 
-#define GRUB_MACHINE_MEMORY_AVAILABLE        1
-#define GRUB_MACHINE_MEMORY_MAX_TYPE         1
-  /* This one is special: it's used internally but is never reported
-     by firmware. */
-#define GRUB_MACHINE_MEMORY_HOLE 	2
-#define GRUB_MACHINE_MEMORY_RESERVED GRUB_MACHINE_MEMORY_HOLE
-
 #ifndef ASM_FILE
-
-typedef grub_addr_t grub_phys_addr_t;
-
-static inline grub_phys_addr_t
-grub_vtop (void *a)
-{
-  return ((grub_phys_addr_t) a) & 0x1fffffff;
-}
-
-static inline void *
-grub_map_memory (grub_phys_addr_t a, grub_size_t size __attribute__ ((unused)))
-{
-  return (void *) (a | 0x80000000);
-}
-
-static inline void
-grub_unmap_memory (void *a __attribute__ ((unused)),
-		   grub_size_t size __attribute__ ((unused)))
-{
-}
-
-grub_err_t EXPORT_FUNC (grub_machine_mmap_iterate)
-(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
-
 static inline grub_err_t
 grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),
 			    grub_uint64_t size __attribute__ ((unused)),
@@ -73,7 +42,6 @@ grub_machine_mmap_unregister (int handle  __attribute__ ((unused)))
 {
   return GRUB_ERR_NONE;
 }
-
 #endif
 
 #endif

include/grub/mips/qemu_mips/serial.h

@@ -19,6 +19,6 @@
 #ifndef GRUB_MACHINE_SERIAL_HEADER
 #define GRUB_MACHINE_SERIAL_HEADER	1
 
-#define GRUB_MACHINE_SERIAL_PORTS { 0x140003f8 }
+#define GRUB_MACHINE_SERIAL_PORTS { 0xb40003f8 }
 
 #endif 

include/grub/mips/qemu_mips/time.h

@@ -20,15 +20,6 @@
 #define KERNEL_MACHINE_TIME_HEADER	1
 
 #include <grub/symbol.h>
-
-#define GRUB_TICKS_PER_SECOND	1000
-
-/* Return the real time in ticks.  */
-grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
-
-static inline void
-grub_cpu_idle(void)
-{
-}
+#include <grub/cpu/time.h>
 
 #endif /* ! KERNEL_MACHINE_TIME_HEADER */