From patchwork Wed Aug 23 11:41:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 804957 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xcltz303Yz9s9Y for ; Wed, 23 Aug 2017 21:43:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 234B8C21E92; Wed, 23 Aug 2017 11:42:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E200BC21E76; Wed, 23 Aug 2017 11:41:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 45F20C21E09; Wed, 23 Aug 2017 11:41:39 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id 872C6C21D9E for ; Wed, 23 Aug 2017 11:41:39 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 8FFC2209DB; Wed, 23 Aug 2017 13:41:38 +0200 (CEST) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 6995820982; Wed, 23 Aug 2017 13:41:38 +0200 (CEST) From: Maxime Ripard To: Jagan Teki , Jaehoon Chung , Simon Glass Date: Wed, 23 Aug 2017 13:41:35 +0200 Message-Id: <20170823114136.10919-4-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170823114136.10919-1-maxime.ripard@free-electrons.com> References: <20170823114136.10919-1-maxime.ripard@free-electrons.com> Cc: u-boot@lists.denx.de, Maxime Ripard Subject: [U-Boot] [PATCH 3/4] sunxi: Use spl_boot_device X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Our current board code duplicates a bit the spl_boot_device logic. Now that we can use that function in the full-flavoured U-Boot, remove that duplication and call the function instead. Signed-off-by: Maxime Ripard --- board/sunxi/board.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 800f412b383d..e1d48140878f 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -720,11 +721,14 @@ static void setup_environment(const void *fdt) int misc_init_r(void) { __maybe_unused int ret; + uint boot; setenv("fel_booted", NULL); setenv("fel_scriptaddr", NULL); + + boot = spl_boot_device(); /* determine if we are running in FEL mode */ - if (!is_boot0_magic(SPL_ADDR + 4)) { /* eGON.BT0 */ + if (boot == BOOT_DEVICE_BOARD) { setenv("fel_booted", "1"); parse_spl_header(SPL_ADDR); }