summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-08-11 09:20:53 -0500
committerWolfgang Denk <wd@denx.de>2008-08-12 00:06:34 +0200
commit3216ca9692ff80d7c638723ef448f3d36301d9e7 (patch)
treeec5ea17d23963d05300ee3008009a738b0b62d17 /common
parent3cf8a234b8e8c02e4da1f23566043bc288b05220 (diff)
downloadu-boot-imx-3216ca9692ff80d7c638723ef448f3d36301d9e7.zip
u-boot-imx-3216ca9692ff80d7c638723ef448f3d36301d9e7.tar.gz
u-boot-imx-3216ca9692ff80d7c638723ef448f3d36301d9e7.tar.bz2
Fix fallout from autostart revert
The autostart revert caused a bit of duplicated code as well as code that was using images->autostart that needs to get removed so we can build again. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c5
-rw-r--r--common/image.c17
2 files changed, 2 insertions, 20 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 2dffdfa..5295969 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -361,10 +361,9 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
show_boot_progress (-9);
#ifdef DEBUG
puts ("\n## Control returned to monitor - resetting...\n");
- if (images.autostart)
- do_reset (cmdtp, flag, argc, argv);
+ do_reset (cmdtp, flag, argc, argv);
#endif
- if (!images.autostart && iflag)
+ if (iflag)
enable_interrupts();
return 1;
diff --git a/common/image.c b/common/image.c
index 1807348..6d2ce32 100644
--- a/common/image.c
+++ b/common/image.c
@@ -189,23 +189,6 @@ int image_check_dcrc (image_header_t *hdr)
return (dcrc == image_get_dcrc (hdr));
}
-void memmove_wd (void *to, void *from, size_t len, ulong chunksz)
-{
-#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
- while (len > 0) {
- size_t tail = (len > chunksz) ? chunksz : len;
- WATCHDOG_RESET ();
- memmove (to, from, tail);
- to += tail;
- from += tail;
- len -= tail;
- }
-#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
- memmove (to, from, len);
-#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
-}
-#endif /* USE_HOSTCC */
-
/**
* image_multi_count - get component (sub-image) count
* @hdr: pointer to the header of the multi component image