merge boottest into newreloc

kern/powerpc/ieee1275/startup.S

@@ -18,7 +18,7 @@
  */
 
 #include <grub/symbol.h>
-#include <grub/cpu/kernel.h>
+#include <grub/offsets.h>
 
 .extern __bss_start
 .extern _end
@@ -30,7 +30,7 @@ start:
 _start:
 	b	codestart
 
-	. = _start + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkelfimage */
@@ -39,7 +39,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_DATA_END
 
 codestart:
 	li      2, 0