mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marc Reilly <marc@cpdesign.com.au>
To: barebox@lists.infradead.org
Subject: [PATCH v2 3/3] imx(25,35): save boot location into $boot_loc env.
Date: Tue, 11 Jan 2011 10:40:16 +1100	[thread overview]
Message-ID: <1294702816-21612-4-git-send-email-marc@cpdesign.com.au> (raw)
In-Reply-To: <1294702816-21612-1-git-send-email-marc@cpdesign.com.au>

Saves the boot source into an environment variable so env scripts
can more easily use boot source information. We could also
look at the extra information in the MEM_TYPE bits if needed in future,
but this is good enough for my purposes.

Note only tested on imx35. I haven't added support for any other variants
because I'm not familiar with them. (And can't test them anyway).

Signed-off-by: Marc Reilly <marc@cpdesign.com.au>
---
 arch/arm/mach-imx/Makefile |    1 +
 arch/arm/mach-imx/boot.c   |   61 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-imx/boot.c

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index d000683..3b2deaf 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_IMX_IIM)	+= iim.o
 obj-$(CONFIG_NAND_IMX) += nand.o
 obj-y += speed.o
 obj-y += devices.o
+obj-y += boot.o
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
new file mode 100644
index 0000000..560fc76
--- /dev/null
+++ b/arch/arm/mach-imx/boot.c
@@ -0,0 +1,61 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <environment.h>
+#include <init.h>
+
+#include <asm/io.h>
+#include <mach/imx-regs.h>
+
+#if defined(CONFIG_ARCH_IMX25) || defined(CONFIG_ARCH_IMX35)
+static int imx_boot_save_loc(void)
+{
+	const char *bootloc = NULL;
+	uint32_t reg;
+
+	reg = readl(IMX_CCM_BASE + CCM_RCSR);
+
+	switch ((reg >> CCM_RCSR_MEM_CTRL_SHIFT) & 0x3) {
+	case 0x03:		/* SD/MMC, I2C, SPI is the source */
+		bootloc = "expansion";
+		break;
+	case 0x01:		/* NAND is the source */
+		bootloc = "nand";
+		break;
+	case 0x00:		/* NOR, OneNand is the source */
+		bootloc = "weim";
+		break;
+	default:
+		break;
+	}
+
+	if (bootloc) {
+		setenv("boot_loc", bootloc);
+		export("boot_loc");
+	}
+
+	return 0;
+}
+
+/*
+ * This can only be called after env_push_context() has been called
+ * so it is a late_initcall.
+ */
+late_initcall(imx_boot_save_loc);
+
+#endif
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2011-01-10 23:40 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-10 23:40 [PATCH v2] imx: Save boot source into env during init Marc Reilly
2011-01-10 23:40 ` [PATCH v2 1/3] Init env context a bit earlier in initalization sequence Marc Reilly
2011-01-10 23:40 ` [PATCH v2 2/3] imx: add reg definitions for imx25 and imx35 boot source Marc Reilly
2011-01-10 23:40 ` Marc Reilly [this message]
2011-01-11  9:41   ` [PATCH v2 3/3] imx(25,35): save boot location into $boot_loc env Sascha Hauer
2011-01-11 10:34     ` [PATCH v2 3/3] imx(25, 35): " Marc Reilly
2011-01-11 10:39       ` Eric Bénard
2011-01-11 11:32       ` [PATCH v2 3/3] imx(25,35): " Sascha Hauer

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=1294702816-21612-4-git-send-email-marc@cpdesign.com.au \
    --to=marc@cpdesign.com.au \
    --cc=barebox@lists.infradead.org \
    /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