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/lib/zlib/Makefile

164922bd7c383a2c82739f8b080b2e0da801ec0d - lib: descend into sub directories only when it is necessary

Mon, 11 Nov 2013 05:35:52 +0000

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

0a1a1575587b1ec28196b8519c812d6d468a344a - lib: convert makefiles to Kbuild style

Thu, 17 Oct 2013 08:35:01 +0000

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

e89516f031dbf711b71e6ee4d131cdc8b9946fb0 - zlib: split up to match original source tree

Fri, 08 Apr 2011 12:23:30 +0000

zlib: split up to match original source treeWhile looking to upgrade to zlib-1.2.5, the current mondo merge ofmultiple files into a single was making things way more difficultthan it should have been. Hard to pick out what has been changedto port it to U-Boot, been removed as useless, and bug fixes addedafter the fact.So split the single file up into the original file names, and mergenon-essential changes back from the original tree (for some reason,style in code in a bunch of places was changed to U-Boot style eventhough this isn't "U-Boot" code).The original build style is retained -- we have a single zlib.c thatincludes all the other files, and that is the only file we compile.Signed-off-by: Mike Frysinger List of files: /rk3399_rockchip-uboot/lib/zlib/Makefile