From 53c4dd3d04a63406643aa17e89fa2640d7ade20c Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Mon, 1 Aug 2022 14:43:24 +0200 Subject: [PATCH 1/4] xc7: add license header to environment.yml and requirements.txt Signed-off-by: Unai Martinez-Corral --- xc7/environment.yml | 18 ++++++++++++++++++ xc7/requirements.txt | 16 ++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/xc7/environment.yml b/xc7/environment.yml index 7618e99..2e4434d 100644 --- a/xc7/environment.yml +++ b/xc7/environment.yml @@ -1,6 +1,24 @@ +# Copyright (C) 2020-2022 F4PGA Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. +# +# SPDX-License-Identifier: Apache-2.0 + name: xc7 + channels: - litex-hub + dependencies: - litex-hub::openfpgaloader==0.8.0_114_g057ce93=20220706_155948 - litex-hub::prjxray-tools=0.1_3015_gae546d6b=20220708_203356 diff --git a/xc7/requirements.txt b/xc7/requirements.txt index 0814d6f..f563dc8 100644 --- a/xc7/requirements.txt +++ b/xc7/requirements.txt @@ -1,3 +1,19 @@ +# Copyright (C) 2020-2022 F4PGA Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. +# +# SPDX-License-Identifier: Apache-2.0 + intervaltree junit-xml numpy From 757ffd62b846156f10276e176171ad9fe84043d0 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Mon, 1 Aug 2022 14:43:36 +0200 Subject: [PATCH 2/4] eos-s3: add license header to environment.yml and requirements.txt Signed-off-by: Unai Martinez-Corral --- eos-s3/environment.yml | 18 ++++++++++++++++++ eos-s3/requirements.txt | 16 ++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/eos-s3/environment.yml b/eos-s3/environment.yml index ba1a59f..8eab9d6 100644 --- a/eos-s3/environment.yml +++ b/eos-s3/environment.yml @@ -1,6 +1,24 @@ +# Copyright (C) 2020-2022 F4PGA Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. +# +# SPDX-License-Identifier: Apache-2.0 + name: eos-s3 + channels: - litex-hub + dependencies: - litex-hub::yosys=0.19_10_g0098b32c6=20220706_001518_py37 - litex-hub::symbiflow-yosys-plugins=1.0.0_7_1002_gd149693=20220706_001518 diff --git a/eos-s3/requirements.txt b/eos-s3/requirements.txt index fe33f41..4e6fa9e 100644 --- a/eos-s3/requirements.txt +++ b/eos-s3/requirements.txt @@ -1,3 +1,19 @@ +# Copyright (C) 2020-2022 F4PGA Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. +# +# SPDX-License-Identifier: Apache-2.0 + python-constraint serial git+https://github.com/antmicro/quicklogic-fasm@607849ec0bdef8740be33dbaa49d15a3d400f809 From 8f1e49e73a541434c4915a007823d8ebe444fafa Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Mon, 1 Aug 2022 14:47:43 +0200 Subject: [PATCH 3/4] common: add requirements.txt Signed-off-by: Unai Martinez-Corral --- common/requirements.txt | 18 ++++++++++++++++++ eos-s3/requirements.txt | 4 ++-- xc7/requirements.txt | 4 ++-- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 common/requirements.txt diff --git a/common/requirements.txt b/common/requirements.txt new file mode 100644 index 0000000..5f3d428 --- /dev/null +++ b/common/requirements.txt @@ -0,0 +1,18 @@ +# Copyright (C) 2020-2022 F4PGA Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. +# +# SPDX-License-Identifier: Apache-2.0 + +python-constraint +https://github.com/chipsalliance/f4pga/archive/df55ee75e4a1da978ffa5f7385bed47faf255661.zip#subdirectory=f4pga diff --git a/eos-s3/requirements.txt b/eos-s3/requirements.txt index 4e6fa9e..e201c9c 100644 --- a/eos-s3/requirements.txt +++ b/eos-s3/requirements.txt @@ -14,7 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 -python-constraint +-r ../common/requirements.txt + serial git+https://github.com/antmicro/quicklogic-fasm@607849ec0bdef8740be33dbaa49d15a3d400f809 -https://github.com/chipsalliance/f4pga/archive/df55ee75e4a1da978ffa5f7385bed47faf255661.zip#subdirectory=f4pga diff --git a/xc7/requirements.txt b/xc7/requirements.txt index f563dc8..16db0ff 100644 --- a/xc7/requirements.txt +++ b/xc7/requirements.txt @@ -14,6 +14,8 @@ # # SPDX-License-Identifier: Apache-2.0 +-r ../common/requirements.txt + intervaltree junit-xml numpy @@ -29,8 +31,6 @@ simplejson sympy textx yapf==0.24.0 -python-constraint -https://github.com/chipsalliance/f4pga/archive/df55ee75e4a1da978ffa5f7385bed47faf255661.zip#subdirectory=f4pga fasm git+https://github.com/f4pga/prjxray.git@ae546d6b7648bf4df9cf63f0b25b2028b5623c43#egg=prjxray git+https://github.com/chipsalliance/f4pga-xc-fasm.git@25dc605c9c0896204f0c3425b52a332034cf5e5c#egg=xc-fasm From 74edff8003e1255fe0ee1f3aca12bfb730a2e684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Czarnecki?= Date: Mon, 1 Aug 2022 15:05:03 +0200 Subject: [PATCH 4/4] env: common: bump f4pga MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Czarnecki --- common/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/requirements.txt b/common/requirements.txt index 5f3d428..4f4c22d 100644 --- a/common/requirements.txt +++ b/common/requirements.txt @@ -15,4 +15,4 @@ # SPDX-License-Identifier: Apache-2.0 python-constraint -https://github.com/chipsalliance/f4pga/archive/df55ee75e4a1da978ffa5f7385bed47faf255661.zip#subdirectory=f4pga +https://github.com/chipsalliance/f4pga/archive/c342fc6ff1684f3dc6072713730ac9fc574ab2f3.zip#subdirectory=f4pga