From patchwork Sun Feb 21 11:59:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Kiryanov X-Patchwork-Id: 585791 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 7A00A14032F for ; Sun, 21 Feb 2016 23:01:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=compulab.co.il header.i=@compulab.co.il header.b=bTld/DTD; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 34E6DA7616; Sun, 21 Feb 2016 13:01:22 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id beiyfK7O7S5a; Sun, 21 Feb 2016 13:01:21 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 77570A75CB; Sun, 21 Feb 2016 13:01:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0C4A8A75CC for ; Sun, 21 Feb 2016 13:01:19 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mcKAvmgy9PiP for ; Sun, 21 Feb 2016 13:01:18 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from compulab.co.il (softlayer.compulab.co.il [50.23.254.55]) by theia.denx.de (Postfix) with ESMTPS id 88CFCA748F for ; Sun, 21 Feb 2016 13:01:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=compulab.co.il; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From; bh=JgxEFMzEiRLphOXVZZowGdkzzhCdIsilYs3q4jOn9g0=; b=bTld/DTDowCVR UbmQWnjZR7wsyMdPuGLR9SqCake7uaD3hkSL2znQmbFyael8ATBRx0J0SZFvU5/mw/QrcU1wGV2q4 1gKBtVuQiHFuXQ8DUNf8NErGzBp1A3aJxg109ERB2d2DciwUUTAqRz0XiHdHXzxYBhI6Z2kzTAhLz evrM=; Received: from [82.166.188.245] (port=51347 helo=zimbra-mta.compulab.co.il) by softlayer.compulab.co.il with esmtp (Exim 4.86) (envelope-from ) id 1aXShM-0003Tt-J0; Sun, 21 Feb 2016 14:01:12 +0200 Received: from localhost (localhost [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 6336A482130; Sun, 21 Feb 2016 14:01:11 +0200 (IST) Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id uYIWveaHZOcC; Sun, 21 Feb 2016 14:01:07 +0200 (IST) Received: from localhost (localhost [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id AE592482132; Sun, 21 Feb 2016 14:01:07 +0200 (IST) X-Virus-Scanned: amavisd-new at zimbra-mta.compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id feXUIG81IvpJ; Sun, 21 Feb 2016 14:01:07 +0200 (IST) Received: from skynet.compulab.local (nikita-pc.compulab.local [192.168.11.211]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 895B1482130; Sun, 21 Feb 2016 14:01:07 +0200 (IST) From: Nikita Kiryanov To: u-boot@lists.denx.de Date: Sun, 21 Feb 2016 13:59:20 +0200 Message-Id: <1456055960-17039-1-git-send-email-nikita@compulab.co.il> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455902390-5387-1-git-send-email-nikita@compulab.co.il> References: <1455902390-5387-1-git-send-email-nikita@compulab.co.il> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - softlayer.compulab.co.il X-AntiAbuse: Original Domain - lists.denx.de X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Get-Message-Sender-Via: softlayer.compulab.co.il: acl_c_recent_authed_mail_ips_text_entry: nikita@compulab.co.il|compulab.co.il X-Authenticated-Sender: softlayer.compulab.co.il: nikita@compulab.co.il Cc: Tom Rini Subject: [U-Boot] [PATCH] arm: am437x: cm-t43: bring back BOOTDELAY feature X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Commit 755324 (configs: Use config_distro_defaults.h in ti_armv7_common.h) made ti_armv7_common.h include config_distro_defaults.h. This breaks the bootdelay feature in cm_t43 because now the - #include ti_armv7_common.h (#define CONFIG_BOOTDELAY 1) - #undef CONFIG_BOOTDELAY - #include config_distro_defaults.h (#define CONFIG_BOOTDELAY 2) dance in cm_t43.h is no longer valid and in fact leads to CONFIG_BOOTDELAY not being defined. Adapt the config file to the new inclusion hierarchy. Cc: Tom Rini Cc: Albert Aribaud Cc: Igor Grinberg Signed-off-by: Nikita Kiryanov Reviewed-by: Tom Rini --- NOTE: this patch depends on the cm-t43 maintenance series: https://www.mail-archive.com/u-boot@lists.denx.de/msg204112.html include/configs/cm_t43.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index ae15095..1c1951c 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -98,10 +98,8 @@ #undef CONFIG_SPL_OS_BOOT #undef CONFIG_SPL_GPIO_SUPPORT #undef CONFIG_SPL_NAND_SUPPORT -#undef CONFIG_BOOTDELAY #undef CONFIG_SYS_MONITOR_LEN #undef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR -#include #define CONFIG_ZERO_BOOTDELAY_CHECK #undef CONFIG_CMD_IMLS