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/sandbox/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/sandbox/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/sandbox/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/sandbox/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/sandbox/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/sandbox/Makefile

76b40ab41eff1f402ee52ba768b09daad293b9bb - Merge u-boot/master into u-boot-ti/master

Mon, 11 Mar 2013 16:02:40 +0000

Merge u-boot/master into u-boot-ti/masterIn master we had already taken a patch to fix the davinci GPIO code forCONFIG_SOC_DM646X and in u-boot-ti we have additional patches to supportDA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve theseconflicts manually and comment the #else/#endif lines for clarity.Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.cSigned-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/fs/sandbox/Makefile

92ccc96bf3cd6c6a3a9a56e03d5ceb4874735d22 - sandbox: Add host filesystem

Wed, 26 Dec 2012 09:53:35 +0000

sandbox: Add host filesystemThis allows reading of files from the host filesystem in sandbox.Signed-off-by: Simon Glass Reviewed-by: Tom Rini List of files: /rk3399_rockchip-uboot/fs/sandbox/Makefile