u-boot-brain/board/freescale
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
..
bsc9131rdb powerpc/mpc85xx:Add BSC9131 RDB Support 2012-07-06 17:30:29 -05:00
common powerpc/85xx: add support for the Freescale P5040DS Superhydra reference board 2012-11-27 18:28:06 -06:00
corenet_ds powerpc/corenet_ds: Update DDR timing for single-rank DIMMs 2012-11-27 18:28:06 -06:00
imx/ddr mx6q: Factor out common DDR3 init code 2012-10-15 11:54:08 -07:00
m547xevb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m548xevb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5208evbe common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5235evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5249evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5253demo common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5253evbe common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5271evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5272c3 common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5275evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5282evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5329evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m5373evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m52277evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m53017evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m54418twr ColdFire: Update the lds file for M54418TWR board. 2012-10-29 22:08:09 +08:00
m54451evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
m54455evb common: Discard the __u_boot_cmd section 2012-10-22 08:29:42 -07:00
mpc832xemds doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc837xemds doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc837xerdb doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc5121ads GCC4.6: Squash warning in mpc5121ads.c 2011-10-27 23:54:01 +02:00
mpc7448hpc2 doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8260ads punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
mpc8266ads board/freescale/mpc8266ads/mpc8266ads.c: Fix GCC 4.6 build warning 2011-11-07 22:49:44 +01:00
mpc8308rdb mpc8308rdb: add support for eSDHC MMC controller 2012-09-18 16:16:45 -05:00
mpc8313erdb powerpc/mpc83xx: sparse fixes 2012-11-04 11:00:37 -07:00
mpc8315erdb doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8323erdb doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8349emds mpc83xx: Rename CONFIG_SYS_DDR_CONFIG and cleanup DDR csbnds code 2011-11-03 18:27:56 -05:00
mpc8349itx doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8360emds doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8360erdk punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
mpc8536ds doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8540ads 8xxx: Change all 8*xx_DDR addresses to 8xxx 2012-11-27 17:45:17 -06:00
mpc8541cds mpc85xx: use LCRR_DBYP define instead of raw constant 2012-08-23 10:24:18 -05:00
mpc8544ds doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8548cds board/freescale/mpc8548cds/mpc8548cds.c: Fix GCC 4.6 build warning 2011-11-11 07:49:00 -06:00
mpc8555cds mpc85xx: use LCRR_DBYP define instead of raw constant 2012-08-23 10:24:18 -05:00
mpc8560ads 8xxx: Change all 8*xx_DDR addresses to 8xxx 2012-11-27 17:45:17 -06:00
mpc8568mds powerpc/mpc85xx: sparse fixes 2012-11-04 11:00:36 -07:00
mpc8569mds 8xxx: Change all 8*xx_DDR addresses to 8xxx 2012-11-27 17:45:17 -06:00
mpc8572ds doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8610hpcd doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mpc8641hpcn doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mx6qarm2 i.MX: declare iomux_v3_cfg_t arrays as const 2012-10-16 12:35:11 +02:00
mx6qsabreauto i.MX: declare iomux_v3_cfg_t arrays as const 2012-10-16 12:35:11 +02:00
mx6qsabrelite i.MX6: mx6qsabrelite: Add splash screen support 2012-10-16 12:35:12 +02:00
mx6qsabresd i.MX: declare iomux_v3_cfg_t arrays as const 2012-10-16 12:35:11 +02:00
mx25pdk mx25pdk: Add Ethernet support 2012-10-26 16:28:08 +02:00
mx28evk mx28evk: Remove fecmxc_mii_postcall() 2012-09-24 10:45:41 +02:00
mx31ads Merge git://git.denx.de/u-boot 2012-11-10 08:05:54 +01:00
mx31pdk pmic: Extend PMIC framework to support multiple instances of PMIC devices 2012-11-14 11:21:09 +01:00
mx35pdk Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
mx51evk Merge branch 'master' of git://git.denx.de/u-boot-video 2012-11-19 09:28:04 -07:00
mx53ard mxc: Fix SDHC multi-instance clock 2012-10-16 12:35:10 +02:00
mx53evk pmic: Extend PMIC framework to support multiple instances of PMIC devices 2012-11-14 11:21:09 +01:00
mx53loco Merge branch 'master' of git://git.denx.de/u-boot-video 2012-11-19 09:28:04 -07:00
mx53smd mxc: Fix SDHC multi-instance clock 2012-10-16 12:35:10 +02:00
p1_p2_rdb doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
p1_p2_rdb_pc 8xxx: Change all 8*xx_DDR addresses to 8xxx 2012-11-27 17:45:17 -06:00
p1010rdb p1010rdb: fix ddr values for p1014rdb (setting bus width to 16bit) 2012-08-23 10:24:16 -05:00
p1022ds powerpc/p1022ds: fix DIU/LBC switching with NAND enabled 2012-08-08 17:13:37 -05:00
p1023rds 8xxx: Change all 8*xx_DDR addresses to 8xxx 2012-11-27 17:45:17 -06:00
p2020come powerpc/85xx: Add USB device-tree fixup for various platforms 2012-07-06 17:03:25 -05:00
p2020ds 8xxx: Change all 8*xx_DDR addresses to 8xxx 2012-11-27 17:45:17 -06:00
p2041rdb powerpc/p2041: configure the CPLD lane_mux according to RCW 2012-08-08 17:13:39 -05:00
t4qds powerpc/t4qds: Add T4QDS board 2012-10-22 15:52:46 -05:00