public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Eric Nelson <eric.nelson@boundarydevices.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/5] i.MX6: nitrogen6x/sabrelite: override set_board_name()
Date: Sun, 17 Nov 2013 10:17:45 -0700	[thread overview]
Message-ID: <1384708667-22489-4-git-send-email-eric.nelson@boundarydevices.com> (raw)
In-Reply-To: <1384708667-22489-1-git-send-email-eric.nelson@boundarydevices.com>

Since the nitrogen6x board file auto-detects Nitrogen6x and
SABRE Lite boards, override set_board_name to produce one
of two values for board_name.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
 board/boundary/nitrogen6x/nitrogen6x.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 616ad55..aa9717a 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -756,9 +756,14 @@ int board_init(void)
 	return 0;
 }
 
+static inline int is_n6x(void)
+{
+	return gpio_get_value(WL12XX_WL_IRQ_GP);
+}
+
 int checkboard(void)
 {
-	if (gpio_get_value(WL12XX_WL_IRQ_GP))
+	if (is_n6x())
 		puts("Board: Nitrogen6X\n");
 	else
 		puts("Board: SABRE Lite\n");
@@ -766,6 +771,13 @@ int checkboard(void)
 	return 0;
 }
 
+void set_board_name(void)
+{
+	char *old = getenv("board_name");
+	if (!old)
+		setenv("board_name", is_n6x() ? "nitrogen6x" : "sabrelite");
+}
+
 struct button_key {
 	char const	*name;
 	unsigned	gpnum;
-- 
1.8.1.2

  parent reply	other threads:[~2013-11-17 17:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-17 17:17 [U-Boot] [PATCH V3 0/5] imx: Define common routines to set cpu and board environment variables Eric Nelson
2013-11-17 17:17 ` [U-Boot] [PATCH V3 1/5] i.MX5x: define cpu_type() to return processor portion of cpu rev Eric Nelson
2013-11-17 19:24   ` Marek Vasut
2013-11-18 10:42   ` Stefano Babic
2013-11-19  3:25     ` Eric Nelson
2013-11-19  9:12       ` Stefano Babic
2013-11-17 17:17 ` [U-Boot] [PATCH 2/5] imx: Define common routines to set cpu and board environment variables Eric Nelson
2013-11-17 17:17 ` Eric Nelson [this message]
2013-11-18 10:57   ` [U-Boot] [PATCH 3/5] i.MX6: nitrogen6x/sabrelite: override set_board_name() Stefano Babic
2013-11-19  3:40     ` Eric Nelson
2013-11-19  9:02       ` Stefano Babic
2013-11-17 17:17 ` [U-Boot] [PATCH 4/5] i.MX6: nitrogen6x/sabrelite: initialize imx_type and board_name values Eric Nelson
2013-11-17 17:17 ` [U-Boot] [PATCH 5/5] i.MX6: mx6*sabre*: " Eric Nelson

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=1384708667-22489-4-git-send-email-eric.nelson@boundarydevices.com \
    --to=eric.nelson@boundarydevices.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