| /rk3399_rockchip-uboot/arch/x86/dts/ |
| H A D | skeleton.dtsi | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/include/ |
| H A D | physmem.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/lib/ |
| H A D | physmem.c | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/drivers/usb/musb-new/ |
| H A D | musb_debug.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | omap2430.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | musb_host.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | musb_gadget.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/arch/x86/cpu/coreboot/ |
| H A D | car.S | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/arch/x86/include/asm/ |
| H A D | control_regs.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | bitops.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/include/power/ |
| H A D | max8997_muic.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | power_chrg.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | battery.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | fg_battery_cell_params.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | max17042_fg.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/drivers/power/pmic/ |
| H A D | muic_max8997.c | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | pmic_max8998.c | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/lib/lzma/ |
| H A D | LzmaDec.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | lzma.txt | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | Types.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | LzmaDec.c | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| H A D | history.txt | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/drivers/power/ |
| H A D | power_dialog.c | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/board/freescale/corenet_ds/ |
| H A D | p5040ds_ddr.c | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|
| /rk3399_rockchip-uboot/arch/powerpc/include/asm/ |
| H A D | spl.h | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 Sat Dec 08 11:02:45 UTC 2012 Stefano Babic <sbabic@denx.de> 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>
|