diff loadtools/flprogbin.c @ 506:0dd2c87c1b63

fc-loadtool flash support overhaul
author Mychaela Falconia <falcon@freecalypso.org>
date Tue, 28 May 2019 05:12:47 +0000
parents e7502631a0f9
children 52980e3a51c7
line wrap: on
line diff
--- a/loadtools/flprogbin.c	Mon May 27 19:58:01 2019 +0000
+++ b/loadtools/flprogbin.c	Tue May 28 05:12:47 2019 +0000
@@ -38,7 +38,7 @@
 	flashoff = strtoul(argv[2], &strtoul_endp, 16);
 	if (*strtoul_endp)
 		goto inv;
-	if (flash_get_cfi(bank) < 0)
+	if (flash_detect(bank, 0) < 0)
 		return(-1);
 	bi = flash_bank_info + bank;
 	if (flashoff >= bi->geom->total_size) {
@@ -109,10 +109,6 @@
 	}
 
 	/* finally done with the arg parsing etc, can get to work now */
-	if (flash_id_check(bank, 0) < 0) {
-		fclose(binf);
-		return(-1);
-	}
 	crc_base_addr = bi->base_addr + flashoff;
 	sprintf(shortarg, "%lx", (u_long) bi->base_addr);
 	targv[0] = bi->ops->loadagent_setbase_cmd;