diff options
Diffstat (limited to 'arch/sh/boot')
-rw-r--r-- | arch/sh/boot/compressed/Makefile | 4 | ||||
-rw-r--r-- | arch/sh/boot/compressed/misc.c | 19 |
2 files changed, 0 insertions, 23 deletions
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile index 6b95a2a4826..5d660b90943 100644 --- a/arch/sh/boot/compressed/Makefile +++ b/arch/sh/boot/compressed/Makefile | |||
@@ -11,10 +11,6 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz \ | |||
11 | 11 | ||
12 | OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o | 12 | OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o |
13 | 13 | ||
14 | ifdef CONFIG_SH_STANDARD_BIOS | ||
15 | OBJECTS += $(obj)/../../kernel/sh_bios.o | ||
16 | endif | ||
17 | |||
18 | # | 14 | # |
19 | # IMAGE_OFFSET is the load offset of the compression loader | 15 | # IMAGE_OFFSET is the load offset of the compression loader |
20 | # | 16 | # |
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c index 4b319e9e4f8..d509a505062 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 |
@@ -66,29 +65,11 @@ static unsigned long free_mem_end_ptr; | |||
66 | #include "../../../../lib/decompress_unlzo.c" | 65 | #include "../../../../lib/decompress_unlzo.c" |
67 | #endif | 66 | #endif |
68 | 67 | ||
69 | #ifdef CONFIG_SH_STANDARD_BIOS | ||
70 | size_t strlen(const char *s) | ||
71 | { | ||
72 | int i = 0; | ||
73 | |||
74 | while (*s++) | ||
75 | i++; | ||
76 | return i; | ||
77 | } | ||
78 | |||
79 | int puts(const char *s) | ||
80 | { | ||
81 | int len = strlen(s); | ||
82 | sh_bios_console_write(s, len); | ||
83 | return len; | ||
84 | } | ||
85 | #else | ||
86 | int puts(const char *s) | 68 | int puts(const char *s) |
87 | { | 69 | { |
88 | /* This should be updated to use the sh-sci routines */ | 70 | /* This should be updated to use the sh-sci routines */ |
89 | return 0; | 71 | return 0; |
90 | } | 72 | } |
91 | #endif | ||
92 | 73 | ||
93 | void* memset(void* s, int c, size_t n) | 74 | void* memset(void* s, int c, size_t n) |
94 | { | 75 | { |