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

4d3c95f5ea7c737a21cd6b9c59435ee693b3f127 - zfs: Add ZFS filesystem support

Thu, 19 Jul 2012 20:48:25 +0000

zfs: Add ZFS filesystem supportU-Boot port is based on sources forked from GRUB-0.97 by Sun in 2004,which can be found here:http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.hReleased by Sun for GRUB under the license: * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version.GRUB official releases include ZFS in version:ftp://alpha.gnu.org/gnu/grub/grub-1.99~rc1.tar.gzAnd patched against GRUB Bazaar repository for ashift fixes (4KB HDDs)more conveniently found at github:https://github.com/pendor/grub-zfs/commit/e7b6ef3ac3b9685ac4c394c897b1d4221b7381f1Signed-off-by: Jorgen Lundman List of files: /rk3399_rockchip-uboot/fs/zfs/Makefile