Signed-off-by: Enrico Mioso <mrkiko...@gmail.com>
CC: Christian Lamparter <chunk...@gmail.com>
CC: David Bauer <m...@david-bauer.net>
---
Reasons for this patch:
1 - There are situations where it can be nice to recover a device
without the AVM Recovery tool. In some cases the tool won't even be an
option (as far as I know, it exists only for Windows, or am I wrong?).
2 - Since the effort of creating a second-stage bootloader for these
devices has been carried out (thanks a lot for this!), I think it
makes sense to allow for things to be more friendly to developers and
users.
Side effects:
When nandboot fails, there will be TWO tftp requests with no delay
between them, then the sleep will kick in.
Possible "improvements":
Implementing a push-button method may be preferred. Still, I have no
easy way to attach an UART to the device right now.
Moreover, being able to do this "more" remotely would be a vaulable
feature to me.
Enrico
include/configs/fritz1200.h | 2 +-
include/configs/fritz3000.h | 2 +-
include/configs/fritz4040.h | 2 +-
include/configs/fritz7530.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/configs/fritz1200.h b/include/configs/fritz1200.h
index 90d5186..16152a3 100644
--- a/include/configs/fritz1200.h
+++ b/include/configs/fritz1200.h
@@ -23,7 +23,7 @@
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"nandboot=ubi part ubi && ubi read 0x85000000 kernel &&
bootm\0" \
"tftpboot=tftpboot && bootm; sleep 5; run tftpboot\0" \
- "fritzboot=run nandboot || run tftpboot;\0" \
+ "fritzboot=tftpboot && bootm; run nandboot || run
tftpboot;\0" \
#undef V_PROMPT
#define V_PROMPT "(" CONFIG_MODEL ") # "
diff --git a/include/configs/fritz3000.h b/include/configs/fritz3000.h
index e383ffb..3440550 100644
--- a/include/configs/fritz3000.h
+++ b/include/configs/fritz3000.h
@@ -23,7 +23,7 @@
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"nandboot=ubi part ubi && ubi read 0x85000000 kernel &&
bootm\0" \
"tftpboot=tftpboot && bootm; sleep 5; run tftpboot\0" \
- "fritzboot=run nandboot || run tftpboot;\0" \
+ "fritzboot=tftpboot && bootm; run nandboot || run
tftpboot;\0" \
#undef V_PROMPT
#define V_PROMPT "(" CONFIG_MODEL ") # "
diff --git a/include/configs/fritz4040.h b/include/configs/fritz4040.h
index 060afb0..582edfd 100644
--- a/include/configs/fritz4040.h
+++ b/include/configs/fritz4040.h
@@ -23,7 +23,7 @@
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"nandboot=nboot firmware && bootm\0" \
"tftpboot=tftpsrv && bootm; sleep 5; run tftpboot\0" \
- "fritzboot=run nandboot || run tftpboot;\0" \
+ "fritzboot=tftpboot && bootm; run nandboot || run
tftpboot;\0" \
#undef V_PROMPT
#define V_PROMPT "(" CONFIG_MODEL ") # "
diff --git a/include/configs/fritz7530.h b/include/configs/fritz7530.h
index b07ecfc..caecd5d 100644
--- a/include/configs/fritz7530.h
+++ b/include/configs/fritz7530.h
@@ -23,7 +23,7 @@
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"nandboot=ubi part ubi && ubi read 0x85000000 kernel &&
bootm\0" \
"tftpboot=tftpboot && bootm; sleep 5; run tftpboot\0" \
- "fritzboot=run nandboot || run tftpboot;\0" \
+ "fritzboot=tftpboot && bootm; run nandboot || run
tftpboot;\0" \
#undef V_PROMPT
#define V_PROMPT "(" CONFIG_MODEL ") # "
