From patchwork Sat Jun 11 09:44:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 69827 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp687761qgf; Sat, 11 Jun 2016 02:45:44 -0700 (PDT) X-Received: by 10.194.24.39 with SMTP id r7mr4884411wjf.13.1465638344473; Sat, 11 Jun 2016 02:45:44 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id t198si3933378wmt.7.2016.06.11.02.45.44; Sat, 11 Jun 2016 02:45:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C1FEFA765A; Sat, 11 Jun 2016 11:45:39 +0200 (CEST) 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 b8TIuPH3CIsx; Sat, 11 Jun 2016 11:45:39 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 709B0A76A3; Sat, 11 Jun 2016 11:45:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 472CBA7707 for ; Sat, 11 Jun 2016 11:45:30 +0200 (CEST) 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 4fU2w6OaGS1X for ; Sat, 11 Jun 2016 11:45:30 +0200 (CEST) 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 conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by theia.denx.de (Postfix) with ESMTPS id EE9DAA7703 for ; Sat, 11 Jun 2016 11:45:26 +0200 (CEST) Received: from grover.sesame (FL1-119-242-215-193.osk.mesh.ad.jp [119.242.215.193]) (authenticated) by conuserg-08.nifty.com with ESMTP id u5B9iDfV028579; Sat, 11 Jun 2016 18:44:32 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u5B9iDfV028579 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1465638273; bh=TGDj42Lr75W7kHYtI8KWvVZtHkPp2LikeCeyL11+9nA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VAVc3KWR7xFsFOobheHaZGi1+66qML52Nghzrt6bMUO/cfXOEU59pafeGTAzgzaK6 U7lbb5U2UMUVN6TdDObSnpy+WuvvNezrPgR6rrWNqmt1lGqHUaWm8ZLrMuURcc7ng+ qCASx6yfiHsyjjtw1h6Cv65HSEEdc/D/r1TsBrYLkztibuG2smToo1ykwyTfkcJVXH YmBSdUFJ14WazM21DUXpJk2njtzO/s9hzdNclzOwjkYRaCA+NZcy2GUvUb7Xc2kejA YDlI+d4bltvAbsHuxkm+mum/hPgUHUJZXy5UHQ5m6RVtblv1MOjprY78si3ZQQXbdd +ZEih9JXhDTYg== X-Nifty-SrcIP: [119.242.215.193] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 11 Jun 2016 18:44:09 +0900 Message-Id: <1465638252-13196-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465638252-13196-1-git-send-email-yamada.masahiro@socionext.com> References: <1465638252-13196-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini , Gong Qianyu , Joe Hershberger , Viresh Kumar , "Albert ARIBAUD \(3ADEV\)" , Soeren Moch , Fabio Estevam Subject: [U-Boot] [PATCH v2 2/5] autoboot: follow-up cleanup after CONFIG_BOOTDELAY moves 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" Tidy up garbage left by commit bb597c0eeb7e ("common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option"). Signed-off-by: Masahiro Yamada --- Changes in v2: None include/configs/bfin_adi_common.h | 5 ----- include/configs/mx6_common.h | 3 --- include/configs/mx7_common.h | 3 --- include/configs/omap3_cairo.h | 2 -- 4 files changed, 13 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 1307607..502ddad 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -97,11 +97,6 @@ /* * Env Settings */ -#ifndef CONFIG_BOOTDELAY -# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART) -# else -# endif -#endif #ifndef CONFIG_BOOTCOMMAND # define CONFIG_BOOTCOMMAND "run ramboot" #endif diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 27f38f4..fb49322 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -59,9 +59,6 @@ #endif #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#ifndef CONFIG_BOOTDELAY -#endif - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 5e5656d..fbc6de6 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -34,9 +34,6 @@ #define CONFIG_LOADADDR 0x80800000 #define CONFIG_SYS_TEXT_BASE 0x87800000 -#ifndef CONFIG_BOOTDELAY -#endif - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 96c3c4b..82e0d50 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -73,8 +73,6 @@ #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -/* override default CONFIG_BOOTDELAY */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "machid=ffffffff\0" \ "fdt_high=0x87000000\0" \