[OpenBIOS] r706 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-10-30 00:08:01 +0100 (Tue, 30 Oct 2007)
New Revision: 706

Modified:
   cpu/x86/pc/olpc/devices.fth
   cpu/x86/pc/olpc/loaddropins.fth
   cpu/x86/pc/olpc/olpc.bth
Log:
q2d03 late - Removed support for CS5536 NAND FLASH, which caused
build failures.

Modified: cpu/x86/pc/olpc/devices.fth
===================================================================
--- cpu/x86/pc/olpc/devices.fth	2007-10-29 22:58:41 UTC (rev 705)
+++ cpu/x86/pc/olpc/devices.fth	2007-10-29 23:08:01 UTC (rev 706)
@@ -153,17 +153,6 @@

fload ${BP}/cpu/x86/pc/olpc/cmos.fth     \ CMOS RAM indices are 1f..ff , above RTC

-stand-init: nand5536
-   lx?  if  exit  then
-   h# c h# 800 *  config-w@  h# 11ab  <>  if
-      0 0  " m20000000" " /" begin-package
-        " nand5536" do-drop-in
-      end-package
-   then
-;
-
-\ This alias will work for either the CS5536 NAND FLASH
-\ or the CaFe NAND FLASH, whichever is present.
 devalias nand /nandflash
 devalias mtd  /nandflash

Modified: cpu/x86/pc/olpc/loaddropins.fth
===================================================================
--- cpu/x86/pc/olpc/loaddropins.fth	2007-10-29 22:58:41 UTC (rev 705)
+++ cpu/x86/pc/olpc/loaddropins.fth	2007-10-29 23:08:01 UTC (rev 706)
@@ -20,7 +20,6 @@

" ${BP}/dev/mmc/sdhci/build/sdhci.fc"  " pci11ab,4101"   $add-deflated-dropin
    " ${BP}/dev/mmc/sdhci/build/sdmmc.fc"  " sdmmc"          $add-deflated-dropin
-   " ${BP}/dev/geode/nandflash/build/nandflash.fc" " nand5536"   $add-deflated-dropin
    " ${BP}/dev/geode/ac97/build/ac97.fc"       " pci1022,2093"   $add-deflated-dropin

" builton.fth"                       " probe-"          $add-dropin

Modified: cpu/x86/pc/olpc/olpc.bth
===================================================================
--- cpu/x86/pc/olpc/olpc.bth	2007-10-29 22:58:41 UTC (rev 705)
+++ cpu/x86/pc/olpc/olpc.bth	2007-10-29 23:08:01 UTC (rev 706)
@@ -8,7 +8,6 @@
 in: ${BP}/cpu/x86/pc/olpc/build/rmstart.img
 in: ${BP}/cpu/x86/pc/olpc/build/paging.di
 in: ${BP}/cpu/x86/pc/olpc/build/fw.dic
-in: ${BP}/dev/geode/nandflash/build/nandflash.fc
 in: ${BP}/dev/mmc/sdhci/build/sdhci.fc
 in: ${BP}/dev/mmc/sdhci/build/sdmmc.fc
 in: ${BP}/dev/geode/ac97/build/ac97.fc