Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c998de14 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[POWERPC] Fix zImage decompress location 



The zImage wrapper has a "hack" that force the decompression to happen
above 20Mb for 64 bits kernels, to work around issues with some
firmwares on the field. However, the new wrapper has a bug which makes
that hack not work properly. This fixes it.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9938c474

arch/powerpc/boot/of.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -176,12 +176,9 @@ static void *claim(unsigned long virt, unsigned long size, unsigned long align) 
static void *of_try_claim(u32 size)

static void *of_try_claim(u32 size)

{

{

	unsigned long addr = 0;

	unsigned long addr = 0;

	static u8 first_time = 1;





	if (first_time) {

	if (claim_base == 0)

		claim_base = _ALIGN_UP((unsigned long)_end, ONE_MB);

		claim_base = _ALIGN_UP((unsigned long)_end, ONE_MB);

		first_time = 0;

	}





	for(; claim_base < RAM_END; claim_base += ONE_MB) {

	for(; claim_base < RAM_END; claim_base += ONE_MB) {

#ifdef DEBUG

#ifdef DEBUG