summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2015-10-20 18:10:45 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-10-26 09:48:32 +0100
commitf8d5c0e57674b168bca457f8858a63976e4936fc (patch)
tree54483bee81c8989606dbddc1f1b1719b1d4bad99
parentf2954509b0ca4fa67cb1a004668241e85c8d755e (diff)
apalis/colibri: allow to interrupt boot even if delay is 0
Use the CONFIG_ZERO_BOOTDELAY_CHECK option to allow interrupt the boot process even if the delay is 0.
-rw-r--r--include/configs/apalis_imx6.h1
-rw-r--r--include/configs/apalis_t30.h1
-rw-r--r--include/configs/colibri_imx6.h1
-rw-r--r--include/configs/colibri_t20.h1
-rw-r--r--include/configs/colibri_t30.h1
-rw-r--r--include/configs/colibri_vf.h1
6 files changed, 6 insertions, 0 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index a45cb23807..6553446ec5 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -190,6 +190,7 @@
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTDELAY 1
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#undef CONFIG_IPADDR
#define CONFIG_IPADDR 192.168.10.2
#define CONFIG_NETMASK 255.255.255.0
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 64901a91b0..d3f8fb7ee5 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -100,6 +100,7 @@
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTDELAY 1
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#undef CONFIG_IPADDR
#define CONFIG_IPADDR 192.168.10.2
#define CONFIG_NETMASK 255.255.255.0
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index afcf1b9689..d3eb94e048 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -167,6 +167,7 @@
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTDELAY 1
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#undef CONFIG_IPADDR
#define CONFIG_IPADDR 192.168.10.2
#define CONFIG_NETMASK 255.255.255.0
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 63e832dd6c..7640ae608c 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -130,6 +130,7 @@
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTDELAY 1
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#undef CONFIG_IPADDR
#define CONFIG_IPADDR 192.168.10.2
#define CONFIG_NETMASK 255.255.255.0
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 832fef5874..8f621622c3 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -92,6 +92,7 @@
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTDELAY 1
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#undef CONFIG_IPADDR
#define CONFIG_IPADDR 192.168.10.2
#define CONFIG_NETMASK 255.255.255.0
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index b96ea88bcf..0464c0b356 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -138,6 +138,7 @@
#define CONFIG_SERVERIP 192.168.10.1
#define CONFIG_BOOTDELAY 1
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_LOADADDR 0x80008000