[2/4] sparc32: Apply Robert Reif's changes

Message ID 4A3EF058.2040800@gmail.com
State Accepted
Delegated to: David Miller
Headers show

Commit Message

Julian Calaby June 22, 2009, 2:45 a.m.
From: Robert Reif <reif@earthlink.net>

Fix obvious build issues for sparc32 tftpboot.img build.


I haven't signed this off as it's Robert's patch.

Robert, if you approve of this, could you sign it off?



Sorry for the dupes!

 arch/sparc/boot/Makefile       |    2 +-
 arch/sparc/boot/piggyback_32.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index 96041a8..5e2caeb 100644
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -58,7 +58,7 @@  $(obj)/image: $(obj)/btfix.o FORCE
 $(obj)/zImage: $(obj)/image
 	$(call if_changed,strip)
-$(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE
+$(obj)/tftpboot.img: $(obj)/piggyback_32 $(obj)/System.map $(obj)/image FORCE
 	$(call if_changed,elftoaout)
 	$(call if_changed,piggy)
diff --git a/arch/sparc/boot/piggyback_32.c b/arch/sparc/boot/piggyback_32.c
index c9f500c..3f0f933 100644
--- a/arch/sparc/boot/piggyback_32.c
+++ b/arch/sparc/boot/piggyback_32.c
@@ -70,7 +70,7 @@  void die(char *str)
 int main(int argc,char **argv)
 	static char aout_magic[] = { 0x01, 0x03, 0x01, 0x07 };
-	unsigned char buffer[1024], *q, *r;
+	char buffer[1024], *q, *r;
 	unsigned int i, j, k, start, end, offset;
 	FILE *map;
 	struct stat s;