Hi Maxime, On Mon, Jul 02, 2012 at 04:14:53PM +0200, Maxime Ripard wrote: > It is a quite common setup to have a partition with all you need to boot > from the bootloader, ie the kernel image, the device tree blob, etc. > > This patch introduces a new "file" location for these two images, which > uses in turn the *_part and the new *_part_type variable specifying the > fs type used by mount. That was one of the major shortcomings of the default environment and one of the main reasons I created a new environment template. Have you considered using it? Sascha > > Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> > Cc: Brian Lilly <brian@xxxxxxxxxxxxxxxx> > --- > defaultenv/bin/boot | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot > index 61b893a..26360ed 100644 > --- a/defaultenv/bin/boot > +++ b/defaultenv/bin/boot > @@ -114,6 +114,12 @@ elif [ x$kernel_loc = xnand ]; then > kdev="/dev/nand0.kernel.bb" > elif [ x$kernel_loc = xdisk ]; then > kdev="/dev/$kernel_part" > +elif [ x$kernel_loc = xfile ]; then > + if [ ! -d $kernel_part ]; then > + mkdir $kernel_part > + mount /dev/$kernel_part $kernel_part_type $kernel_part > + fi > + kdev="$kernel_part/$kernelimage" > else > echo "error: set kernel_loc to one of 'tftp', 'nfs', 'nand', 'nor' or 'disk'" > exit 1 > @@ -128,6 +134,12 @@ elif [ x$oftree_loc = xnand ]; then > odev="/dev/nand0.oftree.bb" > elif [ x$oftree_loc = xdisk ]; then > odev="/dev/$oftree_part" > +elif [ x$oftree_loc = xfile ]; then > + if [ ! -d $oftree_part ]; then > + mkdir $oftree_loc > + mount /dev/$oftree_part $oftree_part_type $oftree_part > + fi > + odev="$oftree_part/$oftreeimage" > fi > > [ x$odev = x ] || bootm_opt="$bootm_opt -o $odev" > -- > 1.7.9.5 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
