[U-Boot] [PATCH] Move test for unnecessary memmove to memmove_wd()

[U-Boot] [PATCH] Move test for unnecessary memmove to memmove_wd()

[Larry Johnson]

Signed-off-by: Larry Johnson <lrj@acm.org>
---
 common/cmd_bootm.c |    7 ++-----
 common/image.c     |    3 +++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 6fdeef4..bc38aaa 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -339,11 +339,8 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 			printf ("   XIP %s ... ", type_name);
 		} else {
 			printf ("   Loading %s ... ", type_name);
-
-			if (load != image_start) {
-				memmove_wd ((void *)load,
-						(void *)image_start, image_len, CHUNKSZ);
-			}
+			memmove_wd ((void *)load, (void *)image_start,
+					image_len, CHUNKSZ);
 		}
 		*load_end = load + image_len;
 		puts("OK\n");
diff --git a/common/image.c b/common/image.c
index daa68bc..1dc9e4e 100644
--- a/common/image.c
+++ b/common/image.c
@@ -457,6 +457,9 @@ phys_size_t getenv_bootm_size(void)
 
 void memmove_wd (void *to, void *from, size_t len, ulong chunksz)
 {
+	if (to == from)
+		return;
+
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
 	while (len > 0) {
 		size_t tail = (len > chunksz) ? chunksz : len;
-- 
1.5.4.3

[U-Boot] [PATCH] Move test for unnecessary memmove to memmove_wd()

[Larry Johnson]

Signed-off-by: Larry Johnson <lrj@acm.org>
---
 common/cmd_bootm.c |    7 ++-----
 common/image.c     |    3 +++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 452686d..da06009 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -344,11 +344,8 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 			printf ("   XIP %s ... ", type_name);
 		} else {
 			printf ("   Loading %s ... ", type_name);
-
-			if (load != image_start) {
-				memmove_wd ((void *)load,
-						(void *)image_start, image_len, CHUNKSZ);
-			}
+			memmove_wd ((void *)load, (void *)image_start,
+					image_len, CHUNKSZ);
 		}
 		*load_end = load + image_len;
 		puts("OK\n");
diff --git a/common/image.c b/common/image.c
index 9e49713..8d4be14 100644
--- a/common/image.c
+++ b/common/image.c
@@ -450,6 +450,9 @@ phys_size_t getenv_bootm_size(void)
 
 void memmove_wd (void *to, void *from, size_t len, ulong chunksz)
 {
+	if (to == from)
+		return;
+
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
 	while (len > 0) {
 		size_t tail = (len > chunksz) ? chunksz : len;
-- 
1.5.4.3

[U-Boot] [PATCH] Move test for unnecessary memmove to memmove_wd()

[Wolfgang Denk]

Dear Larry Johnson,

In message <4BCD9987.9020600@acm.org> you wrote:
> Signed-off-by: Larry Johnson <lrj@acm.org>
> ---
>  common/cmd_bootm.c |    7 ++-----
>  common/image.c     |    3 +++
>  2 files changed, 5 insertions(+), 5 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You!  What PLANET is this!
	-- McCoy, "The City on the Edge of Forever", stardate 3134.0