From 0f1b84166b44a9b7a61c9998109fa09c9380b018 Mon Sep 17 00:00:00 2001 From: Cesar Fuguet Date: Thu, 12 Oct 2023 11:44:44 +0200 Subject: [PATCH] hpdcache: use short version of the SolderPad Licence header Signed-off-by: Cesar Fuguet --- .../cva6_hpdcache_if_adapter.sv | 36 +++++----------- .../cva6_hpdcache_params_pkg.sv | 37 ++++++----------- .../cva6_hpdcache_subsystem.sv | 41 +++++++------------ .../cva6_hpdcache_subsystem_axi_arbiter.sv | 41 +++++++------------ .../cv64a6_imafdc_sv39_hpdcache_config_pkg.sv | 11 +++-- 5 files changed, 59 insertions(+), 107 deletions(-) diff --git a/core/cache_subsystem/cva6_hpdcache_if_adapter.sv b/core/cache_subsystem/cva6_hpdcache_if_adapter.sv index ac7661721c7..bca1b08792a 100644 --- a/core/cache_subsystem/cva6_hpdcache_if_adapter.sv +++ b/core/cache_subsystem/cva6_hpdcache_if_adapter.sv @@ -1,28 +1,14 @@ -/* - * Copyright 2023 CEA* - * *Commissariat a l'Energie Atomique et aux Energies Alternatives (CEA) - * - * SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 - * - * Licensed under the Solderpad Hardware License v 2.1 (the “License”); you - * may not use this file except in compliance with the License, or, at your - * option, the Apache License version 2.0. You may obtain a copy of the - * License at - * - * https://solderpad.org/licenses/SHL-2.1/ - * - * Unless required by applicable law or agreed to in writing, any work - * distributed under the License is distributed on an “AS IS” BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -/* - * Authors : Cesar Fuguet - * Creation Date : February, 2023 - * Description : Interface adapter for the CVA6 core - * History : - */ +// Copyright 2023 Commissariat a l'Energie Atomique et aux Energies +// Alternatives (CEA) +// +// Licensed under the Solderpad Hardware License, Version 2.1 (the “License”); +// you may not use this file except in compliance with the License. +// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 +// You may obtain a copy of the License at https://solderpad.org/licenses/ +// +// Authors: Cesar Fuguet +// Date: February, 2023 +// Description: Interface adapter for the CVA6 core module cva6_hpdcache_if_adapter import hpdcache_pkg::*; diff --git a/core/cache_subsystem/cva6_hpdcache_params_pkg.sv b/core/cache_subsystem/cva6_hpdcache_params_pkg.sv index 54ad8a12a07..f236e13c668 100644 --- a/core/cache_subsystem/cva6_hpdcache_params_pkg.sv +++ b/core/cache_subsystem/cva6_hpdcache_params_pkg.sv @@ -1,28 +1,15 @@ -/* - * Copyright 2023 CEA* - * *Commissariat a l'Energie Atomique et aux Energies Alternatives (CEA) - * - * SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 - * - * Licensed under the Solderpad Hardware License v 2.1 (the “License”); you - * may not use this file except in compliance with the License, or, at your - * option, the Apache License version 2.0. You may obtain a copy of the - * License at - * - * https://solderpad.org/licenses/SHL-2.1/ - * - * Unless required by applicable law or agreed to in writing, any work - * distributed under the License is distributed on an “AS IS” BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -/* - * Authors : Cesar Fuguet - * Creation Date : April, 2023 - * Description : Package with parameters for the HPDcache in a CVA6 platform - * History : - */ +// Copyright 2023 Commissariat a l'Energie Atomique et aux Energies +// Alternatives (CEA) +// +// Licensed under the Solderpad Hardware License, Version 2.1 (the “License”); +// you may not use this file except in compliance with the License. +// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 +// You may obtain a copy of the License at https://solderpad.org/licenses/ +// +// Authors: Cesar Fuguet +// Date: February, 2023 +// Description: Package with parameters for the HPDcache in a CVA6 platform + package hpdcache_params_pkg; // Imports from the CVA6 configuration package // {{{ diff --git a/core/cache_subsystem/cva6_hpdcache_subsystem.sv b/core/cache_subsystem/cva6_hpdcache_subsystem.sv index cf74d43a4e4..7ef6b8191ce 100644 --- a/core/cache_subsystem/cva6_hpdcache_subsystem.sv +++ b/core/cache_subsystem/cva6_hpdcache_subsystem.sv @@ -1,30 +1,17 @@ -/* - * Copyright 2023 CEA* - * *Commissariat a l'Energie Atomique et aux Energies Alternatives (CEA) - * - * SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 - * - * Licensed under the Solderpad Hardware License v 2.1 (the “License”); you - * may not use this file except in compliance with the License, or, at your - * option, the Apache License version 2.0. You may obtain a copy of the - * License at - * - * https://solderpad.org/licenses/SHL-2.1/ - * - * Unless required by applicable law or agreed to in writing, any work - * distributed under the License is distributed on an “AS IS” BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -/* - * Authors : Cesar Fuguet - * Creation Date : February, 2023 - * Description : CVA6 cache subsystem integrating standard CVA6's - * instruction cache and the Core-V High-Performance L1 -* data cache (CV-HPDcache). - * History : - */ +// Copyright 2023 Commissariat a l'Energie Atomique et aux Energies +// Alternatives (CEA) +// +// Licensed under the Solderpad Hardware License, Version 2.1 (the “License”); +// you may not use this file except in compliance with the License. +// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 +// You may obtain a copy of the License at https://solderpad.org/licenses/ +// +// Authors: Cesar Fuguet +// Date: February, 2023 +// Description: CVA6 cache subsystem integrating standard CVA6's +// instruction cache and the Core-V High-Performance L1 +// data cache (CV-HPDcache). + module cva6_hpdcache_subsystem // Parameters // {{{ diff --git a/core/cache_subsystem/cva6_hpdcache_subsystem_axi_arbiter.sv b/core/cache_subsystem/cva6_hpdcache_subsystem_axi_arbiter.sv index b984cc497dd..66dc9ea4969 100644 --- a/core/cache_subsystem/cva6_hpdcache_subsystem_axi_arbiter.sv +++ b/core/cache_subsystem/cva6_hpdcache_subsystem_axi_arbiter.sv @@ -1,30 +1,17 @@ -/* - * Copyright 2023 CEA* - * *Commissariat a l'Energie Atomique et aux Energies Alternatives (CEA) - * - * SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 - * - * Licensed under the Solderpad Hardware License v 2.1 (the “License”); you - * may not use this file except in compliance with the License, or, at your - * option, the Apache License version 2.0. You may obtain a copy of the - * License at - * - * https://solderpad.org/licenses/SHL-2.1/ - * - * Unless required by applicable law or agreed to in writing, any work - * distributed under the License is distributed on an “AS IS” BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -/* - * Authors : Cesar Fuguet - * Creation Date: February, 2023 - * Description : AXI arbiter for the CVA6 cache subsystem integrating standard - * CVA6's instruction cache and the Core-V High-Performance -* L1 Dcache (CV-HPDcache). - * History : - */ +// Copyright 2023 Commissariat a l'Energie Atomique et aux Energies +// Alternatives (CEA) +// +// Licensed under the Solderpad Hardware License, Version 2.1 (the “License”); +// you may not use this file except in compliance with the License. +// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 +// You may obtain a copy of the License at https://solderpad.org/licenses/ +// +// Authors: Cesar Fuguet +// Date: February, 2023 +// Description: AXI arbiter for the CVA6 cache subsystem integrating standard +// CVA6's instruction cache and the Core-V High-Performance +// L1 Dcache (CV-HPDcache). + module cva6_hpdcache_subsystem_axi_arbiter // Parameters // {{{ diff --git a/core/include/cv64a6_imafdc_sv39_hpdcache_config_pkg.sv b/core/include/cv64a6_imafdc_sv39_hpdcache_config_pkg.sv index 6ebbe184114..c2402ee101e 100644 --- a/core/include/cv64a6_imafdc_sv39_hpdcache_config_pkg.sv +++ b/core/include/cv64a6_imafdc_sv39_hpdcache_config_pkg.sv @@ -1,13 +1,18 @@ -// Copyright 2023 CEA* -// *Commissariat a l'Energie Atomique et aux Energies Alternatives (CEA) +// Copyright 2021 Thales DIS design services SAS // // Licensed under the Solderpad Hardware Licence, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // SPDX-License-Identifier: Apache-2.0 WITH SHL-2.0 // You may obtain a copy of the License at https://solderpad.org/licenses/ // +// Original Author: Jean-Roch COULON - Thales +// +// Copyright 2023 Commissariat a l'Energie Atomique et aux Energies +// Alternatives (CEA) +// // Author: Cesar Fuguet - CEA -// Creation Date: August, 2023 +// Date: August, 2023 +// Description: CVA6 configuration package using the HPDcache as cache subsystem package cva6_config_pkg;