[coreboot] [flashrom] r633 - trunk

svn at coreboot.org svn at coreboot.org
Sun Jun 28 12:57:59 CEST 2009


Author: hailfinger
Date: 2009-06-28 12:57:58 +0200 (Sun, 28 Jun 2009)
New Revision: 633

Modified:
   trunk/flashrom.c
   trunk/it87spi.c
Log:
Handle programmer init errors and abort. If the programmer didn't
initialize correctly, it is pointless to continue.

Fix standalone IT87* SPI init to set flashbus to NONE if no IT87* SPI
communication is possible.
Print the I/O port detected by the IT87* SPI code.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Ward Vandewege <ward at gnu.org>


Modified: trunk/flashrom.c
===================================================================
--- trunk/flashrom.c	2009-06-25 13:57:31 UTC (rev 632)
+++ trunk/flashrom.c	2009-06-28 10:57:58 UTC (rev 633)
@@ -692,7 +692,10 @@
 	if (optind < argc)
 		filename = argv[optind++];
 
-	ret = programmer_init();
+	if (programmer_init()) {
+		fprintf(stderr, "Error: Programmer initialization failed.\n");
+		exit(1);
+	}
 
 	myusec_calibrate_delay();
 

Modified: trunk/it87spi.c
===================================================================
--- trunk/it87spi.c	2009-06-25 13:57:31 UTC (rev 632)
+++ trunk/it87spi.c	2009-06-28 10:57:58 UTC (rev 633)
@@ -83,11 +83,12 @@
 			tmp |= 1 << 4;
 			sio_write(port, 0x24, tmp);
 		}
-		printf("serial flash pin %i\n", (tmp & 1 << 5) ? 87 : 29);
+		printf("Serial flash pin %i\n", (tmp & 1 << 5) ? 87 : 29);
 		/* LDN 0x7, reg 0x64/0x65 */
 		sio_write(port, 0x07, 0x7);
 		flashport = sio_read(port, 0x64) << 8;
 		flashport |= sio_read(port, 0x65);
+		printf("Serial flash port 0x%04x\n", flashport);
 	}
 	exit_conf_mode_ite(port);
 	return flashport;
@@ -113,8 +114,11 @@
 
 	get_io_perms();
 	ret = it87spi_common_init();
-	if (!ret)
+	if (!ret) {
 		buses_supported = CHIP_BUSTYPE_SPI;
+	} else {
+		buses_supported = CHIP_BUSTYPE_NONE;
+	}
 	return ret;
 }
 





More information about the coreboot mailing list