[oselas] [PATCH 3/3] Disable autoboot when booting from NOR. The bootloader in NOR should only be used as an emergency bootloader, not for normal operation or development.

[Guillermo Rodriguez]

From: grodriguez <guille.rodrig...@gmail.com>

---
 .../barebox-128m-env/config                        |    3 +++
 .../barebox-64m-env/config                         |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/configs/platform-friendlyarm-mini2440/barebox-128m-env/config 
b/configs/platform-friendlyarm-mini2440/barebox-128m-env/config
index 822e491..e532b32 100644
--- a/configs/platform-friendlyarm-mini2440/barebox-128m-env/config
+++ b/configs/platform-friendlyarm-mini2440/barebox-128m-env/config
@@ -52,6 +52,9 @@ autoboot_timeout=3
 
 if [ -e /dev/nor0 ]; then
        nor_parts="512k(barebox)"
+
+       # Skip autoboot if not booting from NAND
+       autoboot_disable=1
 fi
 
 #
diff --git a/configs/platform-friendlyarm-mini2440/barebox-64m-env/config 
b/configs/platform-friendlyarm-mini2440/barebox-64m-env/config
index d3d4d42..dde268c 100644
--- a/configs/platform-friendlyarm-mini2440/barebox-64m-env/config
+++ b/configs/platform-friendlyarm-mini2440/barebox-64m-env/config
@@ -52,6 +52,9 @@ autoboot_timeout=3
 
 if [ -e /dev/nor0 ]; then
        nor_parts="512k(barebox)"
+
+       # Skip autoboot if not booting from NAND
+       autoboot_disable=1
 fi
 
 #
-- 
1.7.0.4