Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Web update: always reflash in rescue mode

  • Loading branch information...
commit 1898c53b293128f6b3e6af03e7821a7a6c5f37cc 1 parent 96f90fc
Sébastien Bourdeauducq authored July 13, 2011

Showing 1 changed file with 7 additions and 3 deletions. Show diff stats Hide diff stats

  1. 10  src/flash.c
10  src/flash.c
@@ -392,14 +392,18 @@ static void get_versions(struct patchpool *local_patches, struct patchpool *remo
392 392
 
393 393
 static void download_images()
394 394
 {
395  
-	if(strcmp(available_socbios, soc) != 0) {
  395
+	int rescue;
  396
+	
  397
+	rescue = sysconfig_is_rescue();
  398
+	
  399
+	if(rescue || (strcmp(available_socbios, soc) != 0)) {
396 400
 		strcpy(bitstream_name, "/ramdisk/soc.fpg");
397 401
 		strcpy(bios_name, "/ramdisk/bios.bin");
398 402
 	} else {
399 403
 		bitstream_name[0] = 0;
400 404
 		bios_name[0] = 0;
401 405
 	}
402  
-	if(strcmp(available_application, VERSION) != 0)
  406
+	if(rescue || (strcmp(available_application, VERSION) != 0))
403 407
 		strcpy(application_name, "/ramdisk/flickernoise.fbi");
404 408
 	else
405 409
 		application_name[0] = 0;
@@ -828,7 +832,7 @@ void init_flash()
828 832
 		"g.rowconfig(2, -size 0)",
829 833
 		"g.rowconfig(3, -size 0)",
830 834
 
831  
-		"w = new Window(-content g -title \"Update\")",
  835
+		"w = new Window(-content g -title \"Update\" -workx 10)",
832 836
 		
833 837
 		"gfiles = new Grid()",
834 838
 		

0 notes on commit 1898c53

Please sign in to comment.
Something went wrong with that request. Please try again.