diff options
Diffstat (limited to 'arch/mips/boot/compressed/decompress.c')
-rw-r--r-- | arch/mips/boot/compressed/decompress.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c index 67330c2f7318..55d02b3a6712 100644 --- a/arch/mips/boot/compressed/decompress.c +++ b/arch/mips/boot/compressed/decompress.c | |||
@@ -28,8 +28,6 @@ char *zimage_start; | |||
28 | 28 | ||
29 | /* The linker tells us where the image is. */ | 29 | /* The linker tells us where the image is. */ |
30 | extern unsigned char __image_begin, __image_end; | 30 | extern unsigned char __image_begin, __image_end; |
31 | extern unsigned char __ramdisk_begin, __ramdisk_end; | ||
32 | unsigned long initrd_size; | ||
33 | 31 | ||
34 | /* debug interfaces */ | 32 | /* debug interfaces */ |
35 | extern void puts(const char *s); | 33 | extern void puts(const char *s); |
@@ -79,6 +77,10 @@ void *memset(void *s, int c, size_t n) | |||
79 | #include "../../../../lib/decompress_unlzma.c" | 77 | #include "../../../../lib/decompress_unlzma.c" |
80 | #endif | 78 | #endif |
81 | 79 | ||
80 | #ifdef CONFIG_KERNEL_LZO | ||
81 | #include "../../../../lib/decompress_unlzo.c" | ||
82 | #endif | ||
83 | |||
82 | void decompress_kernel(unsigned long boot_heap_start) | 84 | void decompress_kernel(unsigned long boot_heap_start) |
83 | { | 85 | { |
84 | int zimage_size; | 86 | int zimage_size; |
@@ -102,14 +104,6 @@ void decompress_kernel(unsigned long boot_heap_start) | |||
102 | puthex((unsigned long)(zimage_size + zimage_start)); | 104 | puthex((unsigned long)(zimage_size + zimage_start)); |
103 | puts("\n"); | 105 | puts("\n"); |
104 | 106 | ||
105 | if (initrd_size) { | ||
106 | puts("initrd at: "); | ||
107 | puthex((unsigned long)(&__ramdisk_begin)); | ||
108 | puts(" "); | ||
109 | puthex((unsigned long)(&__ramdisk_end)); | ||
110 | puts("\n"); | ||
111 | } | ||
112 | |||
113 | /* this area are prepared for mallocing when decompressing */ | 107 | /* this area are prepared for mallocing when decompressing */ |
114 | free_mem_ptr = boot_heap_start; | 108 | free_mem_ptr = boot_heap_start; |
115 | free_mem_end_ptr = boot_heap_start + BOOT_HEAP_SIZE; | 109 | free_mem_end_ptr = boot_heap_start + BOOT_HEAP_SIZE; |