summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuille Rodriguez <guille.rodriguez@gmail.com>2014-11-02 17:15:01 +0100
committerJuergen Borleis <jbe@pengutronix.de>2015-01-31 07:49:33 +0100
commit061e8bf9eed99be3d6236f03b28d1faf39495034 (patch)
tree85e0b486dad290dc6b758c7c001c88f2aecd177e
parenta5846cdeb4b0a8110a709e84eae59f66724d69aa (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-061e8bf9eed99be3d6236f03b28d1faf39495034.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-061e8bf9eed99be3d6236f03b28d1faf39495034.tar.xz
Platform/bootloader: disable autoboot when booting from NOR.
The bootloader in NOR should only be used as an emergency bootloader, not for normal operation or development. Signed-off-by: Guille Rodriguez <guille.rodriguez@gmail.com> Acked-by: Juergen Borleis <jbe@pengutronix.de>
-rw-r--r--configs/platform-friendlyarm-mini2440/barebox-128m-env/config3
-rw-r--r--configs/platform-friendlyarm-mini2440/barebox-64m-env/config3
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 58a94d6..796b201 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 84b847c..db38a48 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
#