diff options
Diffstat (limited to 'arch/sh/boot/compressed/misc.c')
-rw-r--r-- | arch/sh/boot/compressed/misc.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c index b51b1fc4baae..27140a6b365d 100644 --- a/arch/sh/boot/compressed/misc.c +++ b/arch/sh/boot/compressed/misc.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
15 | #include <asm/addrspace.h> | 15 | #include <asm/addrspace.h> |
16 | #include <asm/page.h> | 16 | #include <asm/page.h> |
17 | #include <asm/sh_bios.h> | ||
18 | 17 | ||
19 | /* | 18 | /* |
20 | * gzip declarations | 19 | * gzip declarations |
@@ -62,29 +61,15 @@ static unsigned long free_mem_end_ptr; | |||
62 | #include "../../../../lib/decompress_unlzma.c" | 61 | #include "../../../../lib/decompress_unlzma.c" |
63 | #endif | 62 | #endif |
64 | 63 | ||
65 | #ifdef CONFIG_SH_STANDARD_BIOS | 64 | #ifdef CONFIG_KERNEL_LZO |
66 | size_t strlen(const char *s) | 65 | #include "../../../../lib/decompress_unlzo.c" |
67 | { | 66 | #endif |
68 | int i = 0; | ||
69 | |||
70 | while (*s++) | ||
71 | i++; | ||
72 | return i; | ||
73 | } | ||
74 | 67 | ||
75 | int puts(const char *s) | 68 | int puts(const char *s) |
76 | { | 69 | { |
77 | int len = strlen(s); | ||
78 | sh_bios_console_write(s, len); | ||
79 | return len; | ||
80 | } | ||
81 | #else | ||
82 | int puts(const char *s) | ||
83 | { | ||
84 | /* This should be updated to use the sh-sci routines */ | 70 | /* This should be updated to use the sh-sci routines */ |
85 | return 0; | 71 | return 0; |
86 | } | 72 | } |
87 | #endif | ||
88 | 73 | ||
89 | void* memset(void* s, int c, size_t n) | 74 | void* memset(void* s, int c, size_t n) |
90 | { | 75 | { |
@@ -132,7 +117,7 @@ void decompress_kernel(void) | |||
132 | output_addr = (CONFIG_MEMORY_START + 0x2000); | 117 | output_addr = (CONFIG_MEMORY_START + 0x2000); |
133 | #else | 118 | #else |
134 | output_addr = __pa((unsigned long)&_text+PAGE_SIZE); | 119 | output_addr = __pa((unsigned long)&_text+PAGE_SIZE); |
135 | #ifdef CONFIG_29BIT | 120 | #if defined(CONFIG_29BIT) |
136 | output_addr |= P2SEG; | 121 | output_addr |= P2SEG; |
137 | #endif | 122 | #endif |
138 | #endif | 123 | #endif |