All explicit calls to do_reset() should now use either system_restart()
or emergency_restart() as appropriate.
This should not change any behavior because at present there are no
implementations of any arch-specific hooks, making those two functions
just minimal wrappers around the existing do_reset() functions.
Signed-off-by: Kyle Moffett <kyle.d.moff...@boeing.com>
Cc: Wolfgang Denk <w...@denx.de>
---
board/dave/PPChameleonEVB/PPChameleonEVB.c | 4 ++--
board/esd/apc405/apc405.c | 4 ++--
board/esd/ar405/ar405.c | 2 +-
board/esd/ash405/ash405.c | 4 ++--
board/esd/canbt/canbt.c | 2 +-
board/esd/cpci405/cpci405.c | 6 +++---
board/esd/cpciiser4/cpciiser4.c | 2 +-
board/esd/du405/du405.c | 2 +-
board/esd/hh405/hh405.c | 4 ++--
board/esd/pci405/pci405.c | 4 ++--
board/esd/plu405/plu405.c | 4 ++--
board/esd/tasreg/tasreg.c | 4 ++--
board/esd/voh405/voh405.c | 4 ++--
board/esd/wuh405/wuh405.c | 4 ++--
board/prodrive/pdnb3/pdnb3.c | 2 +-
board/sacsng/sacsng.c | 2 +-
board/zeus/zeus.c | 4 ++--
17 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/board/dave/PPChameleonEVB/PPChameleonEVB.c
b/board/dave/PPChameleonEVB/PPChameleonEVB.c
index 8e26996..0c0c787 100644
--- a/board/dave/PPChameleonEVB/PPChameleonEVB.c
+++ b/board/dave/PPChameleonEVB/PPChameleonEVB.c
@@ -103,7 +103,7 @@ int misc_init_r (void)
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip (dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) !=
0) {
printf ("GUNZIP ERROR - must RESET board to recover\n");
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -136,7 +136,7 @@ int misc_init_r (void)
udelay(1000);
}
putc ('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c
index def8a4f..31d8a4a 100644
--- a/board/esd/apc405/apc405.c
+++ b/board/esd/apc405/apc405.c
@@ -219,7 +219,7 @@ int misc_init_r(void)
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip(dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) !=
0) {
printf("GUNZIP ERROR - must RESET board to recover\n");
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -255,7 +255,7 @@ int misc_init_r(void)
udelay(1000);
}
putc('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
/* restore gpio/cs settings */
diff --git a/board/esd/ar405/ar405.c b/board/esd/ar405/ar405.c
index 6ec507f..34936e6 100644
--- a/board/esd/ar405/ar405.c
+++ b/board/esd/ar405/ar405.c
@@ -112,7 +112,7 @@ int board_early_init_f (void)
udelay (1000);
}
putc ('\n');
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
}
diff --git a/board/esd/ash405/ash405.c b/board/esd/ash405/ash405.c
index 1b0365e..d45f70e 100644
--- a/board/esd/ash405/ash405.c
+++ b/board/esd/ash405/ash405.c
@@ -88,7 +88,7 @@ int misc_init_r (void)
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip (dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) !=
0) {
printf ("GUNZIP ERROR - must RESET board to recover\n");
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -121,7 +121,7 @@ int misc_init_r (void)
udelay(1000);
}
putc ('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/esd/canbt/canbt.c b/board/esd/canbt/canbt.c
index cc537f2..1079a98 100644
--- a/board/esd/canbt/canbt.c
+++ b/board/esd/canbt/canbt.c
@@ -108,7 +108,7 @@ int board_early_init_f (void)
udelay (1000);
}
putc ('\n');
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
/*
diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c
index 98a8584..df11d3e 100644
--- a/board/esd/cpci405/cpci405.c
+++ b/board/esd/cpci405/cpci405.c
@@ -160,7 +160,7 @@ int board_early_init_f(void)
udelay(1000);
}
putc('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
}
#endif /* !CONFIG_CPCI405_VER2 */
@@ -288,7 +288,7 @@ int misc_init_r (void)
if (gunzip(dst, CONFIG_SYS_FPGA_MAX_SIZE,
(uchar *)fpgadata, &len) != 0) {
printf("GUNZIP ERROR - must RESET board to recover\n");
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -324,7 +324,7 @@ int misc_init_r (void)
udelay(1000);
}
putc('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
/* restore gpio/cs settings */
diff --git a/board/esd/cpciiser4/cpciiser4.c b/board/esd/cpciiser4/cpciiser4.c
index 8afc50d..74421fb 100644
--- a/board/esd/cpciiser4/cpciiser4.c
+++ b/board/esd/cpciiser4/cpciiser4.c
@@ -106,7 +106,7 @@ int board_early_init_f (void)
udelay (1000);
}
putc ('\n');
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
/*
diff --git a/board/esd/du405/du405.c b/board/esd/du405/du405.c
index c32d333..91646e2 100644
--- a/board/esd/du405/du405.c
+++ b/board/esd/du405/du405.c
@@ -106,7 +106,7 @@ int board_early_init_f (void)
udelay (1000);
}
putc ('\n');
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
/*
diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c
index e9d2d36..5cb9db6 100644
--- a/board/esd/hh405/hh405.c
+++ b/board/esd/hh405/hh405.c
@@ -417,7 +417,7 @@ int misc_init_r (void)
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip (dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) !=
0) {
printf ("GUNZIP ERROR - must RESET board to recover\n");
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -450,7 +450,7 @@ int misc_init_r (void)
udelay(1000);
}
putc ('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c
index c1bac6a..a2462d4 100644
--- a/board/esd/pci405/pci405.c
+++ b/board/esd/pci405/pci405.c
@@ -198,7 +198,7 @@ int misc_init_r (void)
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip (dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) !=
0) {
printf ("GUNZIP ERROR - must RESET board to recover\n");
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -231,7 +231,7 @@ int misc_init_r (void)
udelay(1000);
}
putc ('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c
index 109d2dc..432d291 100644
--- a/board/esd/plu405/plu405.c
+++ b/board/esd/plu405/plu405.c
@@ -121,7 +121,7 @@ int misc_init_r(void)
if (gunzip(dst, CONFIG_SYS_FPGA_MAX_SIZE,
(uchar *)fpgadata, &len) != 0) {
printf("GUNZIP ERROR - must RESET board to recover\n");
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -157,7 +157,7 @@ int misc_init_r(void)
udelay(1000);
}
putc('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/esd/tasreg/tasreg.c b/board/esd/tasreg/tasreg.c
index d2488b8..644cb0d 100644
--- a/board/esd/tasreg/tasreg.c
+++ b/board/esd/tasreg/tasreg.c
@@ -152,7 +152,7 @@ int misc_init_r (void)
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip (dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) !=
0) {
printf ("GUNZIP ERROR - must RESET board to recover\n");
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -185,7 +185,7 @@ int misc_init_r (void)
udelay(1000);
}
putc ('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/esd/voh405/voh405.c b/board/esd/voh405/voh405.c
index 5f28a48..e03d6a1 100644
--- a/board/esd/voh405/voh405.c
+++ b/board/esd/voh405/voh405.c
@@ -117,7 +117,7 @@ int misc_init_r (void)
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip (dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) !=
0) {
printf ("GUNZIP ERROR - must RESET board to recover\n");
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -150,7 +150,7 @@ int misc_init_r (void)
udelay(1000);
}
putc ('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/esd/wuh405/wuh405.c b/board/esd/wuh405/wuh405.c
index d8d4bb5..d602261 100644
--- a/board/esd/wuh405/wuh405.c
+++ b/board/esd/wuh405/wuh405.c
@@ -85,7 +85,7 @@ int misc_init_r (void)
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip (dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) !=
0) {
printf ("GUNZIP ERROR - must RESET board to recover\n");
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
status = fpga_boot(dst, len);
@@ -118,7 +118,7 @@ int misc_init_r (void)
udelay(1000);
}
putc ('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/prodrive/pdnb3/pdnb3.c b/board/prodrive/pdnb3/pdnb3.c
index 928dd22..d41d659 100644
--- a/board/prodrive/pdnb3/pdnb3.c
+++ b/board/prodrive/pdnb3/pdnb3.c
@@ -181,7 +181,7 @@ int do_fpga_boot(unsigned char *fpgadata)
udelay(1000);
}
putc('\n');
- do_reset(NULL, 0, 0, NULL);
+ emergency_restart();
}
puts("FPGA: ");
diff --git a/board/sacsng/sacsng.c b/board/sacsng/sacsng.c
index 61cab87..3dc3f1b 100644
--- a/board/sacsng/sacsng.c
+++ b/board/sacsng/sacsng.c
@@ -826,7 +826,7 @@ void show_boot_progress (int status)
/*
* Reset the board to retry initialization.
*/
- do_reset (NULL, 0, 0, NULL);
+ emergency_restart();
}
}
#endif /* CONFIG_SHOW_BOOT_PROGRESS */
diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c
index 7e33d3f..b4119ec 100644
--- a/board/zeus/zeus.c
+++ b/board/zeus/zeus.c
@@ -372,7 +372,7 @@ int do_chkreset(cmd_tbl_t* cmdtp, int flag, int argc, char
* const argv[])
/*
* Reset the board for default to become valid
*/
- do_reset(NULL, 0, 0, NULL);
+ system_restart();
return 0;
}
@@ -392,7 +392,7 @@ int do_chkreset(cmd_tbl_t* cmdtp, int flag, int argc, char
* const argv[])
*/
logbuff_reset();
- do_reset(NULL, 0, 0, NULL);
+ system_restart();
return 0;
}
--
1.7.2.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
