[openfirmware] r898 - clients/emacs/x86 clients/lib cpu/x86/pc/olpc cpu/x86/pc/olpc/build
svn at openfirmware.info
svn at openfirmware.info
Fri Aug 29 00:33:35 CEST 2008
Author: wmb
Date: 2008-08-29 00:33:35 +0200 (Fri, 29 Aug 2008)
New Revision: 898
Modified:
clients/emacs/x86/Makefile
clients/lib/lib.c
cpu/x86/pc/olpc/build/Makefile
cpu/x86/pc/olpc/loaddropins.fth
cpu/x86/pc/olpc/olpc.bth
Log:
OLPC - incorporate emacs client program into OLPC build
Modified: clients/emacs/x86/Makefile
===================================================================
--- clients/emacs/x86/Makefile 2008-08-28 22:25:57 UTC (rev 897)
+++ clients/emacs/x86/Makefile 2008-08-28 22:33:35 UTC (rev 898)
@@ -25,11 +25,7 @@
LIBS= $(LIBDIR)/libobp.a
-# emacs.elf: emacs.obp
-# $(BP)/tools/xcftobin <emacs.obp >emacs.bin
-# $(BP)/tools/bintoelf -e$(ORIGIN) <emacs.bin >emacs.elf
-
-emacs.obp: $(LIBDIR)/start.o $(OFILES) $(LIBS) Makefile
+emacs: $(LIBDIR)/start.o $(OFILES) $(LIBS) Makefile
$(LD) $(LFLAGS) -o $@ $(LIBDIR)/start.o $(OFILES) $(LIBS)
size $@
nm -n $@ >emacs.nm
Modified: clients/lib/lib.c
===================================================================
--- clients/lib/lib.c 2008-08-28 22:25:57 UTC (rev 897)
+++ clients/lib/lib.c 2008-08-28 22:33:35 UTC (rev 898)
@@ -159,7 +159,7 @@
{
fp->bufc = count-1;
fp->inbufp = fp->buf;
- return(*fp->inbufp++);
+ return((*fp->inbufp++) & 0xff);
}
/* otherwise return EOF */
Modified: cpu/x86/pc/olpc/build/Makefile
===================================================================
--- cpu/x86/pc/olpc/build/Makefile 2008-08-28 22:25:57 UTC (rev 897)
+++ cpu/x86/pc/olpc/build/Makefile 2008-08-28 22:33:35 UTC (rev 898)
@@ -2,6 +2,8 @@
BASEDIR= `(cd ../../../../..; pwd;)`
TAGFILES= ../../../build/*.tag *.tag
+CLIENTDIR=../../../../../clients
+CLIENTPROGS=${CLIENTDIR}/memtest86/memtest ${CLIENTDIR}/emacs/x86/emacs
all: olpc.rom tags
@@ -13,7 +15,7 @@
ofw.elf: FORCE build ../../../build/inflate.bin
./build $@
-olpc.rom: FORCE build ../../../build/inflate.bin ../../../../../clients/memtest86/memtest
+olpc.rom: FORCE build ../../../build/inflate.bin ${CLIENTPROGS}
./build $@
../../../${OS}/forth:
@@ -22,9 +24,12 @@
../../../build/inflate.bin:
@make -C ../../../build inflate.bin
-../../../../../clients/memtest86/memtest:
- @make -C ../../../../../clients/memtest86 memtest
+${CLIENTDIR}/memtest86/memtest:
+ @make -C ${CLIENTDIR}/memtest86 memtest
+${CLIENTDIR}/emacs/x86/emacs:
+ @make -C ${CLIENTDIR}/emacs/x86 emacs
+
build: ../../../${OS}/forth
@ln -sf ../../../${OS}/forth build
Modified: cpu/x86/pc/olpc/loaddropins.fth
===================================================================
--- cpu/x86/pc/olpc/loaddropins.fth 2008-08-28 22:25:57 UTC (rev 897)
+++ cpu/x86/pc/olpc/loaddropins.fth 2008-08-28 22:33:35 UTC (rev 898)
@@ -48,11 +48,15 @@
" ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin
" ${BP}/cpu/x86/pc/olpc/images/sd.565" " sd.565" $add-deflated-dropin
- " ${BP}/ofw/termemu/gallant.obf" " font" $add-deflated-dropin
+ " ${BP}/ofw/termemu/15x30pc.psf" " font" $add-deflated-dropin
[ifdef] use-ega
" ${BP}/ofw/termemu/cp881-16.obf" " pcfont" $add-deflated-dropin
[then]
+ " ${BP}/clients/emacs/x86/emacs" " emacs" $add-deflated-dropin
+ " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin
+ " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin
+
" verify.img" " verify" $add-deflated-dropin
" os.public" " ospubkey" $add-dropin \ Incompressible
" fw.public" " fwpubkey" $add-dropin \ Incompressible
Modified: cpu/x86/pc/olpc/olpc.bth
===================================================================
--- cpu/x86/pc/olpc/olpc.bth 2008-08-28 22:25:57 UTC (rev 897)
+++ cpu/x86/pc/olpc/olpc.bth 2008-08-28 22:33:35 UTC (rev 898)
@@ -22,6 +22,7 @@
in: ${BP}/dev/olpc/cafenand/build/cafenand.fc
in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc
in: ${BP}/clients/memtest86/memtest
+in: ${BP}/clients/emacs/x86/emacs
in: ${BP}/cpu/x86/pc/olpc/build/verify.img
in: ${BP}/cpu/x86/pc/olpc/build/usb8388.bin
in: ${BP}/dev/pci/build/pcibridg.fc
More information about the openfirmware
mailing list