diff options
author | Eugene Surovegin <ebs@ebshome.net> | 2005-12-01 03:51:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:48:56 -0500 |
commit | 5c72c343719a8c5dba675cd1b27b63c06bfe23d1 (patch) | |
tree | bd5f3220aef43a44274fe633f69c50de0233aae4 | |
parent | 42ea0d037860690dde07a015d3473a17da35f74a (diff) |
[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: Eugene Surovegin <ebs@ebshome.net>
Acked-by: Tom Rini <trini@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/ppc/boot/simple/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile index 82df88b01bbe..f3e9c534aa82 100644 --- a/arch/ppc/boot/simple/Makefile +++ b/arch/ppc/boot/simple/Makefile | |||
@@ -262,11 +262,11 @@ $(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd | |||
262 | skip=64 bs=1k | 262 | skip=64 bs=1k |
263 | 263 | ||
264 | $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE) | 264 | $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE) |
265 | $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT) | 265 | $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(entrypoint-y) |
266 | 266 | ||
267 | $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE) | 267 | $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE) |
268 | $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \ | 268 | $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \ |
269 | $(ENTRYPOINT) | 269 | $(entrypoint-y) |
270 | 270 | ||
271 | $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT) | 271 | $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT) |
272 | $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y) | 272 | $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y) |