sysmo-bts/u-boot
9
0
Fork 0
Code Pull requests Releases Activity
u-boot/nand_spl
History
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
..
board Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
nand_boot.c nand_spl: store ecc data on the stack 2012-01-26 16:09:06 -06:00
nand_boot_fsl_elbc.c nand/fsl_elbc: shrink SPL a bit by converting out_be32() to __raw_writel() 2012-08-22 16:07:43 -05:00
nand_boot_fsl_ifc.c nand: Freescale Integrated Flash Controller NAND support 2011-09-29 19:01:04 -05:00
nand_boot_fsl_nfc.c mxc nand: Homogenize IP revisions with Linux 2012-09-17 19:51:45 -05:00