--- qemu/roms/SLOF/board-js2x/slof/Makefile	2018/04/24 18:59:09	1.1
+++ qemu/roms/SLOF/board-js2x/slof/Makefile	2018/04/24 19:46:16	1.1.1.3
@@ -20,26 +20,22 @@ 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
+	$(LIBCMNDIR)/libnvram/libnvram.in \
+	$(LIBCMNDIR)/libnativeio/nativeio.in
 BOARD_SLOF_CODE = $(BOARD_SLOF_IN:%.in=%.code)
 
 include $(SLOFCMNDIR)/Makefile.inc
 
 FPPINCLUDES = -I. -I$(SLOFCMNDIR)/fs -I$(SLOFCMNDIR)
 
-# FCode Evaluator files for the ROM fs:
-FCODE_FFS_FILES = \
-       $(SLOFCMNDIR)/fs/fcode/core.fs \
-       $(SLOFCMNDIR)/fs/fcode/evaluator.fs \
-       $(SLOFCMNDIR)/fs/fcode/big.fs \
-       $(SLOFCMNDIR)/fs/fcode/tokens.fs \
-       $(SLOFCMNDIR)/fs/fcode/1275.fs
-
-
 USB_FFS_FILES = \
 	$(SLOFCMNDIR)/fs/devices/pci-class_0c.fs \
 	$(SLOFCMNDIR)/fs/usb/usb-ohci.fs \
@@ -88,8 +84,7 @@ OF_FFS_FILES = \
 	$(SLOFCMNDIR)/fs/xmodem.fs \
 	$(SLOFCMNDIR)/fs/devices/pci-device_10de_0141.fs \
 	$(SLOFCMNDIR)/fs/devices/pci-class_02.fs \
-	$(SLOFBRDDIR)/default-font.bin \
-	$(FCODE_FFS_FILES)
+	$(SLOFBRDDIR)/default-font.bin
 
 # Uncomment the following line to enable the USB code:
 OF_FFS_FILES += $(USB_FFS_FILES)