Patchwork [U-Boot,v2,1/2] automatic update from FIT image: add optional address parameter

login
register
mail settings
Submitter Andreas Pretzsch
Date July 16, 2011, 3:50 p.m.
Message ID <1310831460-14450-2-git-send-email-apr@cn-eng.de>
Download mbox | patch
Permalink /patch/104979/
State Accepted
Commit 8d6b73202c65f40f88ac27f5e5d2203fe6ae3f1d
Delegated to: Wolfgang Denk
Headers show

Comments

Andreas Pretzsch - July 16, 2011, 3:50 p.m.
Current update_tftp() flow:
  1.) fetch "updatefile" from defined TFTP server
  2.) check if FIT format
  3.) flash contained images

Add an address parameter to update_tftp(). If this address is non-zero,
skip the TFTP transfer and use the image at this address.
Also extend update_tftp() to return success/fail.

Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
---
Changes for v2:
   - void update_tftp() => int update_tftp(): return success/fail
---
 common/main.c   |    4 ++--
 common/update.c |   20 ++++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)
Wolfgang Denk - July 26, 2011, 2:58 p.m.
Dear Andreas Pretzsch,

In message <1310831460-14450-2-git-send-email-apr@cn-eng.de> you wrote:
> Current update_tftp() flow:
>   1.) fetch "updatefile" from defined TFTP server
>   2.) check if FIT format
>   3.) flash contained images
> 
> Add an address parameter to update_tftp(). If this address is non-zero,
> skip the TFTP transfer and use the image at this address.
> Also extend update_tftp() to return success/fail.
> 
> Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
> ---
> Changes for v2:
>    - void update_tftp() => int update_tftp(): return success/fail
> ---
>  common/main.c   |    4 ++--
>  common/update.c |   20 ++++++++++++++------
>  2 files changed, 16 insertions(+), 8 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/common/main.c b/common/main.c
index 2730c6f..0a310e0 100644
--- a/common/main.c
+++ b/common/main.c
@@ -51,7 +51,7 @@  void inline __show_boot_progress (int val) {}
 void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
 
 #if defined(CONFIG_UPDATE_TFTP)
-void update_tftp (void);
+int update_tftp (ulong addr);
 #endif /* CONFIG_UPDATE_TFTP */
 
 #define MAX_DELAY_STOP_STR 32
@@ -345,7 +345,7 @@  void main_loop (void)
 #endif /* CONFIG_PREBOOT */
 
 #if defined(CONFIG_UPDATE_TFTP)
-	update_tftp ();
+	update_tftp (0UL);
 #endif /* CONFIG_UPDATE_TFTP */
 
 #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
diff --git a/common/update.c b/common/update.c
index 7528474..a19f136 100644
--- a/common/update.c
+++ b/common/update.c
@@ -238,13 +238,17 @@  static int update_fit_getparams(const void *fit, int noffset, ulong *addr,
 	return 0;
 }
 
-void update_tftp(void)
+int update_tftp(ulong addr)
 {
 	char *filename, *env_addr;
 	int images_noffset, ndepth, noffset;
 	ulong update_addr, update_fladdr, update_size;
-	ulong addr;
 	void *fit;
+	int ret = 0;
+
+	/* use already present image */
+	if (addr)
+		goto got_update_file;
 
 	printf("Auto-update from TFTP: ");
 
@@ -253,7 +257,7 @@  void update_tftp(void)
 	if (filename == NULL) {
 		printf("failed, env. variable '%s' not found\n",
 							UPDATE_FILE_ENV);
-		return;
+		return 1;
 	}
 
 	printf("trying update file '%s'\n", filename);
@@ -268,15 +272,16 @@  void update_tftp(void)
 	if (update_load(filename, CONFIG_UPDATE_TFTP_MSEC_MAX,
 					CONFIG_UPDATE_TFTP_CNT_MAX, addr)) {
 		printf("Can't load update file, aborting auto-update\n");
-		return;
+		return 1;
 	}
 
+got_update_file:
 	fit = (void *)addr;
 
 	if (!fit_check_format((void *)fit)) {
 		printf("Bad FIT format of the update file, aborting "
 							"auto-update\n");
-		return;
+		return 1;
 	}
 
 	/* process updates */
@@ -293,6 +298,7 @@  void update_tftp(void)
 
 		if (!fit_image_check_hashes(fit, noffset)) {
 			printf("Error: invalid update hash, aborting\n");
+			ret = 1;
 			goto next_node;
 		}
 
@@ -301,15 +307,17 @@  void update_tftp(void)
 					&update_fladdr, &update_size)) {
 			printf("Error: can't get update parameteres, "
 								"aborting\n");
+			ret = 1;
 			goto next_node;
 		}
 		if (update_flash(update_addr, update_fladdr, update_size)) {
 			printf("Error: can't flash update, aborting\n");
+			ret = 1;
 			goto next_node;
 		}
 next_node:
 		noffset = fdt_next_node(fit, noffset, &ndepth);
 	}
 
-	return;
+	return ret;
 }