diff options
| author | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-07-08 15:43:00 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-10-12 08:44:23 +0200 |
| commit | 98cdbf03c14fe5a00d6047d8f0ceb13c83f29aef (patch) | |
| tree | c1dae84c4e4e859433d242f1ab23628524c0bf1a /board-js2x | |
| parent | ad3238534f79f218ed318c532f260d5ea1fd8074 (diff) | |
| download | SLOF-98cdbf03c14fe5a00d6047d8f0ceb13c83f29aef.zip SLOF-98cdbf03c14fe5a00d6047d8f0ceb13c83f29aef.tar.gz SLOF-98cdbf03c14fe5a00d6047d8f0ceb13c83f29aef.tar.bz2 | |
Got rid of the ELF loader functions written in Forth, using libelf instead.
It's cumbersome to maintain code twice, in Forth and in C, and now that libelf
has a new important feature (relocation), I removed most of the old Forth
functions for ELF loading and use the libelf everywhere instead.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Diffstat (limited to 'board-js2x')
| -rw-r--r-- | board-js2x/slof/Makefile | 6 | ||||
| -rw-r--r-- | board-js2x/slof/OF.fs | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board-js2x/slof/Makefile b/board-js2x/slof/Makefile index 3d7882a..09695a7 100644 --- a/board-js2x/slof/Makefile +++ b/board-js2x/slof/Makefile @@ -20,9 +20,13 @@ include $(TOPCMNDIR)/make.rules all: Makefile.dep OF.ffs paflof $(SLOFCMNDIR)/xvect.bin CPPFLAGS = -I$(LIBCMNDIR)/libbootmsg -I$(LIBCMNDIR)/libnvram -SLOF_LIBS = $(LIBCMNDIR)/libbootmsg.a $(LIBCMNDIR)/libnvram.a +SLOF_LIBS = \ + $(LIBCMNDIR)/libbootmsg.a \ + $(LIBCMNDIR)/libelf.a \ + $(LIBCMNDIR)/libnvram.a BOARD_SLOF_IN = \ $(LIBCMNDIR)/libbootmsg/bootmsg.in \ + $(LIBCMNDIR)/libelf/libelf.in \ $(LIBCMNDIR)/libbases/libbases.in \ $(LIBCMNDIR)/libnvram/libnvram.in BOARD_SLOF_CODE = $(BOARD_SLOF_IN:%.in=%.code) diff --git a/board-js2x/slof/OF.fs b/board-js2x/slof/OF.fs index 894f43a..43dfcd7 100644 --- a/board-js2x/slof/OF.fs +++ b/board-js2x/slof/OF.fs @@ -332,11 +332,6 @@ check-for-nvramrc #include "elf.fs" #include <loaders.fs> -: bios-exec ( arg len -- rc ) - s" snk" romfs-lookup 0<> IF load-elf-file drop start-elf64 - ELSE 2drop false THEN -; - \ check wether a VGA device was found during pci scan, if it was \ try to initialize it and create the needed device-nodes 0 value biosemu-vmem @@ -365,7 +360,7 @@ vga-device-node? 0<> use-biosemu? AND IF 20 char-cat biosemu-debug $cathex \ add biosemu-debug as param ( paramstr+path+biosemu-debug len ) THEN - bios-exec + .(client-exec) drop \ s" Time after biosemu:" type .date cr s" VGA initialization: detecting displays..." type cr \ try to get info for two monitors @@ -391,7 +386,8 @@ vga-device-node? 0<> use-biosemu? AND IF 20 char-cat \ add a space ( pathstr len paramstr len ) 2swap $cat ( paramstr+path len ) 20 char-cat - screen-info $cathex bios-exec + screen-info $cathex + .(client-exec) drop \ s" Time after client exec:" type .date cr screen-info c@ 0<> IF s" display " type i . s" found..." type |