diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-04-18 02:19:33 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-01-11 21:27:13 +0100 |
| commit | 9ab298e2d7d19da250f0a97891155caeec2b7f0e (patch) | |
| tree | d547c95341b5336a2234f05924a790a7e18b993b /board/toradex/colibri_t30/colibri_t30.c | |
| parent | c021ccd138d37fd5de99d5691ce9f50d705ec911 (diff) | |
apalis/colibri_t30: migrate
Migrate Apalis/Colibri T30 to U-Boot 2016.11.
(cherry picked from commit 81a38df0631cfa6b3a85c97e631abf73dc0a2226)
Diffstat (limited to 'board/toradex/colibri_t30/colibri_t30.c')
| -rw-r--r-- | board/toradex/colibri_t30/colibri_t30.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c index b68d3cacc5..8ae3437a49 100644 --- a/board/toradex/colibri_t30/colibri_t30.c +++ b/board/toradex/colibri_t30/colibri_t30.c @@ -1,6 +1,5 @@ /* - * (C) Copyright 2014-2016 - * Stefan Agner <stefan@agner.ch> + * Copyright (c) 2012-2016 Toradex, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -19,8 +18,10 @@ int arch_misc_init(void) { if (readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BOOTTYPE) == - NVBOOTTYPE_RECOVERY) - printf("USB recovery mode\n"); + NVBOOTTYPE_RECOVERY) { + printf("USB recovery mode, disabled autoboot\n"); + setenv("bootdelay", "-1"); + } return 0; } |