From patchwork Tue Sep 19 18:37:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 815778 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="q5g7KJJS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xxWyw2zczz9sPm for ; Wed, 20 Sep 2017 04:45:28 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D2904C21DA2; Tue, 19 Sep 2017 18:44:12 +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_DNSWL_NONE, 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 E03A6C21DB5; Tue, 19 Sep 2017 18:44:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7FA10C21D76; Tue, 19 Sep 2017 18:43:40 +0000 (UTC) Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by lists.denx.de (Postfix) with ESMTPS id C5CA7C21D19 for ; Tue, 19 Sep 2017 18:43:36 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id f84so187735pfj.3 for ; Tue, 19 Sep 2017 11:43:36 -0700 (PDT) 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=D9gOAXZn0MHYfj7bD9PeFmFiS9loNQv87dU7bCM8iJU=; b=q5g7KJJSTXTE2P/7MPuGVL/kK3S/m49YPQPd0sXxVVbFD1h9LUAU2pYM97jbZPbYRG Q2O6p/WGL2lF26WGJmu4JT7dTa4okxwF6rJwlafPOaaUEqZyEqBiRKu1IWsHZvJ5DjC3 5oxBuWeIAXX2Cy99afTRkK6riMPxU5dlkNGDvJAqgmhLmLWc5WHDu5/mXOg6ggkm42Bc e4WC1/ffhSCPYHqEDvhUxmhlXOyrkiP+VpLZ6c1UwhC9B740wdF3gYZhIhI3OFiPsT8j waqTWaQEL1b855Tut+6JoAGpzV8V8Zn+Xa/SQn+5ODeELZoryK3iuDjgMEoVd6R5+RP2 P/BQ== 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=D9gOAXZn0MHYfj7bD9PeFmFiS9loNQv87dU7bCM8iJU=; b=kJzVPfk0x9RnLaqJu9we2hXFyo1ABNJAwt9WLclNriFvFMrgjcHrkQ1Qf73SvNWTTv 6ysV2+kEnRrZHOdsooOtvRsvdJBkHc4ROG44bIXqR0o+MszhdnG40RPUQtYOo5wEvKeM oA3Z1lbLR7BCSA2DoKNOWNF68VK+wh6m0KbcJW1MFL/RUlGVB+++Lz3YRk0Jz7DLBejT p04F1EKKJhrQHM0j4J+1DFD+puKJZpqLA7gAipbzjuAa6Nf9iG61vKclyqVwS9Q7Jw8M kHAyceC9ZnnyVfccaSTOsDy3JFR7MQvRnbnIq5yO0afoWxG4jXlzPVPkJ5zrlakgxw0y CAbQ== X-Gm-Message-State: AHPjjUgdrgOCs/xU+sChGow4sl56h5vcaEuLqBseZG5P8gXqOUHHSJJh yo1Wyws+oDeaV2BIIgQS+mk= X-Google-Smtp-Source: AOwi7QBoOEAANsCvwmKIhXv65TMjceLykKS5TkNHr5evSFV4ZB6/s1gqvTi10p5mqmB5LsFtLtRTOw== X-Received: by 10.98.14.27 with SMTP id w27mr2140431pfi.201.1505846615368; Tue, 19 Sep 2017 11:43:35 -0700 (PDT) Received: from localhost.localdomain ([115.97.191.18]) by smtp.gmail.com with ESMTPSA id e87sm4757779pfl.46.2017.09.19.11.43.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Sep 2017 11:43:33 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Wed, 20 Sep 2017 00:07:58 +0530 Message-Id: <1505846281-19020-4-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505846281-19020-1-git-send-email-jteki@openedev.com> References: <1505846281-19020-1-git-send-email-jteki@openedev.com> Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH 3/6] i.MX6: engicam: Move set_fdt_file to common 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 setenv_fdt_file to common code and set dtb based on CONFIG_DEFAULT_DEVICE_TREE and cpu_type. Signed-off-by: Jagan Teki --- board/engicam/common/board.c | 24 ++++++++++++++++++++++++ board/engicam/common/board.h | 1 - board/engicam/geam6ul/geam6ul.c | 6 ------ board/engicam/icorem6/icorem6.c | 8 -------- board/engicam/icorem6_rqs/icorem6_rqs.c | 8 -------- board/engicam/isiotmx6ul/isiotmx6ul.c | 11 ----------- 6 files changed, 24 insertions(+), 34 deletions(-) diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index c7ec55f..f86fb2b 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -32,6 +32,30 @@ static void mmc_late_init(void) } #endif +static void setenv_fdt_file(void) +{ + const char *cmp_dtb = CONFIG_DEFAULT_DEVICE_TREE; + + if (!strcmp(cmp_dtb, "imx6q-icore")) { + if (is_mx6dq()) + env_set("fdt_file", "imx6q-icore.dtb"); + else if(is_mx6dl() || is_mx6solo()) + env_set("fdt_file", "imx6dl-icore.dtb"); + } else if (!strcmp(cmp_dtb, "imx6q-icore-rqs")) { + if (is_mx6dq()) + env_set("fdt_file", "imx6q-icore-rqs.dtb"); + else if(is_mx6dl() || is_mx6solo()) + env_set("fdt_file", "imx6dl-icore-rqs.dtb"); + } else if (!strcmp(cmp_dtb, "imx6ul-geam-kit")) + env_set("fdt_file", "imx6ul-geam-kit.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-mmc")) + env_set("fdt_file", "imx6ul-isiot-mmc.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-emmc")) + env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-nand")) + env_set("fdt_file", "imx6ul-isiot-nand.dtb"); +} + int board_late_init(void) { switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> diff --git a/board/engicam/common/board.h b/board/engicam/common/board.h index f364a23..c720b0b 100644 --- a/board/engicam/common/board.h +++ b/board/engicam/common/board.h @@ -6,7 +6,6 @@ #ifndef _BOARD_H_ #define _BOARD_H_ -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 ffd383a..15bd8b2 100644 --- a/board/engicam/geam6ul/geam6ul.c +++ b/board/engicam/geam6ul/geam6ul.c @@ -90,12 +90,6 @@ void setup_gpmi_nand(void) } #endif /* CONFIG_NAND_MXS */ -void setenv_fdt_file(void) -{ - if (is_mx6ul()) - env_set("fdt_file", "imx6ul-geam-kit.dtb"); -} - #ifdef CONFIG_SPL_BUILD /* MMC board initialization is needed till adding DM support in SPL */ #if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index 3d4f713..59c085b 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -192,14 +192,6 @@ void setup_display(void) } #endif /* CONFIG_VIDEO_IPUV3 */ -void setenv_fdt_file(void) -{ - if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore.dtb"); - else if(is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore.dtb"); -} - #ifdef CONFIG_SPL_BUILD /* MMC board initialization is needed till adding DM support in SPL */ #if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index 2a321dc..edf9d086 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -32,14 +32,6 @@ int board_mmc_get_env_dev(int devno) } #endif -void setenv_fdt_file(void) -{ - if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore-rqs.dtb"); - else if(is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore-rqs.dtb"); -} - #ifdef CONFIG_SPL_BUILD #include diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c b/board/engicam/isiotmx6ul/isiotmx6ul.c index fbf1724..9afa8e4 100644 --- a/board/engicam/isiotmx6ul/isiotmx6ul.c +++ b/board/engicam/isiotmx6ul/isiotmx6ul.c @@ -98,17 +98,6 @@ int board_mmc_get_env_dev(int devno) } #endif -void setenv_fdt_file(void) -{ - if (is_mx6ul()) { -#ifdef CONFIG_ENV_IS_IN_MMC - env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); -#else - env_set("fdt_file", "imx6ul-isiot-nand.dtb"); -#endif - } -} - #ifdef CONFIG_SPL_BUILD #include