From 5ee948014283b2f07b2a1b790a1e73b772f0f984 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 17 May 2017 15:18:29 +0200 Subject: [PATCH] Fix VHDL files license header VHDL uses '--' for comments rather than '//'. Also remove left over old license headers. Signed-off-by: Lars-Peter Clausen --- library/axi_spdif_tx/axi_spdif_tx.vhd | 76 +++++--------------- library/common/axi_ctrlif.vhd | 72 +++++-------------- library/common/axi_streaming_dma_rx_fifo.vhd | 44 ++++++------ library/common/axi_streaming_dma_tx_fifo.vhd | 44 ++++++------ library/common/dma_fifo.vhd | 44 ++++++------ library/common/pl330_dma_fifo.vhd | 44 ++++++------ library/util_i2c_mixer/util_i2c_mixer.vhd | 41 +++++------ 7 files changed, 141 insertions(+), 224 deletions(-) diff --git a/library/axi_spdif_tx/axi_spdif_tx.vhd b/library/axi_spdif_tx/axi_spdif_tx.vhd index 2950c38b4..a17054f4f 100644 --- a/library/axi_spdif_tx/axi_spdif_tx.vhd +++ b/library/axi_spdif_tx/axi_spdif_tx.vhd @@ -1,65 +1,25 @@ -// *************************************************************************** -// *************************************************************************** -// Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. -// -// Each core or library found in this collection may have its own licensing terms. -// The user should keep this in in mind while exploring these cores. -// -// Redistribution and use in source and binary forms, -// with or without modification of this file, are permitted under the terms of either -// (at the option of the user): -// -// 1. The GNU General Public License version 2 as published by the -// Free Software Foundation, which can be found in the top level directory, or at: -// https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html -// -// OR -// -// 2. An ADI specific BSD license as noted in the top level directory, or on-line at: -// https://github.com/analogdevicesinc/hdl/blob/dev/LICENSE -// -// *************************************************************************** -// *************************************************************************** - ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- --- Copyright 2011-2013(c) Analog Devices, Inc. +-- *************************************************************************** +-- *************************************************************************** +-- Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. -- --- All rights reserved. +-- Each core or library found in this collection may have its own licensing terms. +-- The user should keep this in in mind while exploring these cores. -- --- 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 Analog Devices, Inc. nor the names of its --- contributors may be used to endorse or promote products derived --- from this software without specific prior written permission. --- - The use of this software may or may not infringe the patent rights --- of one or more patent holders. This license does not release you --- from the requirement that you obtain separate licenses from these --- patent holders to use this software. --- - Use of the software either in source or binary form, must be run --- on or directly connected to an Analog Devices Inc. component. +-- Redistribution and use in source and binary forms, +-- with or without modification of this file, are permitted under the terms of either +-- (at the option of the user): -- --- THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, --- INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A --- PARTICULAR PURPOSE ARE DISCLAIMED. +-- 1. The GNU General Public License version 2 as published by the +-- Free Software Foundation, which can be found in the top level directory, or at: +-- https:--www.gnu.org/licenses/old-licenses/gpl-2.0.en.html -- --- IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, --- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, INTELLECTUAL PROPERTY --- RIGHTS, 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. ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- --- andrei.cozma@analog.com (c) Analog Devices Inc. ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- +-- OR +-- +-- 2. An ADI specific BSD license as noted in the top level directory, or on-line at: +-- https:--github.com/analogdevicesinc/hdl/blob/dev/LICENSE +-- +-- *************************************************************************** +-- *************************************************************************** library ieee; use ieee.std_logic_1164.all; diff --git a/library/common/axi_ctrlif.vhd b/library/common/axi_ctrlif.vhd index 6fb8e2426..2ae87eb87 100644 --- a/library/common/axi_ctrlif.vhd +++ b/library/common/axi_ctrlif.vhd @@ -1,61 +1,23 @@ -// *************************************************************************** -// *************************************************************************** -// Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. -// -// Each core or library found in this collection may have its own licensing terms. -// The user should keep this in in mind while exploring these cores. -// -// Redistribution and use in source and binary forms, -// with or without modification of this file, are permitted under the terms of either -// (at the option of the user): -// -// 1. The GNU General Public License version 2 as published by the -// Free Software Foundation, which can be found in the top level directory, or at: -// https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html -// -// OR -// -// 2. An ADI specific BSD license as noted in the top level directory, or on-line at: -// https://github.com/analogdevicesinc/hdl/blob/dev/LICENSE -// -// *************************************************************************** -// *************************************************************************** - -- *************************************************************************** -- *************************************************************************** --- Copyright 2013(c) Analog Devices, Inc. --- Author: Lars-Peter Clausen --- --- 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 Analog Devices, Inc. nor the names of its --- contributors may be used to endorse or promote products derived --- from this software without specific prior written permission. --- - The use of this software may or may not infringe the patent rights --- of one or more patent holders. This license does not release you --- from the requirement that you obtain separate licenses from these --- patent holders to use this software. --- - Use of the software either in source or binary form, must be run --- on or directly connected to an Analog Devices Inc. component. --- --- THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, --- INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A --- PARTICULAR PURPOSE ARE DISCLAIMED. +-- Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. +-- +-- Each core or library found in this collection may have its own licensing terms. +-- The user should keep this in in mind while exploring these cores. +-- +-- Redistribution and use in source and binary forms, +-- with or without modification of this file, are permitted under the terms of either +-- (at the option of the user): +-- +-- 1. The GNU General Public License version 2 as published by the +-- Free Software Foundation, which can be found in the top level directory, or at: +-- https:--www.gnu.org/licenses/old-licenses/gpl-2.0.en.html +-- +-- OR +-- +-- 2. An ADI specific BSD license as noted in the top level directory, or on-line at: +-- https:--github.com/analogdevicesinc/hdl/blob/dev/LICENSE -- --- IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, --- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, INTELLECTUAL PROPERTY --- RIGHTS, 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. -- *************************************************************************** -- *************************************************************************** diff --git a/library/common/axi_streaming_dma_rx_fifo.vhd b/library/common/axi_streaming_dma_rx_fifo.vhd index faf0c237d..d83db4b37 100644 --- a/library/common/axi_streaming_dma_rx_fifo.vhd +++ b/library/common/axi_streaming_dma_rx_fifo.vhd @@ -1,25 +1,25 @@ -// *************************************************************************** -// *************************************************************************** -// Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. -// -// Each core or library found in this collection may have its own licensing terms. -// The user should keep this in in mind while exploring these cores. -// -// Redistribution and use in source and binary forms, -// with or without modification of this file, are permitted under the terms of either -// (at the option of the user): -// -// 1. The GNU General Public License version 2 as published by the -// Free Software Foundation, which can be found in the top level directory, or at: -// https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html -// -// OR -// -// 2. An ADI specific BSD license as noted in the top level directory, or on-line at: -// https://github.com/analogdevicesinc/hdl/blob/dev/LICENSE -// -// *************************************************************************** -// *************************************************************************** +-- *************************************************************************** +-- *************************************************************************** +-- Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. +-- +-- Each core or library found in this collection may have its own licensing terms. +-- The user should keep this in in mind while exploring these cores. +-- +-- Redistribution and use in source and binary forms, +-- with or without modification of this file, are permitted under the terms of either +-- (at the option of the user): +-- +-- 1. The GNU General Public License version 2 as published by the +-- Free Software Foundation, which can be found in the top level directory, or at: +-- https:--www.gnu.org/licenses/old-licenses/gpl-2.0.en.html +-- +-- OR +-- +-- 2. An ADI specific BSD license as noted in the top level directory, or on-line at: +-- https:--github.com/analogdevicesinc/hdl/blob/dev/LICENSE +-- +-- *************************************************************************** +-- *************************************************************************** library ieee; use ieee.std_logic_1164.all; diff --git a/library/common/axi_streaming_dma_tx_fifo.vhd b/library/common/axi_streaming_dma_tx_fifo.vhd index 4db2e2409..a1685d6d2 100644 --- a/library/common/axi_streaming_dma_tx_fifo.vhd +++ b/library/common/axi_streaming_dma_tx_fifo.vhd @@ -1,25 +1,25 @@ -// *************************************************************************** -// *************************************************************************** -// Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. -// -// Each core or library found in this collection may have its own licensing terms. -// The user should keep this in in mind while exploring these cores. -// -// Redistribution and use in source and binary forms, -// with or without modification of this file, are permitted under the terms of either -// (at the option of the user): -// -// 1. The GNU General Public License version 2 as published by the -// Free Software Foundation, which can be found in the top level directory, or at: -// https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html -// -// OR -// -// 2. An ADI specific BSD license as noted in the top level directory, or on-line at: -// https://github.com/analogdevicesinc/hdl/blob/dev/LICENSE -// -// *************************************************************************** -// *************************************************************************** +-- *************************************************************************** +-- *************************************************************************** +-- Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. +-- +-- Each core or library found in this collection may have its own licensing terms. +-- The user should keep this in in mind while exploring these cores. +-- +-- Redistribution and use in source and binary forms, +-- with or without modification of this file, are permitted under the terms of either +-- (at the option of the user): +-- +-- 1. The GNU General Public License version 2 as published by the +-- Free Software Foundation, which can be found in the top level directory, or at: +-- https:--www.gnu.org/licenses/old-licenses/gpl-2.0.en.html +-- +-- OR +-- +-- 2. An ADI specific BSD license as noted in the top level directory, or on-line at: +-- https:--github.com/analogdevicesinc/hdl/blob/dev/LICENSE +-- +-- *************************************************************************** +-- *************************************************************************** library ieee; use ieee.std_logic_1164.all; diff --git a/library/common/dma_fifo.vhd b/library/common/dma_fifo.vhd index 23d4b9c64..5a8f1e138 100644 --- a/library/common/dma_fifo.vhd +++ b/library/common/dma_fifo.vhd @@ -1,25 +1,25 @@ -// *************************************************************************** -// *************************************************************************** -// Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. -// -// Each core or library found in this collection may have its own licensing terms. -// The user should keep this in in mind while exploring these cores. -// -// Redistribution and use in source and binary forms, -// with or without modification of this file, are permitted under the terms of either -// (at the option of the user): -// -// 1. The GNU General Public License version 2 as published by the -// Free Software Foundation, which can be found in the top level directory, or at: -// https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html -// -// OR -// -// 2. An ADI specific BSD license as noted in the top level directory, or on-line at: -// https://github.com/analogdevicesinc/hdl/blob/dev/LICENSE -// -// *************************************************************************** -// *************************************************************************** +-- *************************************************************************** +-- *************************************************************************** +-- Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. +-- +-- Each core or library found in this collection may have its own licensing terms. +-- The user should keep this in in mind while exploring these cores. +-- +-- Redistribution and use in source and binary forms, +-- with or without modification of this file, are permitted under the terms of either +-- (at the option of the user): +-- +-- 1. The GNU General Public License version 2 as published by the +-- Free Software Foundation, which can be found in the top level directory, or at: +-- https:--www.gnu.org/licenses/old-licenses/gpl-2.0.en.html +-- +-- OR +-- +-- 2. An ADI specific BSD license as noted in the top level directory, or on-line at: +-- https:--github.com/analogdevicesinc/hdl/blob/dev/LICENSE +-- +-- *************************************************************************** +-- *************************************************************************** library ieee; use ieee.std_logic_1164.all; diff --git a/library/common/pl330_dma_fifo.vhd b/library/common/pl330_dma_fifo.vhd index f2e101f05..f8d2e008b 100644 --- a/library/common/pl330_dma_fifo.vhd +++ b/library/common/pl330_dma_fifo.vhd @@ -1,25 +1,25 @@ -// *************************************************************************** -// *************************************************************************** -// Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. -// -// Each core or library found in this collection may have its own licensing terms. -// The user should keep this in in mind while exploring these cores. -// -// Redistribution and use in source and binary forms, -// with or without modification of this file, are permitted under the terms of either -// (at the option of the user): -// -// 1. The GNU General Public License version 2 as published by the -// Free Software Foundation, which can be found in the top level directory, or at: -// https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html -// -// OR -// -// 2. An ADI specific BSD license as noted in the top level directory, or on-line at: -// https://github.com/analogdevicesinc/hdl/blob/dev/LICENSE -// -// *************************************************************************** -// *************************************************************************** +-- *************************************************************************** +-- *************************************************************************** +-- Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. +-- +-- Each core or library found in this collection may have its own licensing terms. +-- The user should keep this in in mind while exploring these cores. +-- +-- Redistribution and use in source and binary forms, +-- with or without modification of this file, are permitted under the terms of either +-- (at the option of the user): +-- +-- 1. The GNU General Public License version 2 as published by the +-- Free Software Foundation, which can be found in the top level directory, or at: +-- https:--www.gnu.org/licenses/old-licenses/gpl-2.0.en.html +-- +-- OR +-- +-- 2. An ADI specific BSD license as noted in the top level directory, or on-line at: +-- https:--github.com/analogdevicesinc/hdl/blob/dev/LICENSE +-- +-- *************************************************************************** +-- *************************************************************************** library ieee; use ieee.std_logic_1164.all; diff --git a/library/util_i2c_mixer/util_i2c_mixer.vhd b/library/util_i2c_mixer/util_i2c_mixer.vhd index 36b067583..c43421ab0 100644 --- a/library/util_i2c_mixer/util_i2c_mixer.vhd +++ b/library/util_i2c_mixer/util_i2c_mixer.vhd @@ -1,28 +1,23 @@ -// *************************************************************************** -// *************************************************************************** -// Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. -// -// Each core or library found in this collection may have its own licensing terms. -// The user should keep this in in mind while exploring these cores. -// -// Redistribution and use in source and binary forms, -// with or without modification of this file, are permitted under the terms of either -// (at the option of the user): -// -// 1. The GNU General Public License version 2 as published by the -// Free Software Foundation, which can be found in the top level directory, or at: -// https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html -// -// OR -// -// 2. An ADI specific BSD license as noted in the top level directory, or on-line at: -// https://github.com/analogdevicesinc/hdl/blob/dev/LICENSE -// -// *************************************************************************** -// *************************************************************************** - -- *************************************************************************** -- *************************************************************************** +-- Copyright 2014 - 2017 (c) Analog Devices, Inc. All rights reserved. +-- +-- Each core or library found in this collection may have its own licensing terms. +-- The user should keep this in in mind while exploring these cores. +-- +-- Redistribution and use in source and binary forms, +-- with or without modification of this file, are permitted under the terms of either +-- (at the option of the user): +-- +-- 1. The GNU General Public License version 2 as published by the +-- Free Software Foundation, which can be found in the top level directory, or at: +-- https:--www.gnu.org/licenses/old-licenses/gpl-2.0.en.html +-- +-- OR +-- +-- 2. An ADI specific BSD license as noted in the top level directory, or on-line at: +-- https:--github.com/analogdevicesinc/hdl/blob/dev/LICENSE +-- -- *************************************************************************** -- ***************************************************************************