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

Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

This commit is contained in:
Wolfgang Denk 2008-04-29 13:15:20 +02:00
parent 707fa917cc 18ec19e4aa
commit e037a4c272
5 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
post/board/lwmon/Makefile
View File

@ -20,10 +20,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA # MA 02111-1307 USA
# #
include $(OBJTREE)/include/autoconf.mk
LIB = libpostlwmon.a LIB = libpostlwmon.a
COBJS = sysmon.o COBJS-$(CONFIG_HAS_POST) += sysmon.o
include $(TOPDIR)/post/rules.mk include $(TOPDIR)/post/rules.mk

53
post/board/lwmon5/sysmon.c
View File

@ -32,9 +32,9 @@
* The test passes when all the following voltages and temperatures * The test passes when all the following voltages and temperatures
* are within allowed ranges: * are within allowed ranges:
* *
* Temperature -40 .. +85 C * Temperature -40 .. +90 C
* +5V +4.75 .. +5.25 V * +5V +4.50 .. +5.50 V
* +5V standby +4.75 .. +5.25 V * +5V standby +3.50 .. +5.50 V
* *
* LCD backlight is not enabled if temperature values are not within * LCD backlight is not enabled if temperature values are not within
* allowed ranges (-30 .. + 80). The brightness of backlite can be * allowed ranges (-30 .. + 80). The brightness of backlite can be
@ -60,6 +60,21 @@ extern int dspic_read(ushort reg);
#define RELOC(x) if (x != NULL) x = (void *) ((ulong) (x) + gd->reloc_off) #define RELOC(x) if (x != NULL) x = (void *) ((ulong) (x) + gd->reloc_off)
#define REG_TEMPERATURE 0x12BC
#define REG_VOLTAGE_5V 0x12CA
#define REG_VOLTAGE_5V_STANDBY 0x12C6
#define TEMPERATURE_MIN (-40) /* degr. C */
#define TEMPERATURE_MAX (+90) /* degr. C */
#define TEMPERATURE_DISPLAY_MIN (-35) /* degr. C */
#define TEMPERATURE_DISPLAY_MAX (+85) /* degr. C */
#define VOLTAGE_5V_MIN (+4500) /* mV */
#define VOLTAGE_5V_MAX (+5500) /* mV */
#define VOLTAGE_5V_STANDBY_MIN (+3500) /* mV */
#define VOLTAGE_5V_STANDBY_MAX (+5500) /* mV */
typedef struct sysmon_s sysmon_t; typedef struct sysmon_s sysmon_t;
typedef struct sysmon_table_s sysmon_table_t; typedef struct sysmon_table_s sysmon_table_t;
@ -107,17 +122,31 @@ struct sysmon_table_s
static sysmon_table_t sysmon_table[] = static sysmon_table_t sysmon_table[] =
{ {
{"Temperature", " C", &sysmon_dspic, NULL, sysmon_backlight_disable, {
1, 1, -32768, 32767, 0xFFFF, 0x8000-40, 0x8000+85, 0, "Temperature", " C", &sysmon_dspic, NULL, sysmon_backlight_disable,
0x8000-30, 0x8000+80, 0, 0x12BC}, 1, 1, -32768, 32767, 0xFFFF,
0x8000 + TEMPERATURE_MIN, 0x8000 + TEMPERATURE_MAX, 0,
0x8000 + TEMPERATURE_DISPLAY_MIN, 0x8000 + TEMPERATURE_DISPLAY_MAX, 0,
REG_TEMPERATURE
},
{"+ 5 V", "V", &sysmon_dspic, NULL, NULL, {
100, 1000, -0x8000, 0x7FFF, 0xFFFF, 0x8000+4750, 0x8000+5250, 0, "+ 5 V", "V", &sysmon_dspic, NULL, NULL,
0x8000+4750, 0x8000+5250, 0, 0x12CA}, 100, 1000, -0x8000, 0x7FFF, 0xFFFF,
100, 1000, 0, 0xFFFF, 0xFFFF,
VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
REG_VOLTAGE_5V
},
{"+ 5 V standby", "V", &sysmon_dspic, NULL, NULL, {
100, 1000, -0x8000, 0x7FFF, 0xFFFF, 0x8000+4750, 0x8000+5250, 0, "+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,
0x8000+4750, 0x8000+5250, 0, 0x12C6}, 100, 1000, -0x8000, 0x7FFF, 0xFFFF,
100, 1000, 0, 0xFFFF, 0xFFFF,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
REG_VOLTAGE_5V_STANDBY
},
}; };
static int sysmon_table_size = sizeof(sysmon_table) / sizeof(sysmon_table[0]); static int sysmon_table_size = sizeof(sysmon_table) / sizeof(sysmon_table[0]);

5
post/board/lwmon5/watchdog.c
View File

@ -52,8 +52,9 @@ static void watchdog_magic_write(uint value)
int sysmon1_post_test(int flags) int sysmon1_post_test(int flags)
{ {
if (gpio_read_in_bit(CFG_GPIO_SYSMON_STATUS)) { if (gpio_read_in_bit(CFG_GPIO_SYSMON_STATUS) == 0) {
/* 3.1. GPIO62 is low /*
* 3.1. GPIO62 is low
* Assuming system voltage failure. * Assuming system voltage failure.
*/ */
post_log("Abnormal voltage detected (GPIO62)\n"); post_log("Abnormal voltage detected (GPIO62)\n");

4
post/board/netta/Makefile
View File

@ -20,10 +20,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA # MA 02111-1307 USA
# #
include $(OBJTREE)/include/autoconf.mk
LIB = libpostnetta.a LIB = libpostnetta.a
COBJS = codec.o dsp.o COBJS-$(CONFIG_HAS_POST) += codec.o dsp.o
include $(TOPDIR)/post/rules.mk include $(TOPDIR)/post/rules.mk

5
post/cpu/mpc8xx/Makefile
View File

@ -20,10 +20,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA # MA 02111-1307 USA
# #
include $(OBJTREE)/include/autoconf.mk
LIB = libpostmpc8xx.a LIB = libpostmpc8xx.a
AOBJS = cache_8xx.o AOBJS-$(CONFIG_HAS_POST) += cache_8xx.o
COBJS = cache.o ether.o spr.o uart.o usb.o watchdog.o COBJS-$(CONFIG_HAS_POST) += cache.o ether.o spr.o uart.o usb.o watchdog.o
include $(TOPDIR)/post/rules.mk include $(TOPDIR)/post/rules.mk