V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Make compile clean.

This commit is contained in:
wdenk 2004-04-25 16:40:11 +00:00
parent fc1cfcdb12
commit 08f1080c9c
3 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
board/jse/flash.c
View File

@ -54,19 +54,17 @@ static void flash_get_offsets (ulong base, flash_info_t * info);
unsigned long flash_init (void) unsigned long flash_init (void)
{ {
unsigned long size_b0; unsigned long size_b0;
unsigned long base_b0;
/* Init: no FLASHes known */ /* Init: no FLASHes known */
flash_info[0].flash_id = FLASH_UNKNOWN; flash_info[0].flash_id = FLASH_UNKNOWN;
/* Static FLASH Bank configuration here - FIXME XXX */ /* Static FLASH Bank configuration here - FIXME XXX */
size_b0 = size_b0 = flash_get_size ((vu_long *) FLASH_BASE0_PRELIM, &flash_info[0]);
flash_get_size ((vu_long *) FLASH_BASE0_PRELIM,
&flash_info[0]);
if (flash_info[0].flash_id == FLASH_UNKNOWN) { if (flash_info[0].flash_id == FLASH_UNKNOWN) {
printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n", size_b0, size_b0 << 20); printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
size_b0, size_b0 << 20);
} }
/* Only one bank */ /* Only one bank */
@ -212,14 +210,9 @@ void flash_print_info (flash_info_t * info)
if ((i % 5) == 0) if ((i % 5) == 0)
printf ("\n "); printf ("\n ");
#if 0 /* test-only */
printf (" %08lX%s",
info->start[i], info->protect[i] ? " (RO)" : " "
#else
printf (" %08lX%s%s", printf (" %08lX%s%s",
info->start[i], info->start[i],
erased ? " E" : " ", info->protect[i] ? "RO " : " " erased ? " E" : " ", info->protect[i] ? "RO " : " "
#endif
); );
} }
printf ("\n"); printf ("\n");
@ -248,11 +241,7 @@ static ulong flash_get_size (vu_long * addr, flash_info_t * info)
addr2[ADDR1] = (FLASH_WORD_SIZE) 0x00550055; addr2[ADDR1] = (FLASH_WORD_SIZE) 0x00550055;
addr2[ADDR0] = (FLASH_WORD_SIZE) 0x00900090; addr2[ADDR0] = (FLASH_WORD_SIZE) 0x00900090;
#ifdef CONFIG_ADCIOP
value = addr2[2];
#else
value = addr2[0]; value = addr2[0];
#endif
switch (value) { switch (value) {
case (FLASH_WORD_SIZE) AMD_MANUFACT: case (FLASH_WORD_SIZE) AMD_MANUFACT:
@ -271,12 +260,7 @@ static ulong flash_get_size (vu_long * addr, flash_info_t * info)
return (0); /* no or unknown flash */ return (0); /* no or unknown flash */
} }
#ifdef CONFIG_ADCIOP
value = addr2[0]; /* device ID */
/* printf("\ndev_code=%x\n", value); */
#else
value = addr2[1]; /* device ID */ value = addr2[1]; /* device ID */
#endif
switch (value) { switch (value) {
case (FLASH_WORD_SIZE) AMD_ID_F040B: case (FLASH_WORD_SIZE) AMD_ID_F040B:
@ -387,36 +371,19 @@ static ulong flash_get_size (vu_long * addr, flash_info_t * info)
for (i = 0; i < info->sector_count; i++) { for (i = 0; i < info->sector_count; i++) {
/* read sector protection at sector address, (A7 .. A0) = 0x02 */ /* read sector protection at sector address, (A7 .. A0) = 0x02 */
/* D0 = 1 if protected */ /* D0 = 1 if protected */
#ifdef CONFIG_ADCIOP
addr2 = (volatile FLASH_WORD_SIZE *) (info->start[i]);
info->protect[i] = addr2[4] & 1;
#else
addr2 = (volatile FLASH_WORD_SIZE *) (info->start[i]); addr2 = (volatile FLASH_WORD_SIZE *) (info->start[i]);
if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
info->protect[i] = 0; info->protect[i] = 0;
else else
info->protect[i] = addr2[2] & 1; info->protect[i] = addr2[2] & 1;
#endif
} }
/* /*
* Prevent writes to uninitialized FLASH. * Prevent writes to uninitialized FLASH.
*/ */
if (info->flash_id != FLASH_UNKNOWN) { if (info->flash_id != FLASH_UNKNOWN) {
#if 0 /* test-only */
#ifdef CONFIG_ADCIOP
addr2 = (volatile unsigned char *) info->start[0];
addr2[ADDR0] = 0xAA;
addr2[ADDR1] = 0x55;
addr2[ADDR0] = 0xF0; /* reset bank */
#else
addr2 = (FLASH_WORD_SIZE *) info->start[0]; addr2 = (FLASH_WORD_SIZE *) info->start[0];
*addr2 = (FLASH_WORD_SIZE) 0x00F000F0; /* reset bank */ *addr2 = (FLASH_WORD_SIZE) 0x00F000F0; /* reset bank */
#endif
#else /* test-only */
addr2 = (FLASH_WORD_SIZE *) info->start[0];
*addr2 = (FLASH_WORD_SIZE) 0x00F000F0; /* reset bank */
#endif /* test-only */
} }
return (info->size); return (info->size);

1
board/stxgp3/stxgp3.c
View File

@ -195,7 +195,6 @@ const iop_conf_t iop_conf_tab[4][32] = {
} }
}; };
static uint64_t blinky_increment;
static uint64_t next_led_update; static uint64_t next_led_update;
static uint led_bit; static uint led_bit;

5
common/cmd_ace.c
View File

@ -53,7 +53,7 @@ static unsigned ace_readw(unsigned offset)
return readw(CFG_SYSTEMACE_BASE+offset); return readw(CFG_SYSTEMACE_BASE+offset);
} }
static unsigned ace_writew(unsigned val, unsigned offset) static void ace_writew(unsigned val, unsigned offset)
{ {
writew(val, CFG_SYSTEMACE_BASE+offset); writew(val, CFG_SYSTEMACE_BASE+offset);
} }
@ -119,7 +119,6 @@ static unsigned long systemace_read(int dev,
unsigned long blkcnt, unsigned long blkcnt,
unsigned long *buffer) unsigned long *buffer)
{ {
unsigned val;
int retry; int retry;
unsigned blk_countdown; unsigned blk_countdown;
unsigned char*dp = (unsigned char*)buffer; unsigned char*dp = (unsigned char*)buffer;
@ -218,4 +217,4 @@ static unsigned long systemace_read(int dev,
return blkcnt; return blkcnt;
} }
#endif #endif /* CONFIG_SYSTEMACE */