From 5f535fe170e2cd90ee65922cbad1a5428d85a9e6 Mon Sep 17 00:00:00 2001 From: wdenk Date: Thu, 18 Sep 2003 09:21:33 +0000 Subject: [PATCH] * 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 --- CHANGELOG | 9 ++++++++ README | 4 ++++ board/at91rm9200dk/flash.c | 2 +- board/cradle/flash.c | 2 +- board/csb226/flash.c | 2 +- board/dnp1110/flash.c | 2 +- board/ep7312/flash.c | 2 +- board/impa7/flash.c | 2 +- board/innokom/flash.c | 2 +- board/lart/flash.c | 2 +- board/logodl/flash.c | 2 +- board/lubbock/flash.c | 2 +- board/ml2/flash.c | 2 +- board/mpl/vcma9/flash.c | 2 +- board/omap1510inn/flash.c | 2 +- board/omap1610inn/flash.c | 2 +- board/sc520_cdp/flash.c | 2 +- board/sc520_cdp/flash_old.c | 2 +- board/sc520_spunk/flash.c | 2 +- board/shannon/flash.c | 2 +- board/shannon/shannon.c | 2 +- board/smdk2410/flash.c | 2 +- common/cmd_mem.c | 4 ++++ common/console.c | 6 ++++++ common/devices.c | 4 ---- common/usb.c | 2 +- cpu/pxa/cpu.c | 2 +- cpu/pxa/serial.c | 42 +++++++++++++++++++++++++++---------- 28 files changed, 76 insertions(+), 37 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 83b5b6ab68..9782fd49b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/README b/README index 691140f53c..aee88ed725 100644 --- a/README +++ b/README @@ -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 diff --git a/board/at91rm9200dk/flash.c b/board/at91rm9200dk/flash.c index ebbd6f4aec..9a67755dc3 100644 --- a/board/at91rm9200dk/flash.c +++ b/board/at91rm9200dk/flash.c @@ -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; diff --git a/board/cradle/flash.c b/board/cradle/flash.c index e2d174e524..d867a11ce3 100644 --- a/board/cradle/flash.c +++ b/board/cradle/flash.c @@ -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++) diff --git a/board/csb226/flash.c b/board/csb226/flash.c index 9801773eb7..6b0e51ac43 100644 --- a/board/csb226/flash.c +++ b/board/csb226/flash.c @@ -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++) { diff --git a/board/dnp1110/flash.c b/board/dnp1110/flash.c index 4416393fec..60874ba9b8 100644 --- a/board/dnp1110/flash.c +++ b/board/dnp1110/flash.c @@ -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; diff --git a/board/ep7312/flash.c b/board/ep7312/flash.c index 1ee0a37a00..c687cc7365 100644 --- a/board/ep7312/flash.c +++ b/board/ep7312/flash.c @@ -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; } diff --git a/board/impa7/flash.c b/board/impa7/flash.c index da4d31eb1e..3e380e5f49 100644 --- a/board/impa7/flash.c +++ b/board/impa7/flash.c @@ -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) diff --git a/board/innokom/flash.c b/board/innokom/flash.c index 3caf43d21c..29c9166484 100644 --- a/board/innokom/flash.c +++ b/board/innokom/flash.c @@ -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++) { diff --git a/board/lart/flash.c b/board/lart/flash.c index ad6134be74..013c2fd10f 100644 --- a/board/lart/flash.c +++ b/board/lart/flash.c @@ -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) diff --git a/board/logodl/flash.c b/board/logodl/flash.c index cef0b4dee4..8c304f9392 100644 --- a/board/logodl/flash.c +++ b/board/logodl/flash.c @@ -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++) diff --git a/board/lubbock/flash.c b/board/lubbock/flash.c index 9e07b1140d..ba82892dde 100644 --- a/board/lubbock/flash.c +++ b/board/lubbock/flash.c @@ -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; diff --git a/board/ml2/flash.c b/board/ml2/flash.c index 090725df1d..4f805a663b 100644 --- a/board/ml2/flash.c +++ b/board/ml2/flash.c @@ -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; diff --git a/board/mpl/vcma9/flash.c b/board/mpl/vcma9/flash.c index 91517c463f..829396bfd0 100644 --- a/board/mpl/vcma9/flash.c +++ b/board/mpl/vcma9/flash.c @@ -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) diff --git a/board/omap1510inn/flash.c b/board/omap1510inn/flash.c index 6b2739d3ab..9453987aa9 100644 --- a/board/omap1510inn/flash.c +++ b/board/omap1510inn/flash.c @@ -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; diff --git a/board/omap1610inn/flash.c b/board/omap1610inn/flash.c index 59f5b68b38..0108545d41 100644 --- a/board/omap1610inn/flash.c +++ b/board/omap1610inn/flash.c @@ -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; diff --git a/board/sc520_cdp/flash.c b/board/sc520_cdp/flash.c index 2f7ce5254a..d52a847c73 100644 --- a/board/sc520_cdp/flash.c +++ b/board/sc520_cdp/flash.c @@ -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); diff --git a/board/sc520_cdp/flash_old.c b/board/sc520_cdp/flash_old.c index 416b01d2a5..3c0f6d6a68 100644 --- a/board/sc520_cdp/flash_old.c +++ b/board/sc520_cdp/flash_old.c @@ -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++) { diff --git a/board/sc520_spunk/flash.c b/board/sc520_spunk/flash.c index d97dc21865..4942e598d3 100644 --- a/board/sc520_spunk/flash.c +++ b/board/sc520_spunk/flash.c @@ -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); diff --git a/board/shannon/flash.c b/board/shannon/flash.c index 74f5f6929b..65ebc279c5 100644 --- a/board/shannon/flash.c +++ b/board/shannon/flash.c @@ -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++) { diff --git a/board/shannon/shannon.c b/board/shannon/shannon.c index 1876e3ed31..c090bde4aa 100644 --- a/board/shannon/shannon.c +++ b/board/shannon/shannon.c @@ -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; diff --git a/board/smdk2410/flash.c b/board/smdk2410/flash.c index d7479f085f..a37c6f8fb8 100644 --- a/board/smdk2410/flash.c +++ b/board/smdk2410/flash.c @@ -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) diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 3e225988bb..3918678140 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -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; diff --git a/common/console.c b/common/console.c index 148c59981d..d933c33519 100644 --- a/common/console.c +++ b/common/console.c @@ -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: "); diff --git a/common/devices.c b/common/devices.c index 4839eacbb1..7b4a1cd81f 100644 --- a/common/devices.c +++ b/common/devices.c @@ -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); } diff --git a/common/usb.c b/common/usb.c index 9474abee4d..a96052a0c0 100644 --- a/common/usb.c +++ b/common/usb.c @@ -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 */ diff --git a/cpu/pxa/cpu.c b/cpu/pxa/cpu.c index cc9b3ff408..6b82f04f7d 100644 --- a/cpu/pxa/cpu.c +++ b/cpu/pxa/cpu.c @@ -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 (); diff --git a/cpu/pxa/serial.c b/cpu/pxa/serial.c index c9d5f70bc4..cedebfe496 100644 --- a/cpu/pxa/serial.c +++ b/cpu/pxa/serial.c @@ -29,6 +29,7 @@ */ #include +#include #include 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 } -- 2.39.5