Subject: [PATCH][PPC32] Add uImage to default targets

From: Matt Porter <[email-masked]>
Date: Wed, 15 Dec 2004 11:49:05 -0700

We'd like to get a uImage when just using 'make' on many
targets. After some discussion, it made sense to simply
add uImage to the default targets since it adds minimal
build overhead and will work on all platforms. Also,
fix a dependency in the boot stuff.

Signed-off-by: Matt Porter <[email-masked]>

===== arch/ppc/Makefile 1.66 vs edited =====
--- 1.66/arch/ppc/Makefile	2004-10-05 17:28:57 -07:00
+++ edited/arch/ppc/Makefile	2004-12-15 10:27:30 -07:00
@@ -68,7 +68,7 @@
 
 .PHONY: $(BOOT_TARGETS)
 
-all: zImage
+all: uImage zImage
 
 CPPFLAGS_vmlinux.lds	:= -Upowerpc
 
===== arch/ppc/boot/simple/misc.c 1.24 vs edited =====
--- 1.24/arch/ppc/boot/simple/misc.c	2004-10-08 02:57:32 -07:00
+++ edited/arch/ppc/boot/simple/misc.c	2004-12-15 10:25:10 -07:00
@@ -102,7 +102,7 @@
 	com_port = serial_init(0, NULL);
 #endif
 
-#ifdef CONFIG_44x
+#if defined(CONFIG_44x) && defined(PPC44x_EMAC0_MR0)
 	/* Reset MAL */
 	mtdcr(DCRN_MALCR(DCRN_MAL_BASE), MALCR_MMSR);
 	/* Wait for reset */