Changes in Makefile

710f1d3d5f44731665a0d801d166c0f98c1de38e - drivers: convert makefiles to Kbuild style

Thu, 17 Oct 2013 08:34:57 +0000

drivers: convert makefiles to Kbuild styleSigned-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

4fa7613c50069b6821ace02b11a24b46dcbbec5e - Merge branch 'master' of git://git.denx.de/u-boot-arm

Mon, 14 Oct 2013 15:20:32 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

5a9120439416a9101dec7c7dc65bb75a5ff09c4e - Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

Fri, 11 Oct 2013 12:47:25 +0000

Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

a88aab6b24f6bd20a7720797b0870529309feacc - power:battery: add battery support for Trats2 board

Fri, 20 Sep 2013 13:01:25 +0000

power:battery: add battery support for Trats2 boardSigned-off-by: Piotr Wilczek Signed-off-by: Kyungmin Park Signed-off-by: Minkyu Kang List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

326ea986ac150acdc7656d57fca647db80b50158 - Merge git://git.denx.de/u-boot-arm

Wed, 31 Jul 2013 09:30:38 +0000

Merge git://git.denx.de/u-boot-armConflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.hSigned-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

8b485ba12b0defa0c4ed3559789250238f8331a8 - Merge branch 'u-boot/master' into u-boot-arm/master

Thu, 25 Jul 2013 15:57:46 +0000

Merge branch 'u-boot/master' into u-boot-arm/master List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

1a4596601fd395f3afb8f82f3f840c5e00bdd57a - Add GPL-2.0+ SPDX-License-Identifier to source files

Mon, 08 Jul 2013 07:37:19 +0000

Add GPL-2.0+ SPDX-License-Identifier to source filesSigned-off-by: Wolfgang Denk [trini: Fixup common/cmd_io.c]Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

96764df1b47ddebfb50fadf5af72530b07b5fc89 - Merge samsung, imx, tegra into u-boot-arm/master

Sat, 22 Dec 2012 10:59:14 +0000

Merge samsung, imx, tegra into u-boot-arm/masterThis commit merges branches from samsung, imx and tegrameant to fix merge issues between u-boot/master andu-boot-arm/master, as well as a few manual merge fixes. List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

a098cf41fdb2a6607c675f7fe4f3164617c9367e - Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

Wed, 19 Dec 2012 21:02:36 +0000

Merge remote-tracking branch 'u-boot/master' into u-boot-arm-mergedConflicts: README arch/arm/cpu/armv7/exynos/clock.c board/samsung/universal_c210/universal.c drivers/misc/Makefile drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/seaboard.h List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

2c601c7208713ba9b2158c57adcf515f4bdbc212 - Merge branch 'master' of git://git.denx.de/u-boot into resolve

Mon, 10 Dec 2012 04:44:41 +0000

Merge branch 'master' of git://git.denx.de/u-boot into resolveConflicts: README board/samsung/universal_c210/universal.c drivers/misc/Makefile drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/seaboard.h List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

05a860c228fe6c8f2e7aced8cc8ef88bc1038363 - Merge branch 'master' of git://git.denx.de/u-boot into master

Sat, 08 Dec 2012 11:02:45 +0000

Merge branch 'master' of git://git.denx.de/u-boot into masterConflicts: drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/woodburn_common.h board/woodburn/woodburn.cThese boards still use the old old PMIC framework, so theydo not merge properly after the power framework was merged intomainline.Fix all conflicts and update woodburn to use Power Framework.Signed-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

bb367b95f9204115bd6eac82e839b5590e6da4eb - Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

Mon, 19 Nov 2012 16:27:18 +0000

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile

eba423910c78ca822653dfebe113664ef352ce94 - pmic:battery: Support for Trats Battery at PMIC framework

Tue, 13 Nov 2012 03:22:01 +0000

pmic:battery: Support for Trats Battery at PMIC frameworkTrats battery is now treated in the same way as other power relateddevices. This approach allows for more unified handling of all devicesresponsible for power management.Signed-off-by: Lukasz Majewski Signed-off-by: Kyungmin Park Cc: Stefano Babic List of files: /rk3399_rockchip-uboot/drivers/power/battery/Makefile