path: root/arch/sh/boot
diff options
authorPaul Mundt <lethal@linux-sh.org>2010-01-28 18:26:37 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-01-28 18:26:37 +0900
commitabec86a80247ab3a40d2afc9c8e8c26efcab2391 (patch)
treeb37964ff8898234a0250a6f13c42a9cea1fb045b /arch/sh/boot
parentd627a2ebd1a303aa4ac1962c553d1e8738735d01 (diff)
sh: Kill off superfluous sh_bios references from compressed loader.
The VBR value needs to be initialized in order for any of the bios trapping to work, and as we don't do that until slightly later in the boot process, this has no real chance of working. The only reason for using this in the past was due to the fact that early serial initialization wasn't possible, but now that early sh-sci is supported by everyone, there's no longer any reason to support the sh_bios hacks in the first place. Given that, we just kill off the references completely. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boot')
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 \
OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o
-OBJECTS += $(obj)/../../kernel/sh_bios.o
# IMAGE_OFFSET is the load offset of the compression loader
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 @@
#include <asm/uaccess.h>
#include <asm/addrspace.h>
#include <asm/page.h>
-#include <asm/sh_bios.h>
* gzip declarations
@@ -66,29 +65,11 @@ static unsigned long free_mem_end_ptr;
#include "../../../../lib/decompress_unlzo.c"
-size_t strlen(const char *s)
- int i = 0;
- while (*s++)
- i++;
- return i;
-int puts(const char *s)
- int len = strlen(s);
- sh_bios_console_write(s, len);
- return len;
int puts(const char *s)
/* This should be updated to use the sh-sci routines */
return 0;
void* memset(void* s, int c, size_t n)