stand: move 'staging' to loader_efi.h

On amd64, we need this to setup the page tables.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1446

stand/efi/loader/arch/amd64/elf64_freebsd.c

@@ -71,8 +71,6 @@ static pdp_entry_t *PT3_l, *PT3_u;
 static pd_entry_t *PT2;
 static pd_entry_t *PT2_l0, *PT2_l1, *PT2_l2, *PT2_l3, *PT2_u0, *PT2_u1;
 
-extern EFI_PHYSICAL_ADDRESS staging;
-
 static void (*trampoline)(uint64_t stack, void *copy_finish, uint64_t kernend,
     uint64_t modulep, pml4_entry_t *pagetable, uint64_t entry);
 

stand/efi/loader/arch/i386/elf64_freebsd.c

@@ -86,8 +86,6 @@ static p2_entry_t *PT2;
 static p2_entry_t *PT2_l0, *PT2_l1, *PT2_l2, *PT2_l3, *PT2_u0, *PT2_u1;
 static gdt_t *GDT;
 
-extern EFI_PHYSICAL_ADDRESS staging;
-
 static void (*trampoline)(uint32_t stack, void *copy_finish, uint32_t kernend,
     uint32_t modulep, uint64_t *pagetable, struct gdtr *gdtr, uint64_t entry);
 

stand/efi/loader/loader_efi.h

@@ -55,6 +55,11 @@ void * efi_translate(vm_offset_t ptr);
 void	efi_copy_finish(void);
 void	efi_copy_finish_nop(void);
 
+#if defined(__amd64__) || defined(__i386__)
+/* Need this to setup page tables */
+extern EFI_PHYSICAL_ADDRESS staging;
+#endif
+
 int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp,
     bool exit_bs);
 

stand/kboot/kboot/arch/amd64/elf64_freebsd.c

@@ -122,8 +122,6 @@ static pd_entry_t *PT2_l0, *PT2_l1, *PT2_l2, *PT2_l3, *PT2_u0, *PT2_u1;
 static pdp_entry_t *PT3;
 static pd_entry_t *PT2;
 
-extern EFI_PHYSICAL_ADDRESS staging;
-
 static void (*trampoline)(uint64_t stack, void *copy_finish, uint64_t kernend,
     uint64_t modulep, pml4_entry_t *pagetable, uint64_t entry);
 #endif