From patchwork Mon Nov 20 18:32:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839678 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NZ+eXWrx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygctX1gjhz9rxj for ; Tue, 21 Nov 2017 05:38:44 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B2FF1C22063; Mon, 20 Nov 2017 18:34:28 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 A3CCFC220FE; Mon, 20 Nov 2017 18:33:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DF586C220F2; Mon, 20 Nov 2017 18:32:39 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 1DBEFC22014 for ; Mon, 20 Nov 2017 18:32:35 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id q4so7865533pfg.13 for ; Mon, 20 Nov 2017 10:32:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U9ELYSiTHGUihHALDYEGD5AoFUJxHScnW60wAR3YIac=; b=NZ+eXWrx1ojtUWqhgAQJtDV6vBzVscNYwJRab1NmFPI2Ltw7HWu8+jzDofPbVqW/IN J8LQ91yRMOTBl8JSgAoiKrZCQDH5qqy+wu1jNeSCvb5aW2XnZbujFmXeGA6JcE5NvBcT 5RtfSudlhZo8aSLujvSgjNu+wEbZ4+qCL58qix3w9DzgvBW+QdH0VJ2HSarEF3AzaPob 4PwOtwIeyiy2nr1089+UP76CGvmvIdXMRvBYTM4KcwjkrylpPuEZpIp+TyRREXWqfM0c qruTVBSlMCcHznxHRSUipG8hJSbP1jjAmviJbkdPEuiGDchJyZcAWFYW2F/Q7A5og2s5 gfzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U9ELYSiTHGUihHALDYEGD5AoFUJxHScnW60wAR3YIac=; b=FAKzY/wep80StXEgOVt2uqd/oa31bn5OC+cCPZDcIZvdh5qvhQzM46INjPnRuvSSZz aRYhn4ElvNwsWv8DMlwR0nWm3o+RuExD6sNxss8PGln+qJkmbM99CeaC+5rAm1S8YqUP IDzG7jDq961eIialSBdUd4T/LaI6YP+x8bt9lKNtsqJjeBm3uVlI2b1IoAPF5oJPpHcn SUqwEuAO9PYNB4pZ2yifU9nnICkXEKKZxAwMsuLRJcmuBhez6nkTsF1gloZ4vNEPirZG yRGZs1/EqFeioyxaPuDHFX0AjksRvcamMiv71oQyVpGy6r/NWUPF1hCXS9k9q1B3H4XJ wrUQ== X-Gm-Message-State: AJaThX7u/n1aU+Kd8GO29WimY5C1Id8mASEN94so8IWAOhoVje8vqUJQ JXTenb3SbUefvLOc5iGVYlE= X-Google-Smtp-Source: AGs4zMaQod82eoOJ/zzCnr65gT/XDTZ6pZYiq7WW78YeeK87PMwspUigKJRzPLFDjuNhgL/6gsSm7Q== X-Received: by 10.159.218.72 with SMTP id x8mr14978185plv.257.1511202753634; Mon, 20 Nov 2017 10:32:33 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:32 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:11 +0530 Message-Id: <1511202738-17448-3-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 2/9] i.MX6Q: icorem6: Move spl load fit to common/spl 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" Move spl load fit code into common/spl Signed-off-by: Jagan Teki --- board/engicam/common/spl.c | 16 ++++++++++++++++ board/engicam/icorem6/icorem6.c | 12 ------------ board/engicam/icorem6_rqs/icorem6_rqs.c | 12 ------------ 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index 8711418..f8ae3ac 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -39,6 +39,22 @@ static iomux_v3_cfg_t const uart_pads[] = { #endif }; +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + if (is_mx6dq() && !strcmp(name, "imx6q-icore")) + return 0; + else if (is_mx6dq() && !strcmp(name, "imx6q-icore-rqs")) + return 0; + else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore")) + return 0; + else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore-rqs")) + return 0; + else + return -1; +} +#endif + #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index 59c085b..e173124 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -264,16 +264,4 @@ int board_mmc_init(bd_t *bis) return 0; } #endif - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ - if (is_mx6dq() && !strcmp(name, "imx6q-icore")) - return 0; - else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore")) - return 0; - else - return -1; -} -#endif #endif /* CONFIG_SPL_BUILD */ diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index 8afc9be..84ab936 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -147,16 +147,4 @@ void board_boot_order(u32 *spl_boot_list) } #endif #endif - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ - if (is_mx6dq() && !strcmp(name, "imx6q-icore-rqs")) - return 0; - else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore-rqs")) - return 0; - else - return -1; -} -#endif #endif /* CONFIG_SPL_BUILD */