Minor rearrangement of the locore <-> initarm interface. Pass in a

structure with the first 4 registers to allow a wider range of boot
loaders to work.  Future commits will make use of this to centralize
support for the different loaders.

1 files changed, 1 insertions, 6 deletions

diff --git a/sys/arm/at91/at91_machdep.c b/sys/arm/at91/at91_machdep.c
index 7b165a8..1f0d8a7 100644
--- a/sys/arm/at91/at91_machdep.c
+++ b/sys/arm/at91/at91_machdep.c
@@ -132,9 +132,6 @@ struct pv_addr undstack;
 struct pv_addr abtstack;
 struct pv_addr kernelstack;
 
-static void *boot_arg1;
-static void *boot_arg2;
-
 static struct trapframe proc0_tf;
 
 /* Static device mappings. */
@@ -236,7 +233,7 @@ at91_ramsize(void)
 }
 
 void *
-initarm(void *arg, void *arg2)
+initarm(struct arm_boot_params *abp)
 {
 	struct pv_addr  kernel_l1pt;
 	struct pv_addr  dpcpu;
@@ -247,8 +244,6 @@ initarm(void *arg, void *arg2)
 	uint32_t memsize;
 	vm_offset_t lastaddr;
 
-	boot_arg1 = arg;
-	boot_arg2 = arg2;
 	set_cpufuncs();
 	lastaddr = fake_preload_metadata();
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));