Skip to contentSkip to conversation

Don't tftp to unknown flash

PATCH Superseded Jochen Friedrich 2 participants 2 messages Sep 1, 2008 Networking

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Don't tftp to unknown flash

If a board has a variable number of flash banks, there are empty entries in flash_info[] and CFG_DIRECT_FLASH_TFTP is set, tftp boot fails with "Outside available Flash". This patch skips flash banks with unknown flash ids.

---
 net/tftp.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
net/tftp.c +2 -1
index 84d83ca..5fbcbc3 100644
@@ -111,7 +111,8 @@ store_block (unsigned block, uchar * src, unsigned len)
 
 	for (i=0; i<CFG_MAX_FLASH_BANKS; i++) {
 		/* start address in flash? */
-		if (load_addr + offset >= flash_info[i].start[0]) {
+		if ((flash_info[i].flash_id != FLASH_UNKNOWN) &&
+		    (load_addr + offset >= flash_info[i].start[0])) {
 			rc = 1;
 			break;
 		}
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 1/1 Don't tftp to unknown flash

Dear Jochen Friedrich,

Quoted 15 lines · In message <[email protected]> you wrote:

If a board has a variable number of flash banks, there are empty entries in flash_info[] and CFG_DIRECT_FLASH_TFTP is set, tftp boot fails with "Outside available Flash". This patch skips flash banks with unknown flash ids.

---
 net/tftp.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
net/tftp.c +0 -0
index 84d83ca..5fbcbc3 100644

net/tftp.c store_block (unsigned block, uchar * src, unsigned len) · line 117

Quoted 8 lines
net/tftp.c +2 -1
@@ -111,7 +111,8 @@ store_block (unsigned block, uchar * src, unsigned len)
 
 	for (i=0; i<CFG_MAX_FLASH_BANKS; i++) {
 		/* start address in flash? */
-		if (load_addr + offset >= flash_info[i].start[0]) {
+		if ((flash_info[i].flash_id != FLASH_UNKNOWN) &&
+		    (load_addr + offset >= flash_info[i].start[0])) {
 			rc = 1;
 			break;

I think the code would be easier to read if you split this off in a separate test, i. e.:

	for (i=0; i<CFG_MAX_FLASH_BANKS; i++) {
		/* start address in flash? */
		if (flash_info[i].flash_id != FLASH_UNKNOWN)
			continue;
		if (load_addr + offset >= flash_info[i].start[0]) {
			...
	}

Would you please resubmit, if you agree?

Best regards,

Wolfgang Denk

Signature · 6 lines
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
Tactical? TACTICAL!?!? Hey, buddy, we went from kilotons to  megatons
several  minutes  ago.  We don't need no stinkin' tactical nukes. (By
the way, do you have change for 10 million people?)           - lwall