openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

Add an optional flash port parameter for IT87* SPI controllers in standalone programmer mode

Browse Source 
If the parameter is set, the IT87* SPI driver will set the I/O base
port of the IT87* SPI controller interface to the port specified in the
parameter. Usage: flashrom -p it87spi=port=0x820

Corresponding to flashrom svn r646.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Carl-Daniel Hailfinger 2009-07-11 18:05:42 +00:00
parent d0478299b1
commit bb297f733d
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flash.h
View File

@ -479,6 +479,7 @@ int ich_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);
int ich_spi_write_256(struct flashchip *flash, uint8_t * buf);
/* it87spi.c */
extern char *it87opts;
extern uint16_t it8716f_flashport;
void enter_conf_mode_ite(uint16_t port);
void exit_conf_mode_ite(uint16_t port);

8
flashrom.8
View File

@ -184,6 +184,14 @@ Currently the following programmers support this mechanism:
.BR nic3com ,
.BR satasii .
.sp
The it87spi has an optional parameter which will set the I/O base port of the
IT87* SPI controller interface to the port specified in the parameter.
For that you have to use the
.B "flashrom -p it87spi=port=portnum"
syntax where
.B portnum
is an I/O port number which must be a multiple of 8.
.sp
The ft2232spi has an optional parameter specifying the controller type and
interface/port it should support. For that you have to use the
.B "flashrom -p ft2232spi=model,port=interface"

2
flashrom.c
View File

@ -647,6 +647,8 @@ int main(int argc, char *argv[])
pcidev_bdf = strdup(optarg + 8);
} else if (strncmp(optarg, "it87spi", 7) == 0) {
programmer = PROGRAMMER_IT87SPI;
if (optarg[7] == '=')
it87opts = strdup(optarg + 8);
} else if (strncmp(optarg, "ft2232spi", 9) == 0) {
programmer = PROGRAMMER_FT2232SPI;
if (optarg[9] == '=')

27
it87spi.c
View File

@ -1,7 +1,7 @@
/*
* This file is part of the flashrom project.
*
* Copyright (C) 2007, 2008 Carl-Daniel Hailfinger
* Copyright (C) 2007, 2008, 2009 Carl-Daniel Hailfinger
* Copyright (C) 2008 Ronald Hoogenboom <ronald@zonnet.nl>
* Copyright (C) 2008 coresystems GmbH
*
@ -24,12 +24,14 @@
*/
#include <string.h>
#include <stdlib.h>
#include "flash.h"
#include "spi.h"
#define ITE_SUPERIO_PORT1 0x2e
#define ITE_SUPERIO_PORT2 0x4e
char *it87opts = NULL;
uint16_t it8716f_flashport = 0;
/* use fast 33MHz SPI (<>0) or slow 16MHz (0) */
int fast_spi = 1;
@ -56,6 +58,7 @@ void exit_conf_mode_ite(uint16_t port)
static uint16_t find_ite_spi_flash_port(uint16_t port)
{
uint8_t tmp = 0;
char *portpos = NULL;
uint16_t id, flashport = 0;
enter_conf_mode_ite(port);
@ -77,6 +80,9 @@ static uint16_t find_ite_spi_flash_port(uint16_t port)
0xFFF80000, 0xFFFEFFFF, (tmp & 1 << 3) ? "en" : "dis");
printf("LPC write to serial flash %sabled\n",
(tmp & 1 << 4) ? "en" : "dis");
/* The LPC->SPI force write enable below only makes sense for
* non-programmer mode.
*/
/* If any serial flash segment is enabled, enable writing. */
if ((tmp & 0xe) && (!(tmp & 1 << 4))) {
printf("Enabling LPC write to serial flash\n");
@ -89,6 +95,17 @@ static uint16_t find_ite_spi_flash_port(uint16_t port)
flashport = sio_read(port, 0x64) << 8;
flashport |= sio_read(port, 0x65);
printf("Serial flash port 0x%04x\n", flashport);
if (it87opts && !strlen(it87opts)) {
free(it87opts);
it87opts = NULL;
}
if (it87opts && (portpos = strstr(it87opts, "port="))) {
portpos += 5;
flashport = strtol(portpos, (char **)NULL, 0);
printf("Forcing serial flash port 0x%04x\n", flashport);
sio_write(port, 0x64, (flashport >> 8));
sio_write(port, 0x65, (flashport & 0xff));
}
}
exit_conf_mode_ite(port);
return flashport;
@ -206,10 +223,11 @@ int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt,
}
/* Page size is usually 256 bytes */
static int it8716f_spi_page_program(int block, uint8_t *buf, uint8_t *bios)
static int it8716f_spi_page_program(struct flashchip *flash, int block, uint8_t *buf)
{
int i;
int result;
chipaddr bios = flash->virtual_memory;
result = spi_write_enable();
if (result)
@ -217,7 +235,7 @@ static int it8716f_spi_page_program(int block, uint8_t *buf, uint8_t *bios)
OUTB(0x06, it8716f_flashport + 1);
OUTB(((2 + (fast_spi ? 1 : 0)) << 4), it8716f_flashport);
for (i = 0; i < 256; i++) {
bios[256 * block + i] = buf[256 * block + i];
chip_writeb(buf[256 * block + i], bios + 256 * block + i);
}
OUTB(0, it8716f_flashport);
/* Wait until the Write-In-Progress bit is cleared.
@ -288,8 +306,7 @@ int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf)
it8716f_spi_chip_write_1(flash, buf);
} else {
for (i = 0; i < total_size / 256; i++) {
it8716f_spi_page_program(i, buf,
(uint8_t *)flash->virtual_memory);
it8716f_spi_page_program(flash, i, buf);
}
}