6dd652fa4d
- Hymod board database mods: add "who" field and new xilinx chip types
- provide new "init_cmd_timeout()" function so code external to
"common/main.c" can use the "reset_cmd_timeout()" function before
entering the main loop
- add DTT support for adm1021 (new file dtt/adm1021.c; config
slightly different. see include/configs/hymod.h for an example
(requires CONFIG_DTT_ADM1021, CONFIG_DTT_SENSORS, and
CFG_DTT_ADM1021 defined)
- add new "eeprom_probe()" function which has similar args and
behaves in a similar way to "eeprom_read()" etc.
- add 8260 FCC ethernet loopback code (new "eth_loopback_test()"
function which is enabled by defining CONFIG_ETHER_LOOPBACK_TEST)
- gdbtools copyright update
- ensure that set_msr() executes the "sync" and "isync" instructions
after the "mtmsr" instruction in cpu/mpc8260/interrupts.c
- 8260 I/O ports fix: Open Drain should be set last when configuring
- add SIU IRQ defines for 8260
- allow LDSCRIPT override and OBJCFLAGS initialization: change to
config.mk to allow board configurations to override the GNU
linker script, selected via the LDSCRIPT, make variable, and to
give an initial value to the OBJCFLAGS make variable
- 8260 i2c enhancement:
o correctly extends the timeout depending on the size of all
queued messages for both transmit and receive
o will not continue with receive if transmit times out
o ensures that the error callback is done for all queued tx
and rx messages
o correctly detects both tx and rx timeouts, only delivers one to
the callback, and does not overwrite an earlier error
o logic in i2c_probe now correct
- add "vprintf()" function so that "panic()" function can be
technically correct
- many Hymod board changes
114 lines
2.2 KiB
C
114 lines
2.2 KiB
C
/*
|
|
* (C) Copyright 2003
|
|
* Murray Jensen, CSIRO-MIT, <Murray.Jensen@csiro.au>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <common.h>
|
|
|
|
/* imports from common/main.c */
|
|
extern char console_buffer[CFG_CBSIZE];
|
|
|
|
int
|
|
hymod_get_serno (const char *prompt)
|
|
{
|
|
for (;;) {
|
|
int n, serno;
|
|
char *p;
|
|
|
|
#ifdef CONFIG_BOOT_RETRY_TIME
|
|
reset_cmd_timeout ();
|
|
#endif
|
|
|
|
n = readline (prompt);
|
|
|
|
if (n < 0)
|
|
return (n);
|
|
|
|
if (n == 0)
|
|
continue;
|
|
|
|
serno = (int) simple_strtol (console_buffer, &p, 10);
|
|
|
|
if (p > console_buffer && *p == '\0' && serno > 0)
|
|
return (serno);
|
|
|
|
printf ("Invalid number (%s) - please re-enter\n",
|
|
console_buffer);
|
|
}
|
|
}
|
|
|
|
int
|
|
hymod_get_ethaddr (void)
|
|
{
|
|
for (;;) {
|
|
int n;
|
|
|
|
#ifdef CONFIG_BOOT_RETRY_TIME
|
|
reset_cmd_timeout ();
|
|
#endif
|
|
|
|
n = readline ("Enter board ethernet address: ");
|
|
|
|
if (n < 0)
|
|
return (n);
|
|
|
|
if (n == 0)
|
|
continue;
|
|
|
|
if (n == 17) {
|
|
int i;
|
|
char *p, *q;
|
|
uchar ea[6];
|
|
|
|
/* see if it looks like an ethernet address */
|
|
|
|
p = console_buffer;
|
|
|
|
for (i = 0; i < 6; i++) {
|
|
char term = (i == 5 ? '\0' : ':');
|
|
|
|
ea[i] = simple_strtol (p, &q, 16);
|
|
|
|
if ((q - p) != 2 || *q++ != term)
|
|
break;
|
|
|
|
p = q;
|
|
}
|
|
|
|
if (i == 6) {
|
|
/* it looks ok - set it */
|
|
printf ("Setting ethernet addr to %s\n",
|
|
console_buffer);
|
|
|
|
setenv ("ethaddr", console_buffer);
|
|
|
|
puts ("Remember to do a 'saveenv' to "
|
|
"make it permanent\n");
|
|
|
|
return (0);
|
|
}
|
|
}
|
|
|
|
printf ("Invalid ethernet addr (%s) - please re-enter\n",
|
|
console_buffer);
|
|
}
|
|
}
|