[PATCH] imx(25,35): save boot location into $barebox_loc env.

[PATCH] imx(25,35): save boot location into $barebox_loc env.

[Marc Reilly]

Saves the boot source into an environment variable so env scripts
can more easily use boot source information.

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   |   95 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 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..446a6ab
--- /dev/null
+++ b/arch/arm/mach-imx/boot.c
@@ -0,0 +1,95 @@
+/*
+ * 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)
+/*
+ * Saves the boot source media into the $barebox_loc enviroment variable
+ *
+ * This information is useful for barebox init scripts as we can then easily
+ * use a kernel image stored on the same media that we launch barebox with
+ * (for example).
+ *
+ * imx25 and imx35 can boot into barebox from several media such as
+ * nand, nor, mmc/sd cards, serial roms. "mmc" is used to represent several
+ * sources as its impossible to distinguish between them.
+ *
+ * Some sources such as serial roms can themselves have 3 different boot
+ * possibilities (i2c1, i2c2 etc). It is assumed that any board will
+ * only be using one of these at any one time.
+ *
+ * Note also that I suspect that the boot source pins are only sampled at
+ * power up.
+ */
+static int imx_boot_save_loc(void)
+{
+	const char *bareboxloc = NULL;
+	uint32_t reg;
+	unsigned int ctrl, type;
+
+	/* [CTRL][TYPE] */
+	const char *const locations[4][4] = {
+		{ /* CTRL = WEIM */
+			"nor",
+			0,
+			"onenand",
+			0
+		}, { /* CTRL == NAND */
+			"nand",
+			"nand",
+			"nand",
+			"nand",
+		}, { /* CTRL == ATA, (imx35 only) */
+			0,
+			0, /* might be p-ata */
+			0,
+			0,
+		}, { /* CTRL == expansion */
+			"mmc", /* note imx25 could also be: movinand, ce-ata */
+			0,
+			"i2c",
+			"spi",
+		}
+	};
+
+	reg = readl(IMX_CCM_BASE + CCM_RCSR);
+	ctrl = (reg >> CCM_RCSR_MEM_CTRL_SHIFT) & 0x3;
+	type = (reg >> CCM_RCSR_MEM_TYPE_SHIFT) & 0x3;
+
+	bareboxloc = locations[ctrl][type];
+
+	if (bareboxloc) {
+		setenv("barebox_loc", bareboxloc);
+		export("barebox_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

Re: [PATCH] imx(25,35): save boot location into $barebox_loc env.

[Jean-Christophe PLAGNIOL-VILLARD]

> + */
> +
> +#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)
please move this to the Makefile
> +/*
> + * Saves the boot source media into the $barebox_loc enviroment variable
> + *
> + * This information is useful for barebox init scripts as we can then easily
> + * use a kernel image stored on the same media that we launch barebox with
> + * (for example).
> + *
> + * imx25 and imx35 can boot into barebox from several media such as
> + * nand, nor, mmc/sd cards, serial roms. "mmc" is used to represent several
> + * sources as its impossible to distinguish between them.
> + *
> + * Some sources such as serial roms can themselves have 3 different boot
> + * possibilities (i2c1, i2c2 etc). It is assumed that any board will
> + * only be using one of these at any one time.
> + *
> + * Note also that I suspect that the boot source pins are only sampled at
> + * power up.
> + */
> +static int imx_boot_save_loc(void)
> +{
> +	const char *bareboxloc = NULL;
> +	uint32_t reg;
> +	unsigned int ctrl, type;
> +
> +	/* [CTRL][TYPE] */
> +	const char *const locations[4][4] = {
	a struct could be better not sure
> +		{ /* CTRL = WEIM */
> +			"nor",
> +			0,
			NULL no?
> +			"onenand",
> +			0
> +		}, { /* CTRL == NAND */
> +			"nand",
> +			"nand",
> +			"nand",
> +			"nand",
> +		}, { /* CTRL == ATA, (imx35 only) */
> +			0,
> +			0, /* might be p-ata */
> +			0,
> +			0,
> +		}, { /* CTRL == expansion */
> +			"mmc", /* note imx25 could also be: movinand, ce-ata */
> +			0,
> +			"i2c",
> +			"spi",
> +		}
> +	};
otherwise look good

Best Regards,
J.

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

Re: [PATCH] imx(25,35): save boot location into $barebox_loc env.

[Marc Reilly]

> > +#include <mach/imx-regs.h>
> > +
> > +#if defined(CONFIG_ARCH_IMX25) || defined(CONFIG_ARCH_IMX35)
> 
> please move this to the Makefile

I respectfully disagree. :) Other imx will require a slightly different 
approach to this function, the imx31 and the imx51 are both different for 
example.

So we either need to have a separate .c file for each different type and link 
them appropriately in the Makefile, or we have a single boot.c and 
conditionally compile.
I think its overkill to split it up into separate files, especially seeing as 
some code will be (hopefully) be used by multiple processors. I also think its 
better that with one file the code with similar functionality is grouped 
together.

Hope those arguments make sense.
> 
> > +/*
> > + * Saves the boot source media into the $barebox_loc enviroment variable
> > + *
> > + * This information is useful for barebox init scripts as we can then
> > easily + * use a kernel image stored on the same media that we launch
> > barebox with + * (for example).
> > + *
> > + * imx25 and imx35 can boot into barebox from several media such as
> > + * nand, nor, mmc/sd cards, serial roms. "mmc" is used to represent
> > several + * sources as its impossible to distinguish between them.
> > + *
> > + * Some sources such as serial roms can themselves have 3 different boot
> > + * possibilities (i2c1, i2c2 etc). It is assumed that any board will
> > + * only be using one of these at any one time.
> > + *
> > + * Note also that I suspect that the boot source pins are only sampled
> > at + * power up.
> > + */
> > +static int imx_boot_save_loc(void)
> > +{
> > +	const char *bareboxloc = NULL;
> > +	uint32_t reg;
> > +	unsigned int ctrl, type;
> > +
> > +	/* [CTRL][TYPE] */
> > +	const char *const locations[4][4] = {
> 
> 	a struct could be better not sure

I couldn't think of a way where a struct would make it easier than it is... 
suggestions?

> 
> > +		{ /* CTRL = WEIM */
> > +			"nor",
> > +			0,
> 
> 			NULL no?

Ack, you're right.

Guess I'll have to have another go :) I'll let it rest for a bit and see if 
there are any other comments.

Cheers
Marc

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