diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 | 
| commit | cd77dd109c4a439519a78c32eddc42bdebc7a61f (patch) | |
| tree | c5534647cb1786044ef0f7e4ad4067725eddf11d /post/board/lwmon5/sysmon.c | |
| parent | 95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff) | |
| parent | afc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff) | |
| download | olio-uboot-2014.01-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.xz olio-uboot-2014.01-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip | |
Merge branch 'reloc'
Diffstat (limited to 'post/board/lwmon5/sysmon.c')
| -rw-r--r-- | post/board/lwmon5/sysmon.c | 17 | 
1 files changed, 1 insertions, 16 deletions
| diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c index aef5bd018..9c49d0e64 100644 --- a/post/board/lwmon5/sysmon.c +++ b/post/board/lwmon5/sysmon.c @@ -58,8 +58,6 @@ DECLARE_GLOBAL_DATA_PTR;  /* from dspic.c */  extern int dspic_read(ushort reg); -#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 @@ -160,20 +158,7 @@ int sysmon_init_f (void)  void sysmon_reloc (void)  { -	sysmon_t ** l; -	sysmon_table_t * t; - -	for (l = sysmon_list; *l; l++) { -		RELOC(*l); -		RELOC((*l)->init); -		RELOC((*l)->read); -	} - -	for (t = sysmon_table; t < sysmon_table + sysmon_table_size; t ++) { -		RELOC(t->exec_before); -		RELOC(t->exec_after); -		RELOC(t->sysmon); -	} +	/* Do nothing for now, sysmon_reloc() is required by the sysmon post */  }  static char *sysmon_unit_value (sysmon_table_t *s, uint val) |