summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobertcnelson@gmail.com <robertcnelson@gmail.com>2016-01-14 12:15:25 -0600
committerTom Rini <trini@konsulko.com>2016-01-20 10:19:40 -0500
commit07684b995b7755a2357f7fd2b1ea37f4ee096470 (patch)
tree19269e1577c2457a83bcc7a18c4d6cdd8b339fd7
parentc67b760dd904b2d5828c408473f658768a7b327a (diff)
downloadu-boot-imx-07684b995b7755a2357f7fd2b1ea37f4ee096470.zip
u-boot-imx-07684b995b7755a2357f7fd2b1ea37f4ee096470.tar.gz
u-boot-imx-07684b995b7755a2357f7fd2b1ea37f4ee096470.tar.bz2
am335x: BeagleBones enable CONFIG_AUTOBOOT_KEYED
On startup, the BeagleBone family of boards can occationally halt at the U-Boot prompt. Due to U-Boot receiving random data on the usart. Migrate BeagleBone based boards to use CONFIG_AUTOBOOT_KEYED, user will now have to enter the <SPACE> key to get to U-Boot prompt Signed-off-by: Robert Nelson <robertcnelson@gmail.com> CC: Craig McQueen <craig.mcqueen@innerrange.com> CC: Tom Rini <trini@konsulko.com> Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r--configs/am335x_boneblack_defconfig4
-rw-r--r--configs/am335x_boneblack_vboot_defconfig4
-rw-r--r--configs/am335x_evm_defconfig4
3 files changed, 12 insertions, 0 deletions
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 3030a95..8803da5 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -4,6 +4,10 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
+CONFIG_AUTOBOOT_DELAY_STR="d"
+CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index ad40b07..5dcb942 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -8,6 +8,10 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
+CONFIG_AUTOBOOT_DELAY_STR="d"
+CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 27cb881..7753ab5 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -4,6 +4,10 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
+CONFIG_AUTOBOOT_DELAY_STR="d"
+CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y