public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Tim Harvey <tharvey@gateworks.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/5] imx: ventana: make fdt_file1 and fdt_file2 automatic and non-overridable
Date: Tue, 26 May 2015 11:04:56 -0700	[thread overview]
Message-ID: <1432663498-24367-4-git-send-email-tharvey@gateworks.com> (raw)
In-Reply-To: <1432663498-24367-1-git-send-email-tharvey@gateworks.com>

The fdt_file1 and fdt_file2 vars provide fallbacks for the fdt file loading
script. There is no need to allow the user to override these as if they
want to specify the fdt, they should do so in the first attempt which is
the fdt_file var.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---
 board/gateworks/gw_ventana/gw_ventana.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index e3737d1..221069f 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -695,18 +695,14 @@ int misc_init_r(void)
 			*p++ = 0;
 
 			setenv("model_base", str);
-			if (!getenv("fdt_file1")) {
-				sprintf(fdt, "%s-%s.dtb", cputype, str);
-				setenv("fdt_file1", fdt);
-			}
+			sprintf(fdt, "%s-%s.dtb", cputype, str);
+			setenv("fdt_file1", fdt);
 			if (board_type != GW551x && board_type != GW552x)
 				str[4] = 'x';
 			str[5] = 'x';
 			str[6] = 0;
-			if (!getenv("fdt_file2")) {
-				sprintf(fdt, "%s-%s.dtb", cputype, str);
-				setenv("fdt_file2", fdt);
-			}
+			sprintf(fdt, "%s-%s.dtb", cputype, str);
+			setenv("fdt_file2", fdt);
 		}
 
 		/* initialize env from EEPROM */
-- 
1.9.1

  parent reply	other threads:[~2015-05-26 18:04 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-26 18:04 [U-Boot] [PATCH 0/5] imx: ventana: various cleanups Tim Harvey
2015-05-26 18:04 ` [U-Boot] [PATCH 1/5] imx: ventana: various board-specific GPIO config updates Tim Harvey
2015-05-26 18:04 ` [U-Boot] [PATCH 2/5] imx: ventana: make model env var automatic and non-overridable Tim Harvey
2015-05-26 18:04 ` Tim Harvey [this message]
2015-05-26 18:04 ` [U-Boot] [PATCH 4/5] imx: ventana: hang if board model could not be determined Tim Harvey
2015-05-26 18:04 ` [U-Boot] [PATCH 5/5] imx: ventana: skip mtdparts fixup if no flash Tim Harvey
2015-06-01  7:50 ` [U-Boot] [PATCH 0/5] imx: ventana: various cleanups Stefano Babic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432663498-24367-4-git-send-email-tharvey@gateworks.com \
    --to=tharvey@gateworks.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox