All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rob Herring <robherring2@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 6/6] ARM: highbank: setup env from boot source register
Date: Wed,  1 Feb 2012 20:57:57 -0600	[thread overview]
Message-ID: <1328151477-8026-7-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1328151477-8026-1-git-send-email-robherring2@gmail.com>

From: Rob Herring <rob.herring@calxeda.com>

Add support to read the boot src register and set bootcmd env from the
selected bootcmdX env setting.

Based on Linkstation boot choice selection.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
 board/highbank/highbank.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index b771cc8..e2dce53 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 
 #define HB_SREG_A9_PWR_REQ		0xfff3cf00
+#define HB_SREG_A9_BOOT_SRC_STAT	0xfff3cf04
 #define HB_PWR_SUSPEND			0
 #define HB_PWR_SOFT_RESET		1
 #define HB_PWR_HARD_RESET		2
@@ -54,8 +55,20 @@ int board_eth_init(bd_t *bis)
 
 int misc_init_r(void)
 {
+	char envbuffer[16];
+	u32 boot_choice;
+
 	ahci_init(0xffe08000);
 	scsi_scan(1);
+
+	boot_choice = readl(HB_SREG_A9_BOOT_SRC_STAT) & 0xff;
+	sprintf(envbuffer, "bootcmd%d", boot_choice);
+	if (getenv(envbuffer)) {
+		sprintf(envbuffer, "run bootcmd%d", boot_choice);
+		setenv("bootcmd", envbuffer);
+	} else
+		setenv("bootcmd", "");
+
 	return 0;
 }
 
-- 
1.7.5.4

  parent reply	other threads:[~2012-02-02  2:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-02  2:57 [U-Boot] [PATCH 0/6] Highbank platform updates Rob Herring
2012-02-02  2:57 ` [U-Boot] [PATCH 1/6] ARM: highbank: fix us_to_tick calculation Rob Herring
2012-02-02  2:57 ` [U-Boot] [PATCH 2/6] ARM: highbank: change TEXT_BASE to 0x8000 Rob Herring
2012-02-02  2:57 ` [U-Boot] [PATCH 3/6] ARM: highbank: Add boot counter support Rob Herring
2012-02-02  2:57 ` [U-Boot] [PATCH 4/6] ARM: highbank: add reset support Rob Herring
2012-02-02  2:57 ` [U-Boot] [PATCH 5/6] ARM: highbank: change env config to use nvram Rob Herring
2012-02-02  2:57 ` Rob Herring [this message]
2012-02-18 16:02 ` [U-Boot] [PATCH 0/6] Highbank platform updates Albert ARIBAUD
2012-02-21 22:55   ` Rob Herring

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=1328151477-8026-7-git-send-email-robherring2@gmail.com \
    --to=robherring2@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.