mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 15:40:29 +09:00
Merge with rsync://git-user@source.denx.net/git/u-boot.git
This commit is contained in:
commit
a720fd99b6
@ -34,6 +34,14 @@ Changes for U-Boot 1.1.3:
|
|||||||
Eliminates the CONFIG_MPC8560 option entirely. Distributes the
|
Eliminates the CONFIG_MPC8560 option entirely. Distributes the
|
||||||
new CONFIG_CPM2 option to each 8260 board.
|
new CONFIG_CPM2 option to each 8260 board.
|
||||||
|
|
||||||
|
* Fix sysmon POST problem: check I2C error codes
|
||||||
|
This fixes a problem of displaying bogus voltages when the voltages
|
||||||
|
are so low that the I2C devices start failing while the rest of the
|
||||||
|
system keeps running.
|
||||||
|
|
||||||
|
* Patch by Cedric Vincent, 6 Jul 2005:
|
||||||
|
Fix CFG_CMD_SETGETDCR handling in "common/cmd_dcr.c"
|
||||||
|
|
||||||
* Patch by Jon Loeliger, 20 Jul 2005:
|
* Patch by Jon Loeliger, 20 Jul 2005:
|
||||||
Add missing PCI IO port definitions.
|
Add missing PCI IO port definitions.
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
|
|
||||||
#if defined(CONFIG_4xx) && defined(CFG_CMD_SETGETDCR)
|
#if defined(CONFIG_4xx) && (CONFIG_COMMANDS & CFG_CMD_SETGETDCR)
|
||||||
|
|
||||||
/* ======================================================================
|
/* ======================================================================
|
||||||
* Interpreter command to retrieve an IBM PPC 4xx Device Control Register
|
* Interpreter command to retrieve an IBM PPC 4xx Device Control Register
|
||||||
|
@ -185,6 +185,10 @@ static char *sysmon_unit_value (sysmon_table_t *s, uint val)
|
|||||||
char *p, sign;
|
char *p, sign;
|
||||||
int dec, frac;
|
int dec, frac;
|
||||||
|
|
||||||
|
if (val == -1) {
|
||||||
|
return "I/O ERROR";
|
||||||
|
}
|
||||||
|
|
||||||
if (unit_val < 0) {
|
if (unit_val < 0) {
|
||||||
sign = '-';
|
sign = '-';
|
||||||
unit_val = -unit_val;
|
unit_val = -unit_val;
|
||||||
@ -297,8 +301,13 @@ int sysmon_post_test (int flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
val = t->sysmon->read(t->sysmon, t->addr);
|
val = t->sysmon->read(t->sysmon, t->addr);
|
||||||
t->val_valid = val >= t->val_min && val <= t->val_max;
|
if (val != -1) {
|
||||||
t->val_valid_alt = val >= t->val_min_alt && val <= t->val_max_alt;
|
t->val_valid = val >= t->val_min && val <= t->val_max;
|
||||||
|
t->val_valid_alt = val >= t->val_min_alt && val <= t->val_max_alt;
|
||||||
|
} else {
|
||||||
|
t->val_valid = 0;
|
||||||
|
t->val_valid_alt = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (t->exec_after) {
|
if (t->exec_after) {
|
||||||
t->exec_after(t);
|
t->exec_after(t);
|
||||||
|
Loading…
Reference in New Issue
Block a user