Author: wmb Date: Mon Jan 23 18:56:08 2012 New Revision: 2843 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2843
Log: Minor cleanup of neptune build to reflect changes in common code.
Added: cpu/x86/pc/neptune/build/.gitignore Modified: cpu/x86/pc/neptune/build/Makefile cpu/x86/pc/neptune/devices.fth cpu/x86/pc/neptune/fw.bth cpu/x86/pc/neptune/neptune.bth
Added: cpu/x86/pc/neptune/build/.gitignore ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/neptune/build/.gitignore Mon Jan 23 18:56:08 2012 (r2843) @@ -0,0 +1 @@ +build
Modified: cpu/x86/pc/neptune/build/Makefile ============================================================================== --- cpu/x86/pc/neptune/build/Makefile Mon Jan 23 18:56:03 2012 (r2842) +++ cpu/x86/pc/neptune/build/Makefile Mon Jan 23 18:56:08 2012 (r2843) @@ -21,7 +21,7 @@ @make -C ../../../build inflate.bin
${CLIENTDIR}/memtest86/memtest: - @make -C ${CLIENTDIR}/memtest86 memtest + @VARIANT=OLPCGEODE make -C ${CLIENTDIR}/memtest86 memtest
build: ../../../${OS}/forth @ln -sf ../../../${OS}/forth build
Modified: cpu/x86/pc/neptune/devices.fth ============================================================================== --- cpu/x86/pc/neptune/devices.fth Mon Jan 23 18:56:03 2012 (r2842) +++ cpu/x86/pc/neptune/devices.fth Mon Jan 23 18:56:08 2012 (r2843) @@ -198,11 +198,6 @@ ; [then]
-fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching -fload ${BP}/forth/lib/tofile.fth \ to-file and append-to-file -\ XXX remove the OS file commands from tools.dic -fload ${BP}/ofw/core/filecmds.fth \ File commands: dir, del, ren, etc. - fload ${BP}/cpu/x86/pc/olpc/cmos.fth \ CMOS RAM indices are 1f..ff , above RTC
devalias nand /nandflash @@ -281,6 +276,11 @@ h# 3f8 is uart-base fload ${BP}/forth/lib/sysuart.fth \ Use UART for key and emit
+0 value keyboard-ih +0 value screen-ih + +fload ${BP}/ofw/core/muxdev.fth \ I/O collection/distribution device + [ifndef] save-flash : save-flash ; : restore-flash ; @@ -313,8 +313,6 @@
false config-int tft-mode?
-fload ${BP}/cpu/x86/fb16-ops.fth -fload ${BP}/ofw/termemu/fb16.fth 0 0 " 1,1" " /pci" begin-package fload ${BP}/dev/geode/display/loadpkg.fth \ Geode display
Modified: cpu/x86/pc/neptune/fw.bth ============================================================================== --- cpu/x86/pc/neptune/fw.bth Mon Jan 23 18:56:03 2012 (r2842) +++ cpu/x86/pc/neptune/fw.bth Mon Jan 23 18:56:08 2012 (r2843) @@ -123,6 +123,7 @@
[ifdef] linux-support \needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation +\needs ($crc16) fload ${BP}/forth/lib/crc16.fth support-package: ext2-file-system fload ${BP}/ofw/fs/ext2fs/ext2fs.fth \ Linux file system end-support-package @@ -275,7 +276,7 @@ [then] then ; -\ warning ! +warning ! [then]
: (.firmware) ( -- )
Modified: cpu/x86/pc/neptune/neptune.bth ============================================================================== --- cpu/x86/pc/neptune/neptune.bth Mon Jan 23 18:56:03 2012 (r2842) +++ cpu/x86/pc/neptune/neptune.bth Mon Jan 23 18:56:08 2012 (r2843) @@ -6,7 +6,6 @@ in: ${BP}/cpu/x86/pc/neptune/build/rmstart.img in: ${BP}/cpu/x86/pc/neptune/build/paging.di in: ${BP}/cpu/x86/pc/neptune/build/fw.dic -in: ${BP}/dev/geode/nandflash/build/nandflash.fc in: ${BP}/dev/geode/ac97/build/ac97.fc in: ${BP}/dev/usb2/hcd/ohci/build/ohci.fc in: ${BP}/dev/usb2/hcd/ehci/build/ehci.fc @@ -17,7 +16,7 @@ in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc in: ${BP}/dev/pci/build/pcibridg.fc in: ${BP}/dev/dnet/build/dnet.fc -\ in: ${BP}/clients/memtest86/memtest +in: ${BP}/clients/memtest86/memtest in: vme.elf
build-now