[flashrom] [commit] r1117 - trunk

[repository service]

Author: hailfinger
Date: Thu Jul 29 16:41:46 2010
New Revision: 1117
URL: http://flashrom.org/trac/coreboot/changeset/1117

Log:
Compile gfxnvidia by default, but disallow write/erase.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>

Modified:
   trunk/Makefile
   trunk/gfxnvidia.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Jul 29 15:17:37 2010	(r1116)
+++ trunk/Makefile	Thu Jul 29 16:41:46 2010	(r1117)
@@ -128,8 +128,8 @@
 # Always enable 3Com NICs for now.
 CONFIG_NIC3COM ?= yes
 
-# Disable NVIDIA graphics cards for now, write/erase don't work properly.
-CONFIG_GFXNVIDIA ?= no
+# Enable NVIDIA graphics cards. Note: write and erase do not work properly.
+CONFIG_GFXNVIDIA ?= yes
 
 # Always enable SiI SATA controllers for now.
 CONFIG_SATASII ?= yes

Modified: trunk/gfxnvidia.c
==============================================================================
--- trunk/gfxnvidia.c	Thu Jul 29 15:17:37 2010	(r1116)
+++ trunk/gfxnvidia.c	Thu Jul 29 16:41:46 2010	(r1117)
@@ -82,6 +82,9 @@
 
 	buses_supported = CHIP_BUSTYPE_PARALLEL;
 
+	/* Write/erase doesn't work. */
+	programmer_may_write = 0;
+
 	return 0;
 }