diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-20 12:25:10 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-20 12:25:10 -0500 |
| commit | b86d7622b33892b1dafe761a7a9eaeeab9f3816b (patch) | |
| tree | 56b1b6fc978166abce4afa8e9dee0af94bfc3cd6 /board/siemens | |
| parent | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (diff) | |
| parent | 56a4a63c106cc317fc0fe42686a99416fc469f5b (diff) | |
| download | u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.zip u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.gz u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.bz2 | |
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
Diffstat (limited to 'board/siemens')
| -rw-r--r-- | board/siemens/SCM/scm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/siemens/SCM/scm.c b/board/siemens/SCM/scm.c index d20688d..8783aaf 100644 --- a/board/siemens/SCM/scm.c +++ b/board/siemens/SCM/scm.c @@ -27,6 +27,8 @@ #include "scm.h" +DECLARE_GLOBAL_DATA_PTR; + static void config_scoh_cs(void); extern int fpga_init(void); @@ -300,8 +302,6 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, */ int power_on_reset (void) { - DECLARE_GLOBAL_DATA_PTR; - /* Test Reset Status Register */ return gd->reset_status & RSR_CSRS ? 0 : 1; } |