summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Kim <codewalkerster@gmail.com>2017-08-16 12:11:18 +0300
committerGerrit Code Review <gerrit@almond.hardkernel.com>2017-08-16 12:11:18 +0300
commitd0ce9d1382fc85d807d27b6b95d306c56c8a8bb3 (patch)
tree872073e4482a0a3276461a9adf88643012f4a281
parentdcd6eddd9a5db40d3458a973db3aafb3172b497d (diff)
parentb902983afd2347e51283016c424201efd5cfc12b (diff)
downloadu-boot-d0ce9d1382fc85d807d27b6b95d306c56c8a8bb3.tar.xz
Merge "ODROID-XU4: Fix wrong address loaded files." into odroidxu4-v2017.05
-rwxr-xr-xboard/samsung/common/odroid_misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/samsung/common/odroid_misc.c b/board/samsung/common/odroid_misc.c
index 37ba0acbaf..2c7a10f1b8 100755
--- a/board/samsung/common/odroid_misc.c
+++ b/board/samsung/common/odroid_misc.c
@@ -374,8 +374,6 @@ static uint upload_file(const char *fname, const char *pname,
#endif
total_fsize += filesize;
}
- if (!is_split || !filesize)
- goto out;
mem_addr += filesize;
/* load memory overflow */
@@ -385,6 +383,8 @@ static uint upload_file(const char *fname, const char *pname,
upinfo->file_size = 0;
return upinfo->mem_addr;
}
+ if (!is_split || !filesize)
+ goto out;
}
out:
if (total_fsize) {