From patchwork Sat May 6 21:13:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 759377 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wL1zQ18q2z9s7y for ; Sun, 7 May 2017 07:26:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B3970C21C9C; Sat, 6 May 2017 21:22:43 +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=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2 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 464C2C21C58; Sat, 6 May 2017 21:20:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D1FB5C21C2F; Sat, 6 May 2017 21:17:11 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id 40B1BC21C4B for ; Sat, 6 May 2017 21:17:05 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id u26so4910441pfd.2 for ; Sat, 06 May 2017 14:17:05 -0700 (PDT) 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=5fPttPHf66pTk9WRYu/dOPhsAfRHoUlZjMlN9fDWO10=; b=C8V0T1TkdDdCeCb7VLbGVcgkqs2MN1gqK5wREmE4FGuPuuRwb4u6RxGLJTmBnDP+v4 H2hHejcCawdRHZhEm/SYzy6w099oMTTorGWI14Ol3qx1cSZFPaSYHFF6yXW5UsxNjR2d RiSq8pwIShWp6JPwgEQrkj1tfFvfFWFFDamrMpyPOB3sMYyteW97G2Oq6yQM+OvgKtJp aF64Rgs8uHOGgFYTzsLG5yiOyPHB/+He0Lii4FTbpqVf/Xxw/baY19101ymylaPQ3cxZ S5tjbgrmBu5KYUYQNKvMgo9ndhXYcOkSg4REjLy8ytfVX7PmBC0Dl/n98A/oAtCsBouf gBLw== X-Gm-Message-State: AN3rC/4yF0PihCG7eDWctRlYlbPA1RKDMHLXOjd8wAmWKUoL56YDGLTo dfx5J6U4QJqGDA== X-Received: by 10.84.129.131 with SMTP id b3mr75417902plb.1.1494105423977; Sat, 06 May 2017 14:17:03 -0700 (PDT) Received: from localhost.localdomain ([117.247.27.104]) by smtp.gmail.com with ESMTPSA id m19sm3945078pgk.25.2017.05.06.14.17.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 May 2017 14:17:02 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Sun, 7 May 2017 02:43:15 +0530 Message-Id: <1494105195-25729-17-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1494105195-25729-1-git-send-email-jagan@openedev.com> References: <1494105195-25729-1-git-send-email-jagan@openedev.com> Cc: u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH 16/16] engicam: common: Move board_late_init 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" From: Jagan Teki Move board_late_init into common area from supported boards. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- board/engicam/common/board.c | 28 +++++++++++++++++++++++++++- board/engicam/common/board.h | 2 +- board/engicam/geam6ul/geam6ul.c | 21 +-------------------- board/engicam/icorem6/icorem6.c | 21 +-------------------- board/engicam/icorem6_rqs/icorem6_rqs.c | 20 +------------------- board/engicam/isiotmx6ul/isiotmx6ul.c | 23 +---------------------- 6 files changed, 32 insertions(+), 83 deletions(-) diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index 8a83608..af4ef28 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -15,7 +15,7 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_ENV_IS_IN_MMC -void mmc_late_init(void) +static void mmc_late_init(void) { char cmd[32]; char mmcblk[32]; @@ -32,6 +32,32 @@ void mmc_late_init(void) } #endif +int board_late_init(void) +{ + switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> + IMX6_BMODE_SHIFT) { + case IMX6_BMODE_SD: + case IMX6_BMODE_ESD: + case IMX6_BMODE_MMC: + case IMX6_BMODE_EMMC: +#ifdef CONFIG_ENV_IS_IN_MMC + mmc_late_init(); +#endif + setenv("modeboot", "mmcboot"); + break; + case IMX6_BMODE_NAND: + setenv("modeboot", "nandboot"); + break; + default: + setenv("modeboot", ""); + break; + } + + setenv_fdt_file(); + + return 0; +} + int board_init(void) { /* Address of boot parameters */ diff --git a/board/engicam/common/board.h b/board/engicam/common/board.h index 9717e40..f364a23 100644 --- a/board/engicam/common/board.h +++ b/board/engicam/common/board.h @@ -6,7 +6,7 @@ #ifndef _BOARD_H_ #define _BOARD_H_ -void mmc_late_init(void); +void setenv_fdt_file(void); void setup_gpmi_nand(void); void setup_display(void); #endif /* _BOARD_H_ */ diff --git a/board/engicam/geam6ul/geam6ul.c b/board/engicam/geam6ul/geam6ul.c index c992035..841ade9 100644 --- a/board/engicam/geam6ul/geam6ul.c +++ b/board/engicam/geam6ul/geam6ul.c @@ -90,29 +90,10 @@ void setup_gpmi_nand(void) } #endif /* CONFIG_NAND_MXS */ -int board_late_init(void) +void setenv_fdt_file(void) { - switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> - IMX6_BMODE_SHIFT) { - case IMX6_BMODE_SD: - case IMX6_BMODE_ESD: -#ifdef CONFIG_ENV_IS_IN_MMC - mmc_late_init(); -#endif - setenv("modeboot", "mmcboot"); - break; - case IMX6_BMODE_NAND: - setenv("modeboot", "nandboot"); - break; - default: - setenv("modeboot", ""); - break; - } - if (is_mx6ul()) setenv("fdt_file", "imx6ul-geam-kit.dtb"); - - return 0; } #ifdef CONFIG_SPL_BUILD diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index cb4613b..74cbbc5 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -192,31 +192,12 @@ void setup_display(void) } #endif /* CONFIG_VIDEO_IPUV3 */ -int board_late_init(void) +void setenv_fdt_file(void) { - switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> - IMX6_BMODE_SHIFT) { - case IMX6_BMODE_SD: - case IMX6_BMODE_ESD: -#ifdef CONFIG_ENV_IS_IN_MMC - mmc_late_init(); -#endif - setenv("modeboot", "mmcboot"); - break; - case IMX6_BMODE_NAND: - setenv("modeboot", "nandboot"); - break; - default: - setenv("modeboot", ""); - break; - } - if (is_mx6dq()) setenv("fdt_file", "imx6q-icore.dtb"); else if(is_mx6dl() || is_mx6solo()) setenv("fdt_file", "imx6dl-icore.dtb"); - - return 0; } #ifdef CONFIG_SPL_BUILD diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index bdd9e0e..c3c3173 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -32,30 +32,12 @@ int board_mmc_get_env_dev(int devno) } #endif -int board_late_init(void) +void setenv_fdt_file(void) { - switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> - IMX6_BMODE_SHIFT) { - case IMX6_BMODE_SD: - case IMX6_BMODE_ESD: - case IMX6_BMODE_MMC: - case IMX6_BMODE_EMMC: -#ifdef CONFIG_ENV_IS_IN_MMC - mmc_late_init(); -#endif - setenv("modeboot", "mmcboot"); - break; - default: - setenv("modeboot", ""); - break; - } - if (is_mx6dq()) setenv("fdt_file", "imx6q-icore-rqs.dtb"); else if(is_mx6dl() || is_mx6solo()) setenv("fdt_file", "imx6dl-icore-rqs.dtb"); - - return 0; } #ifdef CONFIG_SPL_BUILD diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c b/board/engicam/isiotmx6ul/isiotmx6ul.c index 6607b04..105db73 100644 --- a/board/engicam/isiotmx6ul/isiotmx6ul.c +++ b/board/engicam/isiotmx6ul/isiotmx6ul.c @@ -98,27 +98,8 @@ int board_mmc_get_env_dev(int devno) } #endif -int board_late_init(void) +void setenv_fdt_file(void) { - switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> - IMX6_BMODE_SHIFT) { - case IMX6_BMODE_SD: - case IMX6_BMODE_ESD: - case IMX6_BMODE_MMC: - case IMX6_BMODE_EMMC: -#ifdef CONFIG_ENV_IS_IN_MMC - mmc_late_init(); -#endif - setenv("modeboot", "mmcboot"); - break; - case IMX6_BMODE_NAND: - setenv("modeboot", "nandboot"); - break; - default: - setenv("modeboot", ""); - break; - } - if (is_mx6ul()) { #ifdef CONFIG_ENV_IS_IN_MMC setenv("fdt_file", "imx6ul-isiot-emmc.dtb"); @@ -126,8 +107,6 @@ int board_late_init(void) setenv("fdt_file", "imx6ul-isiot-nand.dtb"); #endif } - - return 0; } #ifdef CONFIG_SPL_BUILD