Skip to content

Commit

Permalink
sh: Kill off superfluous sh_bios references from compressed loader.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Jan 28, 2010
1 parent d627a2e commit abec86a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
4 changes: 0 additions & 4 deletions arch/sh/boot/compressed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz \

OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o

ifdef CONFIG_SH_STANDARD_BIOS
OBJECTS += $(obj)/../../kernel/sh_bios.o
endif

#
# IMAGE_OFFSET is the load offset of the compression loader
#
Expand Down
19 changes: 0 additions & 19 deletions arch/sh/boot/compressed/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <asm/uaccess.h>
#include <asm/addrspace.h>
#include <asm/page.h>
#include <asm/sh_bios.h>

/*
* gzip declarations
Expand Down Expand Up @@ -66,29 +65,11 @@ static unsigned long free_mem_end_ptr;
#include "../../../../lib/decompress_unlzo.c"
#endif

#ifdef CONFIG_SH_STANDARD_BIOS
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;
}
#else
int puts(const char *s)
{
/* This should be updated to use the sh-sci routines */
return 0;
}
#endif

void* memset(void* s, int c, size_t n)
{
Expand Down

0 comments on commit abec86a

Please sign in to comment.