ls2k
/
pmon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add SPI flash support. 

1.Pmon can boot from SPI flash SST25VF032B.

  2.The NVRAM_OFFS is defined as 0x7f000,
    the gzrom.bin size should less than 0x7f000.

  3.If add the nand flash function, the gzrom.bin
    size will be out of 0x7f000.

  4.The network card mac addr should be saved
    into SPI flash, and acquired from SPI flash.

Change-Id: Id1f3e642a750ddeeb23f3b726e3f67a1ac855340
Target:LS2G + 1A + DDR3
master
mengtianfang 9 years ago
parent
55d8a69426
commit
9f92bf9903
7 changed files with 722 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      Targets/Bonito2g5ddr3_1a/Bonito/tgt_machdep.c
  2. 3
      Targets/Bonito2g5ddr3_1a/conf/Bonito.2g5ddr3_1a
  3. 3
      Targets/Bonito2g5ddr3_1a/conf/files.Bonito2g5ddr3_1a
  4. 4
      Targets/Bonito2g5ddr3_1a/dev/pflash_tgt.h
  5. 677
      Targets/Bonito2g5ddr3_1a/dev/spi_w.c
  6. 7
      pmon/cmds/load.c
  7. 18
      sys/dev/gmac/synopGMAC_network_interface.c

31
Targets/Bonito2g5ddr3_1a/Bonito/tgt_machdep.c
View File

@ -683,6 +683,18 @@ tgt_flashprogram(void *p, int size, void *s, int endian)
} }
fl_verify_device(p, s, size, TRUE); fl_verify_device(p, s, size, TRUE);
} }
tgt_flashprogram_update_rom(void *p, int size, void *s, int endian)
{
printf("Programming flash %x:%x into %x\n", s, size, p);
if (spi_fl_erase_device(p, size, TRUE)) {
printf("Erase failed!\n");
}
if (spi_fl_program_device(p, s, size, TRUE)) {
printf("Programming failed!\n");
}
spi_fl_verify_device(p, s, size, TRUE);
}
#endif /* PFLASH */ #endif /* PFLASH */
/* /*
@ -740,7 +752,7 @@ tgt_mapenv(int (*func) __P((char *, char *)))
#ifdef NVRAM_IN_FLASH #ifdef NVRAM_IN_FLASH
nvram = (char *)(tgt_flashmap())->fl_map_base; nvram = (char *)(tgt_flashmap())->fl_map_base;
printf("nvram=%08x\n",(unsigned int)nvram); printf("nvram=%08x\n",(unsigned int)nvram);
if(fl_devident(nvram, NULL) == 0 || if(spi_fl_devident(nvram, NULL) == 0 ||
cksum(nvram + NVRAM_OFFS, NVRAM_SIZE, 0) != 0) { cksum(nvram + NVRAM_OFFS, NVRAM_SIZE, 0) != 0) {
#else #else
nvram = (char *)malloc(512); nvram = (char *)malloc(512);
@ -892,12 +904,12 @@ tgt_unsetenv(char *name)
} }
cksum(nvrambuf, NVRAM_SIZE, 1); cksum(nvrambuf, NVRAM_SIZE, 1);
#ifdef NVRAM_IN_FLASH #ifdef NVRAM_IN_FLASH
if(fl_erase_device(nvram, NVRAM_SECSIZE, FALSE)) { if(spi_fl_erase_device(nvram, NVRAM_SECSIZE, FALSE)) {
status = -1; status = -1;
break; break;
} }
if(fl_program_device(nvram, nvramsecbuf, NVRAM_SECSIZE, FALSE)) { if(spi_fl_program_device(nvram, nvramsecbuf, NVRAM_SECSIZE, FALSE)) {
status = -1; status = -1;
break; break;
} }
@ -969,12 +981,12 @@ tgt_setenv(char *name, char *value) {
cksum((void *)nvrambuf, NVRAM_SIZE, 1); cksum((void *)nvrambuf, NVRAM_SIZE, 1);
printf("Warning! NVRAM checksum fail. Reset!\n"); printf("Warning! NVRAM checksum fail. Reset!\n");
#ifdef NVRAM_IN_FLASH #ifdef NVRAM_IN_FLASH
if(fl_erase_device(nvram, NVRAM_SECSIZE, FALSE)) { if(spi_fl_erase_device(nvram, NVRAM_SECSIZE, FALSE)) {
printf("Error! Nvram erase failed!\n"); printf("Error! Nvram erase failed!\n");
free(nvramsecbuf); free(nvramsecbuf);
return(-1); return(-1);
} }
if(fl_program_device(nvram, nvramsecbuf, NVRAM_SECSIZE, FALSE)) { if(spi_fl_program_device(nvram, nvramsecbuf, NVRAM_SECSIZE, FALSE)) {
printf("Error! Nvram init failed!\n"); printf("Error! Nvram init failed!\n");
free(nvramsecbuf); free(nvramsecbuf);
return(-1); return(-1);
@ -1002,7 +1014,8 @@ tgt_setenv(char *name, char *value) {
#endif #endif
nvrambuf = nvramsecbuf + (NVRAM_OFFS & (NVRAM_SECSIZE - 1)); nvrambuf = nvramsecbuf + (NVRAM_OFFS & (NVRAM_SECSIZE - 1));
/* Etheraddr is special case to save space */ /* Etheraddr is special case to save space */
#if 1 /*added by tangyt*/
/*added by tangyt*/
if (strcmp("activecom",name)==0) if (strcmp("activecom",name)==0)
{ {
activecom=strtoul(value,0,0); activecom=strtoul(value,0,0);
@ -1022,8 +1035,6 @@ tgt_setenv(char *name, char *value) {
} }
} else } else
#endif
if (strcmp("ethaddr", name) == 0) { if (strcmp("ethaddr", name) == 0) {
char *s = value; char *s = value;
int i; int i;
@ -1089,12 +1100,12 @@ tgt_setenv(char *name, char *value) {
bcopy(hwethadr, &nvramsecbuf[ETHER_OFFS], 6); bcopy(hwethadr, &nvramsecbuf[ETHER_OFFS], 6);
bcopy(hwethadr1, &nvramsecbuf[ETHER1_OFFS], 6); bcopy(hwethadr1, &nvramsecbuf[ETHER1_OFFS], 6);
#ifdef NVRAM_IN_FLASH #ifdef NVRAM_IN_FLASH
if(fl_erase_device(nvram, NVRAM_SECSIZE, FALSE)) { if(spi_fl_erase_device(nvram, NVRAM_SECSIZE, FALSE)) {
printf("Error! Nvram erase failed!\n"); printf("Error! Nvram erase failed!\n");
free(nvramsecbuf); free(nvramsecbuf);
return(0); return(0);
} }
if(fl_program_device(nvram, nvramsecbuf, NVRAM_SECSIZE, FALSE)) { if(spi_fl_program_device(nvram, nvramsecbuf, NVRAM_SECSIZE, FALSE)) {
printf("Error! Nvram program failed!\n"); printf("Error! Nvram program failed!\n");
free(nvramsecbuf); free(nvramsecbuf);
return(0); return(0);

3
Targets/Bonito2g5ddr3_1a/conf/Bonito.2g5ddr3_1a
View File

@ -44,7 +44,8 @@ select mod_s3load # Srecord loading
#select mod_fastload # LSI Fastload #select mod_fastload # LSI Fastload
select mod_elfload # ELF loading select mod_elfload # ELF loading
option SST008A #option SST008A # LPC flash
option SST25VF032B # SPI flash
# #
# Command selection. Selects pmon commands # Command selection. Selects pmon commands
# #

3
Targets/Bonito2g5ddr3_1a/conf/files.Bonito2g5ddr3_1a
View File

@ -16,6 +16,9 @@ file Targets/Bonito2g5ddr3_1a/dev/localbus.c localbus
device lohci {[channel = -1]} :usbbus device lohci {[channel = -1]} :usbbus
attach lohci at localbus attach lohci at localbus
#SPI
file Targets/Bonito2g5ddr3_1a/dev/spi_w.c
#GMAC #GMAC
file sys/dev/gmac/synopGMAC_Host.c file sys/dev/gmac/synopGMAC_Host.c
file sys/dev/gmac/synopGMAC_Dev.c file sys/dev/gmac/synopGMAC_Dev.c

4
Targets/Bonito2g5ddr3_1a/dev/pflash_tgt.h
View File

@ -47,8 +47,10 @@
* boot device. * boot device.
*/ */
#ifdef SST008A #if defined SST008A
#define FLASH_SIZE_BYTE 0x100000 #define FLASH_SIZE_BYTE 0x100000
#elif defined SST25VF032B
#define FLASH_SIZE_BYTE 0x100000
#else #else
#define FLASH_SIZE_BYTE 0x80000 #define FLASH_SIZE_BYTE 0x80000
#endif #endif

677
Targets/Bonito2g5ddr3_1a/dev/spi_w.c
View File

@ -0,0 +1,677 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#undef _KERNEL
#include <errno.h>
#include <pmon.h>
#include <include/types.h>
#include <pflash.h>
#define SPI_BASE 0xbfe00220
#define SPCR 0x0
#define SPSR 0x1
#define TXFIFO 0x2
#define RXFIFO 0x2
#define SPER 0x3
#define PARAM 0x4
#define SOFTCS 0x5
#define PARAM2 0x6
#define RFEMPTY 1
#define SET_SPI(addr,val) *(volatile char *)(SPI_BASE + addr) = val;
#define GET_SPI(addr) *(volatile char *)(SPI_BASE + addr)
static quad_t widedata;
int write_sr(char val);
void spi_initw()
{
SET_SPI(SPSR, 0xc0);
SET_SPI(PARAM, 0x40); //espr:0100
SET_SPI(SPER, 0x05); //spre:01
SET_SPI(PARAM2,0x01);
SET_SPI(SPCR, 0x50);
}
void spi_initr()
{
SET_SPI(PARAM, 0x47); //espr:0100
}
/* read status reg */
int read_sr(void)
{
int val;
SET_SPI(SOFTCS,0x01);
SET_SPI(TXFIFO,0x05);
while((GET_SPI(SPSR))&RFEMPTY)
;
val = GET_SPI(RXFIFO);
SET_SPI(TXFIFO,0x00);
while((GET_SPI(SPSR))&RFEMPTY == RFEMPTY);
val = GET_SPI(RXFIFO);
SET_SPI(SOFTCS,0x11);
return val;
}
/* set write enable */
int set_wren(void)
{
int res;
res = read_sr();
while(res&0x01 == 1)
{
res = read_sr();
}
SET_SPI(SOFTCS, 0x01);
SET_SPI(TXFIFO, 0x6);
while((GET_SPI(SPSR))&RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(SOFTCS, 0x11);
return 1;
}
/* write status reg */
int write_sr(char val)
{
int res;
set_wren();
res = read_sr();
while(res&0x01 == 1)
{
res = read_sr();
}
SET_SPI(SOFTCS, 0x01);
SET_SPI(TXFIFO, 0x01);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, val);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(SOFTCS, 0x11);
return 1;
}
/* erase all memory */
int erase_all(void)
{
int res;
int i = 1;
spi_initw();
set_wren();
res = read_sr();
while(res & 0x01 == 1)
{
res = read_sr();
}
SET_SPI(SOFTCS, 0x1);
SET_SPI(TXFIFO, 0xC7);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(SOFTCS, 0x11);
while(i++){
if(read_sr() & 0x1 == 0x1){
if(i % 10000 == 0)
printf(".");
} else {
printf("done...\n");
break;
}
}
return 1;
}
void spi_read_id(void)
{
unsigned char val;
spi_initw();
val = read_sr();
while(val&0x01 == 1)
{
val = read_sr();
}
/* CE 0 */
SET_SPI(SOFTCS, 0x01);
/* READ ID CMD */
SET_SPI(TXFIFO, 0x9f);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
/* Manufacturer’s ID */
SET_SPI(TXFIFO, 0x00);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
val = GET_SPI(RXFIFO);
printf("Manufacturer's ID: %x\n",val);
/* Device ID:Memory Type */
SET_SPI(TXFIFO, 0x00);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
val = GET_SPI(RXFIFO);
printf("Device ID-memory_type: %x\n",val);
/* Device ID:Memory Capacity */
SET_SPI(TXFIFO, 0x00);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
val = GET_SPI(RXFIFO);
printf("Device ID-memory_capacity: %x\n",val);
/* CE 1 */
SET_SPI(SOFTCS, 0x11);
}
void spi_write_byte(unsigned int addr,unsigned char data)
{
/* byte_program,CE 0, cmd 0x2,addr2,addr1,addr0,data in,CE 1 */
unsigned char addr2, addr1, addr0;
unsigned char val;
addr2 = (addr & 0xff0000) >> 16;
addr1 = (addr & 0x00ff00) >> 8;
addr0 = (addr & 0x0000ff);
set_wren();
val = read_sr();
while(val & 0x01 == 1)
{
val = read_sr();
}
SET_SPI(SOFTCS, 0x01);/*CE 0*/
SET_SPI(TXFIFO, 0x2);/*byte_program */
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
val = GET_SPI(RXFIFO);
/*send addr2*/
SET_SPI(TXFIFO, addr2);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
val = GET_SPI(RXFIFO);
/*send addr1*/
SET_SPI(TXFIFO, addr1);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
val = GET_SPI(RXFIFO);
/*send addr0*/
SET_SPI(TXFIFO, addr0);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
val = GET_SPI(RXFIFO);
/*send data(one byte)*/
SET_SPI(TXFIFO, data);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
val = GET_SPI(RXFIFO);
/*CE 1*/
SET_SPI(SOFTCS, 0x11);
}
int write_pmon_byte(int argc, char ** argv)
{
unsigned int addr;
unsigned char val;
if(argc != 3){
printf("\nuse: write_pmon_byte dst(flash addr) data\n");
return -1;
}
addr = strtoul(argv[1], 0, 0);
val = strtoul(argv[2], 0, 0);
spi_write_byte(addr, val);
return 0;
}
int write_pmon(int argc,char **argv)
{
long int j = 0;
unsigned char val;
unsigned int ramaddr, flashaddr, size;
if(argc != 4){
printf("\nuse: write_pmon src(ram addr) dst(flash addr) size\n");
return -1;
}
ramaddr = strtoul(argv[1], 0, 0);
flashaddr = strtoul(argv[2], 0, 0);
size = strtoul(argv[3], 0, 0);
spi_initw();
write_sr(0);
/* read flash id command */
spi_read_id();
val = GET_SPI(SPSR);
printf("====spsr value:%x\n",val);
SET_SPI(0x5, 0x10);
/* erase the flash */
write_sr(0x00);
// erase_all();
printf("\nfrom ram 0x%08x to flash 0x%08x size 0x%08x \n\nprogramming ",
ramaddr, flashaddr, size);
for(j=0; size > 0; flashaddr++, ramaddr++, size--, j++)
{
spi_write_byte(flashaddr, *((unsigned char*)ramaddr));
if(j % 0x1000 == 0)
printf("\b\b\b\b\b\b\b\b\b\b0x%08x", j);
}
printf("\b\b\b\b\b\b\b\b\b\b0x%08x end...\n", j);
SET_SPI(0x5, 0x11);
return 1;
}
int read_pmon_byte(unsigned int addr,unsigned int num)
{
unsigned char val,data;
val = read_sr();
while(val & 0x01 == 1)
{
val = read_sr();
}
SET_SPI(0x5, 0x01);
/* read flash command */
SET_SPI(TXFIFO, 0x03);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
/* addr */
SET_SPI(TXFIFO, 0x00);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, 0x00);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, 0x00);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, 0x00);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
data = GET_SPI(RXFIFO);
SET_SPI(0x5, 0x11);
return data;
}
int read_pmon(int argc, char **argv)
{
unsigned char addr2, addr1, addr0;
unsigned char data;
int val,base = 0;
int addr;
int i;
if(argc != 3)
{
printf("\nuse: read_pmon addr(flash) size\n");
return -1;
}
addr = strtoul(argv[1], 0, 0);
i = strtoul(argv[2], 0, 0);
spi_initw();
val = read_sr();
while(val & 0x01 == 1)
{
val = read_sr();
}
SET_SPI(0x5, 0x01);
/* read flash command */
SET_SPI(TXFIFO, 0x03);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
/* addr */
SET_SPI(TXFIFO, ((addr >> 16) & 0xff));
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, ((addr >> 8) & 0xff));
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, (addr & 0xff));
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
GET_SPI(RXFIFO);
/* addr end */
printf("\n");
while(i--)
{
SET_SPI(TXFIFO, 0x00);
while((GET_SPI(SPSR)) & RFEMPTY == RFEMPTY){
}
data = GET_SPI(RXFIFO);
if(base % 16 == 0 ){
printf("0x%08x ",base);
}
printf("%02x ", data);
if(base % 16 == 7)
printf(" ");
if(base % 16 == 15)
printf("\n");
base++;
}
printf("\n");
return 1;
}
int spi_erase_area(unsigned int saddr, unsigned int eaddr, unsigned sectorsize)
{
unsigned int addr;
spi_initw();
for(addr = saddr; addr < eaddr; addr += sectorsize)
{
SET_SPI(SOFTCS, 0x11);
set_wren();
write_sr(0x00);
while(read_sr() & 1);
set_wren();
SET_SPI(SOFTCS, 0x01);
/*
* 0x20 erase 4kbyte of memory array
* 0x52 erase 32kbyte of memory array
* 0xd8 erase 64kbyte of memory array
*/
SET_SPI(TXFIFO, 0x20);
while((GET_SPI(SPSR)) & RFEMPTY);
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, addr >> 16);
while((GET_SPI(SPSR)) & RFEMPTY);
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, addr >> 8);
while((GET_SPI(SPSR)) & RFEMPTY);
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, addr);
while((GET_SPI(SPSR)) & RFEMPTY);
GET_SPI(RXFIFO);
SET_SPI(SOFTCS, 0x11);
while(read_sr() & 1);
}
SET_SPI(SOFTCS, 0x11);
delay(10);
return 0;
}
int spi_write_area(int flashaddr, char *buffer, int size)
{
int j;
spi_initw();
SET_SPI(0x5, 0x10);
write_sr(0x00);
for(j = 0; size > 0; flashaddr++, size--, j++)
{
spi_write_byte(flashaddr, buffer[j]);
dotik(32, 0);
}
SET_SPI(SOFTCS, 0x11);
delay(10);
return 0;
}
int spi_read_area(int flashaddr, char *buffer, int size)
{
int i;
spi_initw();
SET_SPI(SOFTCS, 0x01);
SET_SPI(TXFIFO, 0x03);
while((GET_SPI(SPSR)) & RFEMPTY);
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, flashaddr >> 16);
while((GET_SPI(SPSR)) & RFEMPTY);
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, flashaddr >> 8);
while((GET_SPI(SPSR)) & RFEMPTY);
GET_SPI(RXFIFO);
SET_SPI(TXFIFO, flashaddr);
while((GET_SPI(SPSR)) & RFEMPTY);
GET_SPI(RXFIFO);
for(i=0; i < size; i++)
{
SET_SPI(TXFIFO,0);
while((GET_SPI(SPSR)) & RFEMPTY);
buffer[i] = GET_SPI(RXFIFO);
}
SET_SPI(SOFTCS, 0x11);
delay(10);
return 0;
}
struct fl_device myflash = {
.fl_name = "spiflash",
.fl_size = 0x100000,
.fl_secsize = 0x10000,
};
struct fl_device *spi_fl_devident(void *base, struct fl_map **m)
{
if(m)
*m = fl_find_map(base);
return &myflash;
}
int spi_fl_program_device(void *fl_base, void *data_base, int data_size, int verbose)
{
struct fl_map *map;
int off;
map = fl_find_map(fl_base);
off = (int)(fl_base - map->fl_map_base) + map->fl_map_offset;
spi_write_area(off, data_base, data_size);
spi_initr();
return 0;
}
int spi_fl_erase_device(void *fl_base, int size, int verbose)
{
struct fl_map *map;
int off;
map = fl_find_map(fl_base);
off = (int)(fl_base - map->fl_map_base) + map->fl_map_offset;
spi_erase_area(off, off + size, 0x1000);//4K
spi_initr();
return 0;
}
int spi_fl_verify_device(void *fl_base, void *data_base, int data_size, int verbose)
{
struct fl_map *map;
struct fl_device *dev;
void *fl_last;
int ok;
int i;
dev = spi_fl_devident(fl_base, &map);
if(dev == NULL) {
return(-3); /* No flash device found at address */
}
if(data_size == -1 || (int)data_base == -1) {
return(-4); /* Bad parameters */
}
if((data_size + ((int)fl_base - map->fl_map_base)) > map->fl_map_size) {
return(-4); /* Size larger than device array */
}
if(verbose) {
printf("Verifying FLASH. ");
}
for(i = 0; i < data_size; i += map->fl_map_width) {
fl_last = fl_base;
switch(map->fl_map_bus) {
case FL_BUS_8:
ok = (*((u_char *)fl_base) == *((u_char *)data_base));
fl_base++;
data_base++;
break;
case FL_BUS_16:
ok = (*((u_short *)fl_base) == *((u_short *)data_base));
fl_base += 2;
data_base += 2;
break;
case FL_BUS_32:
ok = (*((u_int *)fl_base) == *((u_int *)data_base));
fl_base += 4;
data_base += 4;
break;
case FL_BUS_64:
movequad(&widedata, fl_base);
ok = (bcmp(data_base, (void *)&widedata, 8) == 0);
data_base += 8;
fl_base += 8;
break;
case FL_BUS_8_ON_64:
ok = (*((u_char *)map->fl_map_base +
(((int)fl_base - map->fl_map_base) << 3)) ==
*(u_char *)data_base++);
fl_base++;
break;
}
if(verbose & !ok) {
printf(" error offset %p\n", fl_last);
char str[100];
int timeout;
printf("erase all chip(y/N)?");
gets(str);
if(str[0] == 'y' || str[0] == 'Y')
{
tgt_flashwrite_enable();
printf("Erasing all FLASH blocks. ");
spi_fl_erase_device(map->fl_map_base, map->fl_map_size, FALSE);
tgt_flashwrite_disable();
}
break;
} else if(verbose) {
dotik(32, 0);
}
}
if(verbose && ok) {
printf("\b No Errors found.\n");
}
return(ok);
}
static const Cmd Cmds[] =
{
{"MyCmds"},
{"spi_initw","",0,"spi_initw(sst25vf080b)",spi_initw,0,99,CMD_REPEAT},
{"read_pmon","",0,"read_pmon(sst25vf080b)",read_pmon,0,99,CMD_REPEAT},
{"write_pmon","",0,"write_pmon(sst25vf080b)",write_pmon,0,99,CMD_REPEAT},
{"erase_all","",0,"erase_all(sst25vf080b)",erase_all,0,99,CMD_REPEAT},
{"write_pmon_byte","",0,"write_pmon_byte(sst25vf080b)",write_pmon_byte,0,99,CMD_REPEAT},
{"read_flash_id","",0,"read_flash_id(sst25vf080b)",spi_read_id,0,99,CMD_REPEAT},
{0,0}
};
static void init_cmd __P((void)) __attribute__ ((constructor));
static void
init_cmd()
{
cmdlist_expand(Cmds, 1);
}

7
pmon/cmds/load.c
View File

@ -275,10 +275,17 @@ nload (argc, argv)
extern long dl_maxaddr; extern long dl_maxaddr;
if (flags & WFLAG) if (flags & WFLAG)
bootbigend = !bootbigend; bootbigend = !bootbigend;
#ifdef SST25VF032B
tgt_flashprogram_update_rom ((void *)flashaddr,
dl_maxaddr - dl_minaddr,
(void *)heaptop,
bootbigend);
#else
tgt_flashprogram ((void *)flashaddr, /* address */ tgt_flashprogram ((void *)flashaddr, /* address */
dl_maxaddr - dl_minaddr, /* size */ dl_maxaddr - dl_minaddr, /* size */
(void *)heaptop, /* load */ (void *)heaptop, /* load */
bootbigend); bootbigend);
#endif
} }
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;

18
sys/dev/gmac/synopGMAC_network_interface.c
View File

@ -2636,15 +2636,15 @@ void setup_tx_desc(synopGMACdevice * gmacdev)
#if defined(LOONGSON_2G5536)||defined(LOONGSON_2G1A) #if defined(LOONGSON_2G5536)||defined(LOONGSON_2G1A)
void parseenv(int index, u8 * buf) void parseenv(int index, u8 * buf)
{ {
int i; int i;
char * buffer = (char *)0xbfcff000; char * buffer = (char *)0xbfc00000 + NVRAM_OFFS;
if(index == 0) if(index == 0)
for(i = 0; i < 6; i++) for(i = 0; i < 6; i++)
buf[i] = buffer[ETHER_OFFS+i]; buf[i] = buffer[ETHER_OFFS + i];
else if(index==1) else if(index == 1)
for(i=0;i<6;i++) for(i = 0; i < 6; i++)
buf[i] = buffer[ETHER1_OFFS+i]; buf[i] = buffer[ETHER1_OFFS + i];
} }
#endif #endif

Write Preview
Loading…
Cancel
Save