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

Commit 5c72c343 authored by Eugene Surovegin's avatar Eugene Surovegin Committed by Linus Torvalds
Browse files

[PATCH] ppc32: fix treeboot image entrypoint 



Correctly specify treeboot based image entrypoint.  Currently makefile uses
$(ENTRYPOINT) which isn't defined anywhere.  Each board port sets
entrypoint-$(CONFIG_BOARD_NAME) instead.

Without this patch I cannot boot Ocotea (PPC440GX eval board) anymore.  I
was getting random "OS panic" errors from OpenBIOS for a while, but with
current kernel I get them all the time (probably because image became
bigger).

Signed-off-by: default avatarEugene Surovegin <ebs@ebshome.net>
Acked-by: default avatarTom Rini <trini@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 42ea0d03

arch/ppc/boot/simple/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -262,11 +262,11 @@ $(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd 
		skip=64 bs=1k



$(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE)

	$(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT)

	$(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(entrypoint-y)



$(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE)

	$(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \

		$(ENTRYPOINT)

		$(entrypoint-y)



$(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT)

	$(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y)