1 Index: linux-2.6.25/arch/cris/mm/init.c
2 ===================================================================
3 --- linux-2.6.25.orig/arch/cris/mm/init.c 2008-05-03 09:53:53.000000000 +0100
4 +++ linux-2.6.25/arch/cris/mm/init.c 2008-05-03 09:54:05.000000000 +0100
6 printk (KERN_INFO "Freeing unused kernel memory: %luk freed\n",
7 (unsigned long)((&__init_end - &__init_begin) >> 10));
10 +void free_initrd_mem(unsigned long start, unsigned long end)
13 Index: linux-2.6.25/arch/cris/boot/compressed/Makefile
14 ===================================================================
15 --- linux-2.6.25.orig/arch/cris/boot/compressed/Makefile 2008-05-03 10:00:53.000000000 +0100
16 +++ linux-2.6.25/arch/cris/boot/compressed/Makefile 2008-05-03 10:01:12.000000000 +0100
19 ldflags-y += -T $(obj)/decompress.ld
20 OBJECTS = $(obj)/head.o $(obj)/misc.o
21 -OBJCOPY = objcopy-cris
22 +OBJCOPY = /usr/local/cris/objcopy-cris
23 OBJCOPYFLAGS = -O binary --remove-section=.bss
25 quiet_cmd_image = BUILD $@
26 Index: linux-2.6.25/arch/cris/boot/Makefile
27 ===================================================================
28 --- linux-2.6.25.orig/arch/cris/boot/Makefile 2008-04-17 03:49:44.000000000 +0100
29 +++ linux-2.6.25/arch/cris/boot/Makefile 2008-05-03 10:05:56.000000000 +0100
31 # arch/cris/arch-v10/boot/Makefile
34 -OBJCOPY = objcopy-cris
35 +OBJCOPY = /usr/local/cris/objcopy-cris
36 OBJCOPYFLAGS = -O binary --remove-section=.bss
38 -subdir- := compressed rescue
39 +subdir- := compressed
42 $(obj)/Image: vmlinux FORCE
45 $(obj)/compressed/vmlinux: $(obj)/Image FORCE
46 $(Q)$(MAKE) $(build)=$(obj)/compressed $@
47 - $(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
49 $(obj)/zImage: $(obj)/compressed/vmlinux
51 Index: linux-2.6.25/arch/cris/boot/compressed/Makefile
52 ===================================================================
53 --- linux-2.6.25.orig/arch/cris/boot/compressed/Makefile 2008-05-03 10:01:12.000000000 +0100
54 +++ linux-2.6.25/arch/cris/boot/compressed/Makefile 2008-05-03 16:29:55.000000000 +0100
56 # arch/cris/arch-v10/boot/compressed/Makefile
59 -CC = gcc-cris -melf $(LINUXINCLUDE)
62 +LD=/usr/local/cris/ld-cris
63 ldflags-y += -T $(obj)/decompress.ld
64 OBJECTS = $(obj)/head.o $(obj)/misc.o
65 OBJCOPY = /usr/local/cris/objcopy-cris
67 $(call if_changed,objcopy)
69 $(obj)/head.o: $(obj)/head.S .config
70 - @$(CC) -D__ASSEMBLY__ -traditional -c $< -o $@
71 + /usr/local/cris/gcc-cris -melf $(LINUXINCLUDE) -D__ASSEMBLY__ -traditional -c $< -o $@
73 $(obj)/misc.o: $(obj)/misc.c .config
74 - @$(CC) -D__KERNEL__ -c $< -o $@
75 + /usr/local/cris/gcc-cris -melf $(LINUXINCLUDE) -D__KERNEL__ -c $< -o $@
77 $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
78 $(call if_changed,image)
79 Index: linux-2.6.25/arch/cris/boot/compressed/misc.c
80 ===================================================================
81 --- linux-2.6.25.orig/arch/cris/boot/compressed/misc.c 2008-05-03 16:22:44.000000000 +0100
82 +++ linux-2.6.25/arch/cris/boot/compressed/misc.c 2008-05-03 16:23:26.000000000 +0100
86 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
87 - * puts by Nick Holloway 1993, better puts by Martin Mares 1995
88 + * putstr by Nick Holloway 1993, better putstr by Martin Mares 1995
89 * adaptation for Linux/CRIS Axis Communications AB, 1999
93 static void gzip_mark(void **);
94 static void gzip_release(void **);
96 -static void puts(const char *);
97 +static void putstr(const char *);
99 /* the "heap" is put directly after the BSS ends, at end */
102 /* decompressor info and error messages to serial console */
106 +putstr(const char *s)
108 #ifndef CONFIG_ETRAX_DEBUG_PORT_NULL
116 - puts("\n\n -- System halted\n");
119 + putstr("\n\n -- System halted\n");
127 - __asm__ volatile ("move vr,%0" : "=rm" (revision));
130 - puts("You need an ETRAX 100LX to run linux 2.6\n");
134 - puts("Uncompressing Linux...\n");
135 + putstr("Uncompressing Linux...\n");
137 - puts("Done. Now booting the kernel.\n");
138 + putstr("Done. Now booting the kernel.\n");