1.1 --- a/docs/COPYING.txt Tue May 29 22:26:18 2018 +0200
1.2 +++ b/docs/COPYING.txt Tue May 29 23:12:58 2018 +0200
1.3 @@ -1,8 +1,8 @@
1.4 Licence Agreement
1.5 -----------------
1.6
1.7 -All original work in this distribution is covered by the following
1.8 -copyright and licensing information:
1.9 +All original work in this distribution is covered by the following copyright
1.10 +and licensing information:
1.11
1.12 Copyright (C) 2015, 2016, 2017, 2018 Paul Boddie <paul@boddie.org.uk>
1.13
1.14 @@ -23,22 +23,15 @@
1.15
1.16
1.17
1.18 -Other code has been incorporated into this distribution and is
1.19 -covered by the following copyrights:
1.20 +Other code has been incorporated into this distribution and is covered by the
1.21 +following copyrights:
1.22
1.23 pkg/devices/lib/common/include:
1.24
1.25 (c) 2014 Alexander Warg <alexander.warg@kernkonzept.com>
1.26
1.27 -pkg/landfall-examples/qi_lb60_lcd:
1.28 -
1.29 - Copyright (C) 2001 Wolfgang Denk, DENX Software Engineering, wd@denx.de.
1.30 - Copyright (C) 2005-2007, Ingenic Semiconductor Inc.
1.31 - Copyright (C) 2009 Qi Hardware Inc.
1.32 - Copyright (C) Xiangfu Liu <xiangfu@sharism.cc>
1.33 -
1.34 -Note that due to the incorporation of code from L4Re, the following
1.35 -files are actually licensed under the GPL version 2 only:
1.36 +Note that due to the incorporation of code from L4Re, the following files are
1.37 +actually licensed under the GPL version 2 only:
1.38
1.39 pkg/devices/lib/common/include/hw_mmio_register_block.h
1.40 pkg/devices/lib/common/include/hw_register_block.h
1.41 @@ -50,13 +43,15 @@
1.42 pkg/devices/lib/gpio/src/jz4740.cc
1.43 pkg/devices/lib/gpio/src/jz4780.cc
1.44
1.45 -No clear copyright statements are provided in the L4Re distribution
1.46 -for such files.
1.47 +No clear copyright statements are provided in the L4Re distribution for such
1.48 +files.
1.49
1.50
1.51
1.52 -Font definitions and licence (see unifont.tff for bitmap data
1.53 -derived from GNU Unifont's unifont.hex file):
1.54 +Font definitions and licence when bitmap data has been generated by the
1.55 +appropriate tool (see unifont.tff for bitmap data derived from GNU Unifont's
1.56 +unifont.hex file) and is distributed with this software (which is not the case
1.57 +by default):
1.58
1.59 Copyright (C) 1998-2003 Roman Czyborra (http://czyborra.com/)
1.60