phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Patches by Anders Larsen, 17 Sep 2003: 

- fix spelling errors
  - set GD_FLG_DEVINIT flag only after device function pointers
    are valid
  - Allow CFG_ALT_MEMTEST on systems where address zero isn't
    writeable
  - enable 3.rd UART (ST-UART) on PXA(XScale) CPUs
  - trigger watchdog while waiting in serial driver
This commit is contained in:
wdenk 2003-09-18 09:21:33 +00:00
parent b0639ca332
commit 5f535fe170
28 changed files with 76 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -2,6 +2,15 @@
Changes for U-Boot 1.0.0:
======================================================================
* Patches by Anders Larsen, 17 Sep 2003:
- fix spelling errors
- set GD_FLG_DEVINIT flag only after device function pointers
are valid
- Allow CFG_ALT_MEMTEST on systems where address zero isn't
writeable
- enable 3.rd UART (ST-UART) on PXA(XScale) CPUs
- trigger watchdog while waiting in serial driver
* Add auto-update code for TRAB board using USB memory sticks,
support new configuration with more memory

4
README
View File

@ -1498,6 +1498,10 @@ Configuration Settings:
- CFG_ALT_MEMTEST:
Enable an alternate, more extensive memory test.
- CFG_MEMTEST_SCRATCH:
Scratch address used by the alternate memory test
You only need to set this if address zero isn't writeable
- CFG_TFTP_LOADADDR:
Default load address for network file downloads

2
board/at91rm9200dk/flash.c
View File

@ -160,7 +160,7 @@ ulong flash_init (void)
if (i == 0)
flashbase = PHYS_FLASH_1;
else
panic ("configured to many flash banks!\n");
panic ("configured too many flash banks!\n");
sector = 0;
start_address = flashbase;

2
board/cradle/flash.c
View File

@ -59,7 +59,7 @@ ulong flash_init(void)
flashbase = PHYS_FLASH_2;
break;
default:
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
break;
}
for (j = 0; j < flash_info[i].sector_count; j++)

2
board/csb226/flash.c
View File

@ -62,7 +62,7 @@ ulong flash_init(void)
flashbase = PHYS_FLASH_1;
break;
default:
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
break;
}
for (j = 0; j < flash_info[i].sector_count; j++) {

2
board/dnp1110/flash.c
View File

@ -74,7 +74,7 @@ unsigned long flash_init (void)
flash_get_offsets(PHYS_FLASH_1, &flash_info[i]);
break;
default:
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
break;
}
size += flash_info[i].size;

2
board/ep7312/flash.c
View File

@ -50,7 +50,7 @@ ulong flash_init (void)
if (i == 0)
flashbase = PHYS_FLASH_1;
else
panic ("configured to many flash banks!\n");
panic ("configured too many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++) {
flash_info[i].start[j] = flashbase + j * MAIN_SECT_SIZE;
}

2
board/impa7/flash.c
View File

@ -53,7 +53,7 @@ ulong flash_init(void)
else if (i == 1)
flashbase = PHYS_FLASH_2;
else
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++)
{
if (j <= 7)

2
board/innokom/flash.c
View File

@ -276,7 +276,7 @@ ulong flash_init(void)
flashbase = PHYS_FLASH_1;
break;
default:
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
break;
}
for (j = 0; j < flash_info[i].sector_count; j++) {

2
board/lart/flash.c
View File

@ -86,7 +86,7 @@ ulong flash_init(void)
if (i == 0)
flashbase = PHYS_FLASH_1;
else
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++)
{
if (j <= 7)

2
board/logodl/flash.c
View File

@ -91,7 +91,7 @@ ulong flash_init(void)
flashbase = PHYS_FLASH_2;
break;
default:
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
break;
}
for (j = 0; j < flash_info[i].sector_count; j++)

2
board/lubbock/flash.c
View File

@ -76,7 +76,7 @@ unsigned long flash_init (void)
flash_get_offsets (PHYS_FLASH_2, &flash_info[i]);
break;
default:
panic ("configured to many flash banks!\n");
panic ("configured too many flash banks!\n");
break;
}
size += flash_info[i].size;

2
board/ml2/flash.c
View File

@ -72,7 +72,7 @@ ulong flash_init(void) {
if (i==0)
flashbase = CFG_FLASH_BASE;
else
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++)
flash_info[i].start[j]=flashbase + j * SECT_SIZE;

2
board/mpl/vcma9/flash.c
View File

@ -80,7 +80,7 @@ ulong flash_init(void)
if (i == 0)
flashbase = PHYS_FLASH_1;
else
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++)
{
if (j <= 3)

2
board/omap1510inn/flash.c
View File

@ -72,7 +72,7 @@ unsigned long flash_init (void)
flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
break;
default:
panic ("configured to many flash banks!\n");
panic ("configured too many flash banks!\n");
break;
}
size += flash_info[i].size;

2
board/omap1610inn/flash.c
View File

@ -96,7 +96,7 @@ unsigned long flash_init (void)
flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
break;
default:
panic ("configured to many flash banks!\n");
panic ("configured too many flash banks!\n");
break;
}
size += flash_info[i].size;

2
board/sc520_cdp/flash.c
View File

@ -234,7 +234,7 @@ ulong flash_init(void)
flashbase = SC520_FLASH_BANK2_BASE;
break;
default:
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
}
id = identify_flash(flashbase, 4);

2
board/sc520_cdp/flash_old.c
View File

@ -101,7 +101,7 @@ ulong flash_init(void)
flashbase = SC520_FLASH_BANK0_BASE;
break;
default:
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
}
for (j = 0; j < flash_info[i].sector_count; j++) {

2
board/sc520_spunk/flash.c
View File

@ -239,7 +239,7 @@ ulong flash_init(void)
flashbase = SC520_FLASH_BANK0_BASE;
break;
default:
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
}
id = identify_flash(flashbase, 2);

2
board/shannon/flash.c
View File

@ -73,7 +73,7 @@ ulong flash_init(void)
if (i == 0)
flashbase = PHYS_FLASH_1;
else
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++)
{

2
board/shannon/shannon.c
View File

@ -60,7 +60,7 @@ int board_init (void)
*(unsigned long *)temp = 0x00060006;
}
#endif /* CONFIG_INIT_CRITICAL */
#endif /* CONFIG_INFERNO */
/* arch number for shannon */
gd->bd->bi_arch_number = 97;

2
board/smdk2410/flash.c
View File

@ -80,7 +80,7 @@ ulong flash_init(void)
if (i == 0)
flashbase = PHYS_FLASH_1;
else
panic("configured to many flash banks!\n");
panic("configured too many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++)
{
if (j <= 3)

4
common/cmd_mem.c
View File

@ -555,7 +555,11 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
vu_long temp;
vu_long anti_pattern;
vu_long num_words;
#if defined(CFG_MEMTEST_SCRATCH)
vu_long *dummy = (vu_long*)CFG_MEMTEST_SCRATCH;
#else
vu_long *dummy = NULL;
#endif
int j;
int iterations = 1;

6
common/console.c
View File

@ -436,6 +436,8 @@ int console_init_r (void)
console_setfile (stdin, inputdev);
}
gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */
#ifndef CFG_CONSOLE_INFO_QUIET
/* Print information */
printf ("In: ");
@ -480,6 +482,8 @@ int console_init_r (void)
/* Called after the relocation - use desired console functions */
int console_init_r (void)
{
DECLARE_GLOBAL_DATA_PTR;
device_t *inputdev = NULL, *outputdev = NULL;
int i, items = ListNumItems (devlist);
@ -514,6 +518,8 @@ int console_init_r (void)
console_setfile (stdin, inputdev);
}
gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */
#ifndef CFG_CONSOLE_INFO_QUIET
/* Print information */
printf ("In: ");

4
common/devices.c
View File

@ -158,8 +158,6 @@ int device_deregister(char *devname)
int devices_init (void)
{
DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_ARM /* already relocated for current ARM implementation */
ulong relocation_offset = gd->reloc_off;
int i;
@ -195,8 +193,6 @@ int devices_init (void)
#endif
drv_system_init ();
gd-> flags |= GD_FLG_DEVINIT; /* device initialization done */
return (0);
}

2
common/usb.c
View File

@ -595,7 +595,7 @@ struct usb_device * usb_alloc_new_device(void)
int i;
USB_PRINTF("New Device %d\n",dev_index);
if(dev_index==USB_MAX_DEVICE) {
printf("ERROR, to many USB Devices max=%d\n",USB_MAX_DEVICE);
printf("ERROR, too many USB Devices, max=%d\n",USB_MAX_DEVICE);
return NULL;
}
usb_dev[dev_index].devnum=dev_index+1; /* default Address is 0, real addresses start with 1 */

2
cpu/pxa/cpu.c
View File

@ -83,7 +83,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
extern void reset_cpu (ulong addr);
printf ("reseting ...\n");
printf ("resetting ...\n");
udelay (50000); /* wait 50 ms */
disable_interrupts ();

42
cpu/pxa/serial.c
View File

@ -29,6 +29,7 @@
*/
#include <common.h>
#include <watchdog.h>
#include <asm/arch/pxa-regs.h>
void serial_setbrg (void)
@ -38,7 +39,7 @@ void serial_setbrg (void)
unsigned int quot = 0;
if (gd->baudrate == 1200)
quot = 192;
quot = 768;
else if (gd->baudrate == 9600)
quot = 96;
else if (gd->baudrate == 19200)
@ -53,7 +54,6 @@ void serial_setbrg (void)
hang ();
#ifdef CONFIG_FFUART
CKEN |= CKEN6_FFUART;
FFIER = 0; /* Disable for now */
@ -82,9 +82,21 @@ void serial_setbrg (void)
BTIER = IER_UUE; /* Enable BFUART */
#elif defined(CONFIG_STUART)
#error "Bad: not implemented yet!"
CKEN |= CKEN5_STUART;
STIER = 0;
STFCR = 0;
/* set baud rate */
STLCR = LCR_DLAB;
STDLL = quot & 0xff;
STDLH = quot >> 8;
STLCR = LCR_WLS0 | LCR_WLS1;
STIER = IER_UUE; /* Enable STUART */
#else
#error "Bad: you didn't configured serial ..."
#error "Bad: you didn't configure serial ..."
#endif
}
@ -109,13 +121,17 @@ void serial_putc (const char c)
{
#ifdef CONFIG_FFUART
/* wait for room in the tx FIFO on FFUART */
while ((FFLSR & LSR_TEMT) == 0);
while ((FFLSR & LSR_TEMT) == 0)
WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */
FFTHR = c;
#elif defined(CONFIG_BTUART)
while ((BTLSR & LSR_TEMT ) == 0 );
while ((BTLSR & LSR_TEMT ) == 0 )
WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */
BTTHR = c;
#elif defined(CONFIG_STUART)
while ((STLSR & LSR_TEMT ) == 0 )
WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */
STTHR = c;
#endif
/* If \n, also do \r */
@ -135,6 +151,7 @@ int serial_tstc (void)
#elif defined(CONFIG_BTUART)
return BTLSR & LSR_DR;
#elif defined(CONFIG_STUART)
return STLSR & LSR_DR;
#endif
}
@ -146,14 +163,17 @@ int serial_tstc (void)
int serial_getc (void)
{
#ifdef CONFIG_FFUART
while (!(FFLSR & LSR_DR));
while (!(FFLSR & LSR_DR))
WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */
return (char) FFRBR & 0xff;
#elif defined(CONFIG_BTUART)
while (!(BTLSR & LSR_DR));
while (!(BTLSR & LSR_DR))
WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */
return (char) BTRBR & 0xff;
#elif defined(CONFIG_STUART)
while (!(STLSR & LSR_DR))
WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */
return (char) STRBR & 0xff;
#endif
}