diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index d962997..40a63ea 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -261,24 +261,16 @@ unsigned long initrd_size, void *oftree) { void (*kernel)(int zero, int arch, void *params) = adr; + void *params = NULL; int architecture; if (oftree) { - if (armlinux_bootparams) { - struct fdt_header *header = oftree; - - memcpy(armlinux_bootparams, oftree, - fdt32_to_cpu(header->totalsize)); - } else { - armlinux_bootparams = oftree; - } - - printf("booting Linux kernel with devicetree at 0x%p\n", - armlinux_bootparams); + printf("booting Linux kernel with devicetree\n"); + params = oftree; } else { setup_tags(initrd_address, initrd_size, swap); + params = armlinux_bootparams; } - architecture = armlinux_get_architecture(); shutdown_barebox(); @@ -296,10 +288,10 @@ "mov r2, %1\n" "bx %2\n" : - : "r" (architecture), "r" (armlinux_bootparams), "r" (kernel) + : "r" (architecture), "r" (params), "r" (kernel) : "r0", "r1", "r2" ); #else - kernel(0, architecture, armlinux_bootparams); + kernel(0, architecture, params); #endif }