Changes in Makefile

f15ea6e1d67782a1626d4a4922b6c20e380085e5 - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Tue, 10 Dec 2013 13:31:56 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master'Conflicts: arch/arm/cpu/armv7/rmobile/Makefile doc/README.scrapyardNeeded manual fix: arch/arm/cpu/armv7/omap-common/Makefile board/compulab/cm_t335/u-boot.lds List of files: /rk3399_rockchip-uboot/fs/cbfs/Makefile

4678d742567e282d9e0f786441f59102e8d3553e - fs: descend into sub directories when it is necessary

Mon, 11 Nov 2013 05:36:10 +0000

fs: descend into sub directories when it is necessarySigned-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/fs/cbfs/Makefile

35c792754c0feb894781e1eee6ab6b6624beb309 - fs: convert makefiles to Kbuild style

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

fs: convert makefiles to Kbuild styleSigned-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/fs/cbfs/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/fs/cbfs/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/fs/cbfs/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/fs/cbfs/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/fs/cbfs/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/fs/cbfs/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/fs/cbfs/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/fs/cbfs/Makefile

25920757765e22bdebf8e6fb1f777e21a31c9c21 - cbfs: Remove mention of CREDITS files

Mon, 05 Nov 2012 12:16:24 +0000

cbfs: Remove mention of CREDITS filesAs requested by Wolfgang, remove references to CREDITS in the CBFSfiles.Signed-off-by: Simon Glass List of files: /rk3399_rockchip-uboot/fs/cbfs/Makefile

3e4d27b06d7484040355e22eec2cbce7335d6dab - Merge git://git.denx.de/u-boot

Sat, 10 Nov 2012 07:05:54 +0000

Merge git://git.denx.de/u-boot List of files: /rk3399_rockchip-uboot/fs/cbfs/Makefile

84cd93272e384bf26e8346f2153a0b46dfb7b434 - fs: Add a Coreboot Filesystem (CBFS) driver and commands

Fri, 12 Oct 2012 14:26:11 +0000

fs: Add a Coreboot Filesystem (CBFS) driver and commandsThis change adds CBFS support and some commands to use it to u-boot. Thesecommands are:cbfsinit - Initialize CBFS support and pull all metadata into RAM. The end ofthe ROM is an optional parameter which defaults to the standard 0xffffffff andcan be used to support multiple CBFSes in a system. The last one set up withcbfsinit is the one that will be used.cbfsinfo - Print information from the CBFS header.cbfsls - Print out the size, type, and name of all the files in the currentCBFS. Recognized types are translated into symbolic names.cbfsload - Load a file from CBFS into memory. Like the similar command for fatfilesystems, you can optionally provide a maximum size.Support for CBFS is compiled in when the CONFIG_CMD_CBFS option is specified.The CBFS driver can also be used programmatically from within u-boot.If u-boot needs something out of CBFS very early before the heap isconfigured, it won't be able to use the normal CBFS support which caches someinformation in memory it allocates from the heap. Thecbfs_file_find_uncached function searches a CBFS instance without touchingthe heap.Signed-off-by: Gabe Black Signed-off-by: Stefan Reinauer Signed-off-by: Simon Glass List of files: /rk3399_rockchip-uboot/fs/cbfs/Makefile