copyright: Update

Upstream removed the "You should have received a copy ..." paragraph in
commit e083880.

1 files changed, 72 insertions, 29 deletions

diff --git a/copyright b/copyright
index a1a30b9..721e059 100644
--- a/copyright
+++ b/copyright
@@ -1,13 +1,17 @@
 Upstream Source
 ===============
 
-82802ab.c amd_imc.c atahpt.c atavia.c cli_classic.c cli_common.c cli_output.c
-dmi.c drkaiser.c en29lv640b.c flashchips.c flashchips.h flash.h flashrom.c
-gfxnvidia.c helpers.c hwaccess.c ich_descriptors.c ich_descriptors.h ichspi.c
-internal.c jedec.c nic3com.c nicnatsemi.c nicrealtek.c pcidev.c print.c
-print_wiki.c programmer.c programmer.h satasii.c sb600spi.c serial.c serprog.c
-sst28sf040.c sst49lfxxxc.c sst_fwhub.c stm50.c udelay.c w29ee011.c w39.c
-------------------------------------------------------------------------------
+82802ab.c, amd_imc.c, atahpt.c, atapromise.c, atavia.c, ch341a_spi.c,
+cli_classic.c, cli_common.c, cli_output.c, custom_baud.c, custom_baud.h,
+developerbox_spi.c, digilent_spi.c, dmi.c, drkaiser.c, edi.c, edi.h,
+en29lv640b.c, ene.h, flashchips.c, flashchips.h, flash.h, flashrom.c,
+gfxnvidia.c, helpers.c, hwaccess.c, ich_descriptors.c, ich_descriptors.h,
+ichspi.c, internal.c, jedec.c, jlink_spi.c, layout.h, libflashrom.c,
+libflashrom.h, nic3com.c, nicnatsemi.c, nicrealtek.c, ogp_spi.c, pcidev.c,
+print.c, print_wiki.c, programmer.c, programmer.h, satasii.c, sb600spi.c,
+serial.c, serprog.c, sst28sf040.c, sst49lfxxxc.c, sst_fwhub.c, stm50.c,
+udelay.c, usbdev.c, w29ee011.c, w39.c
+--------------------------------------------------------------------------
 
 This file is part of the flashrom project.
 
@@ -30,13 +34,21 @@ Copyright (C) 2009, 2010 Uwe Hermann <uwe@hermann-uwe.de>
 Copyright (C) 2009 Sean Nelson <audiohacked@gmail.com>
 Copyright (C) 2009,2010 Michael Karcher
 Copyright (C) 2009 Joerg Fischer <turboj@gmx.de>
-Copyright (C) 2009, 2011 Urja Rannikko <urjaman@gmail.com>
+Copyright (C) 2009, 2011, 2015, 2017 Urja Rannikko <urjaman@gmail.com>
 Copyright (C) 2009 Kontron Modular Computers
+Copyright (C) 2009, 2012, 2013 Rudolf Marek <r.marek@assembler.cz>
 Copyright (c) 2010  Matthias Wenzel <bios at mazzoo dot de>
 Copyright (C) 2010 Andrew Morgan <ziltro@ziltro.com>
-Copyright (C) 2011-2014 Stefan Tauner
+Copyright (C) 2011-2016 Stefan Tauner
 Copyright (C) 2011 Jonathan Kollasch <jakllsch@kollasch.net>
-Copyright (C) 2009, 2012, 2013 Rudolf Marek <r.marek@assembler.cz>
+Copyright (C) 2011 asbokid <ballymunboy@gmail.com>
+Copyright (C) 2012, 2016 secunet Security Networks AG
+Copyright (C) 2014 Pluto Yang <yangyj.ee@gmail.com>
+Copyright (C) 2015 Joseph C. Lehner <joseph.c.lehner@gmail.com>
+Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
+Copyright (C) 2016 Marc Schink <flashrom-dev@marcschink.de>
+Copyright (C) 2018 Linaro Limited
+Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk>
 
 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
@@ -48,36 +60,31 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
 On this system, a copy of the GNU General Public License may be found at
 <file:///usr/share/common-licenses/GPL-2>.
 
-at45db.c bitbang_spi.c board_enable.c buspirate_spi.c cbtable.c chipdrivers.h
-chipset_enable.c coreboot_tables.h dediprog.c dummyflasher.c ft2232_spi.c
-hwaccess.h it8212.c it85spi.c it87spi.c layout.c linux_spi.c mcp6x_spi.c
-mstarddc_spi.c nicintel.c nicintel_eeprom.c nicintel_spi.c ogp_spi.c opaque.c
-os.h physmap.c platform.h pony_spi.c processor_enable.c rayer_spi.c satamv.c
-sfdp.c spi25.c spi25_statusreg.c spi.c spi.h usbblaster_spi.c wbsio_spi.c
------------------------------------------------------------------------------
+at45db.c, bitbang_spi.c, board_enable.c, buspirate_spi.c, cbtable.c,
+chipdrivers.h, chipset_enable.c, coreboot_tables.h, dediprog.c, dummyflasher.c,
+ft2232_spi.c, hwaccess.h, it8212.c, it85spi.c, it87spi.c, layout.c, linux_mtd.c,
+linux_spi.c, mcp6x_spi.c, mstarddc_spi.c, nicintel.c, nicintel_eeprom.c,
+nicintel_spi.c, ogp_spi.c, opaque.c, os.h, physmap.c, pickit2_spi.c, platform.h,
+pony_spi.c, processor_enable.c, rayer_spi.c, satamv.c, sfdp.c, spi25.c,
+spi25_statusreg.c, spi.c, spi.h, usbblaster_spi.c, wbsio_spi.c
+--------------------------------------------------------------------------------
 
 This file is part of the flashrom project.
 
 Copyright (C) 2000 Silicon Integrated System Corporation
 Copyright (C) 2002 Steven James <pyro@linuxlabs.com>
 Copyright (C) 2002 Linux Networx
-(Written by Eric Biederman <ebiederman@lnxi.com> for Linux Networx)
 Copyright (C) 2005-2009 coresystems GmbH
-(Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH)
 Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
 Copyright (C) 2007-2009 Luc Verhaegen <libv@skynet.be>
 Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Carl-Daniel Hailfinger
+Copyright (C) 2008, 2009 Peter Stuge <peter@stuge.se>
 Copyright (C) 2008 Ronald Hoogenboom <ronald@zonnet.nl>
 Copyright (C) 2009 Kontron Modular Computers GmbH
 Copyright (C) 2009 Paul Fox <pgf@laptop.org>
-Copyright (C) 2008, 2009 Peter Stuge <peter@stuge.se>
 Copyright (C) 2010 Google Inc.
 Copyright (C) 2010 Idwer Vollering
 Copyright (C) 2010 Mark Marshall
@@ -92,6 +99,9 @@ Copyright (C) 2013 Ricardo Ribalda - Qtechnology A/S
 Copyright (C) 2014 Alexandre Boeglin <alex@boeglin.org>
 Copyright (C) 2014 Justin Chevrier
 Copyright (C) 2015 Simon Glass
+Copyright (C) 2017 secunet Security Networks AG
+Copyright 2015 Google Inc.
+Copyright 2018-present Facebook, Inc.
 
 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
@@ -102,18 +112,51 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
 On this system, a copy of the GNU General Public License may be found at
 <file:///usr/share/common-licenses/GPL-2>.
 
+fmap.c, fmap.h
+--------------
+
+Copyright 2015, Google Inc.
+Copyright 2018-present, Facebook Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Alternatively, this software may be distributed under the terms of the
+GNU General Public License ("GPL") version 2 as published by the Free
+Software Foundation.
+
 
 Distribution Packaging
 ======================
 
-Copyright (C) 2015  Patrick "P. J." McDermott
+Copyright (C) 2015  Patrick McDermott
 
 These files may be reproduced, distributed, modified, and otherwise dealt in
 under the terms of the Expat License.