Stefano Babic 05a860c228 Merge branch 'master' of git://git.denx.de/u-boot into master
Conflicts:
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/woodburn_common.h
	board/woodburn/woodburn.c

These boards still use the old old PMIC framework, so they
do not merge properly after the power framework was merged into
mainline.

Fix all conflicts and update woodburn to use Power Framework.

Signed-off-by: Stefano Babic <sbabic@denx.de>
2012-12-08 12:02:45 +01:00
..
2012-12-06 13:56:39 -07:00
2012-12-07 08:47:52 -07:00
2011-09-11 21:24:09 +02:00
2008-09-01 13:41:58 +02:00
2010-04-21 23:42:38 +02:00
2008-02-04 19:26:54 -05:00
2009-07-27 00:24:55 +02:00
2012-03-27 22:05:28 +02:00
2008-10-18 21:54:03 +02:00
2010-05-21 22:05:05 +02:00
2012-07-10 09:18:33 +02:00
2008-04-25 00:03:53 +02:00
2003-06-27 21:31:46 +00:00
2010-04-21 23:42:38 +02:00
2002-11-02 23:30:20 +00:00
2005-08-06 01:42:58 +02:00
2012-11-26 15:41:25 -06:00
2008-10-18 21:54:03 +02:00
2012-11-26 15:41:29 -06:00
2008-05-09 20:53:52 +02:00
2012-10-03 02:04:26 +02:00
2010-04-03 15:24:26 -05:00
2008-10-18 21:54:03 +02:00
2008-10-18 21:54:03 +02:00
2012-10-22 15:52:46 -05:00
2010-10-19 23:53:45 +02:00
2011-09-11 21:24:09 +02:00
2012-08-09 23:42:20 +02:00

This patch series adds support for ZFS listing and load to u-boot.

To Enable zfs ls and load commands, modify the board specific config file with
#define CONFIG_CMD_ZFS

Steps to test:

1. After applying the patch, zfs specific commands can be seen
   in the boot loader prompt using
        UBOOT #help

        zfsload- load binary file from a ZFS file system
        zfsls  - list files in a directory (default /)

2. To list the files in zfs pool, device or partition, execute
        zfsls <interface> <dev[:part]> [POOL/@/dir/file]
        For example:
        UBOOT #zfsls mmc 0:5 /rpool/@/usr/bin/

3. To read and load a file from an ZFS formatted partition to RAM, execute
        zfsload <interface> <dev[:part]> [addr] [filename] [bytes]
        For example:
        UBOOT #zfsload mmc 2:2 0x30007fc0 /rpool/@/boot/uImage

References :
	-- ZFS GRUB sources from Solaris GRUB-0.97
	-- GRUB Bazaar repository

Jorgen Lundman <lundman at lundman.net> 2012.