]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/boot: Fix boot on systems with uncompressed kernel image
authorHeiner Kallweit <hkallweit1@gmail.com>
Wed, 12 Oct 2016 19:00:43 +0000 (21:00 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 19 Oct 2016 09:35:34 +0000 (20:35 +1100)
commitbe826c9a66c58968535784a658d1463233b50258
tree23c9b04f54af70d94dc3ec6ddd80fd719c05c220
parentd1a12c673c25f7554e975ab78ca5de34a878eeac
powerpc/boot: Fix boot on systems with uncompressed kernel image

This commit broke boot on systems with an uncompressed kernel image,
namely systems using a cuImage. On such systems the compressed boot
image (boot wrapper, uncompressed kernel image, ..) is decompressed
by u-boot already, therefore the boot wrapper code sees an
uncompressed kernel image.

The old decompression code silently assumed an uncompressed kernel
image if it found no valid gzip signature, whilst the new code
bailed out in this case.

Fix this by re-introducing such a fallback if no valid compressed
image is found.

Fixes: 53967339fa12 ("Use the pre-boot decompression API")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/boot/main.c