Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore
	Bender.yml

Author: Fabian Schuiki

.gitignore

@@ -1,4 +1,6 @@
 .*
 !.git*
-/Bender.lock
+!.editorconfig
+build
 /Bender.local
+/Bender.lock

Bender.yml

@@ -1,10 +1,12 @@
 package:
   name: axi_mem_if
+  authors: [ "Florian Zaruba <zarubaf@iis.ee.ethz.ch>"]
 
 dependencies:
-  axi_slice: { git: "git@iis-git.ee.ethz.ch:sasa/axi_slice.git", version: 1.1.2 }
+  axi: { git: "git@iis-git.ee.ethz.ch:sasa/axi.git", rev: master }
 
 sources:
-  - axi_mem_if.sv
-  - axi_mem_if_wrap.sv
-  - axi_mem_if_var_latency.sv
+  - src/axi2mem.sv
+  - src/deprecated/axi_mem_if.sv
+  - src/deprecated/axi_mem_if_var_latency.sv
+  - src/deprecated/axi_mem_if_wrap.sv

CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.1.0]
+
+- Commit initial version

axi_mem_if.core

@@ -0,0 +1,16 @@
+CAPI=2:
+name : pulp-platform.org::axi_mem_if:0
+
+filesets:
+  rtl:
+    files:
+      - axi2mem.sv
+      - axi_mem_if.sv
+      - axi_mem_if_var_latency.sv
+      - axi_mem_if_wrap.sv
+    file_type : systemVerilogSource
+
+targets:
+  default:
+    filesets : [rtl]
+      

axi2mem.sv src/axi2mem.svaxi2mem.sv renamed to src/axi2mem.sv

@@ -1,10 +1,10 @@
 // Copyright 2018 ETH Zurich and University of Bologna.
 // Copyright and related rights are licensed under the Solderpad Hardware
-// License, Version 0.51 (the “License”); you may not use this file except in
+// License, Version 0.51 (the "License"); you may not use this file except in
 // compliance with the License.  You may obtain a copy of the License at
 // http://solderpad.org/licenses/SHL-0.51. Unless required by applicable law
 // or agreed to in writing, software, hardware and materials distributed under
-// this License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR
+// this 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.
 //

axi_mem_if.sv src/deprecated/axi_mem_if.svaxi_mem_if.sv renamed to src/deprecated/axi_mem_if.sv

@@ -1,22 +1,17 @@
+// Copyright 2014-2018 ETH Zurich and University of Bologna.
+// Copyright and related rights are licensed under the Solderpad Hardware
+// License, Version 0.51 (the “License”); you may not use this file except in
+// compliance with the License.  You may obtain a copy of the License at
+// http://solderpad.org/licenses/SHL-0.51. Unless required by applicable law
+// or agreed to in writing, software, hardware and materials distributed under
+// this 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.
+//
 // Author: Florian Zaruba, ETH Zurich
 // Date: 05.07.2017
 // Description: Wrap of AXI to MEM adapter
 //
-//
-// Copyright (C) 2017 ETH Zurich, University of Bologna
-// All rights reserved.
-//
-// This code is under development and not yet released to the public.
-// Until it is released, the code is under the copyright of ETH Zurich and
-// the University of Bologna, and may contain confidential and/or unpublished
-// work. Any reuse/redistribution is strictly forbidden without written
-// permission from ETH Zurich.
-//
-// Bug fixes and contributions will eventually be released under the
-// SolderPad open hardware license in the context of the PULP platform
-// (http://www.pulp-platform.org), under the copyright of ETH Zurich and the
-// University of Bologna.
-//
 
 module axi_mem_if_wrap #(
     parameter AXI4_ADDRESS_WIDTH = 64,

axi_mem_if_var_latency.sv src/deprecated/axi_mem_if_var_latency.svaxi_mem_if_var_latency.sv renamed to src/deprecated/axi_mem_if_var_latency.sv

@@ -1,6 +1,6 @@
 axi_mem_if:
   files: [
-    axi_mem_if.sv,
-    axi_mem_if_wrap.sv,
-    axi_mem_if_var_latency.sv,
+    src/deprecated/axi_mem_if.sv,
+    src/deprecated/axi_mem_if_wrap.sv,
+    src/deprecated/axi_mem_if_var_latency.sv,
   ]