Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'main' of IObundle/iob-soc into if_gen2; Update py2hwsw version. #967

Merged
merged 24 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8927561
Merge pull request #925 from arturum1/main
jjts Aug 23, 2024
b2d1558
[ipxact] fixed params replacement
AndreMerendeira Oct 2, 2024
2baf12d
Merge branch 'main' of github.com:IObundle/iob-soc into HEAD
AndreMerendeira Oct 2, 2024
7275b96
add support for xsim
jjts Oct 7, 2024
fd4e991
fix(xsim): variables for remote simulation
P-Miranda Oct 8, 2024
7de44f3
Merge pull request #957 from P-Miranda/main
jjts Oct 8, 2024
1c2c557
remove reset sync
jjts Oct 11, 2024
ec34aa8
add missing reset
jjts Oct 11, 2024
3c8dedf
fix(fpga): connect rstn wire to 1st interface
P-Miranda Oct 11, 2024
03d1d14
Merge pull request #961 from P-Miranda/main
jjts Oct 12, 2024
b3eb213
fix(regfile): replace regfile_t2p by regfile_at2p
P-Miranda Oct 17, 2024
983e6d6
Merge remote-tracking branch 'upstream/main'
P-Miranda Oct 17, 2024
17169b2
fix(regfile): fix cke ports
P-Miranda Oct 17, 2024
10bc48c
Merge pull request #963 from P-Miranda/main
jjts Oct 17, 2024
3c1029d
feat(py2): Update py2hwsw version; Remove clang-format file.
arturum1 Oct 24, 2024
574baf9
Merge branch 'IObundle:main' into ipxact_fix
AndreMerendeira Oct 30, 2024
74e6da9
Merge pull request #964 from AndreMerendeira/ipxact_fix
jjts Oct 30, 2024
d4c2b40
feat(nco, axis): fix NCO, AXIS IN, AXIS OUT
P-Miranda Oct 30, 2024
9e63d1f
Merge branch 'if_gen2' of github.com:IObundle/iob-soc into if_gen2
arturum1 Oct 30, 2024
d59934b
Merge pull request #965 from P-Miranda/main
jjts Oct 31, 2024
d8e8560
Merge branch 'main' of github.com:IObundle/iob-soc into if_gen2
arturum1 Oct 31, 2024
338ead3
feat(py2hwsw): Update py2hwsw version; Rename `bsp` to `iob_bsp`.
arturum1 Nov 4, 2024
fc6fcb4
chore(py2): Update py2hwsw version
arturum1 Nov 4, 2024
b3fff91
chore(py2hwsw): Update py2hwsw version
arturum1 Nov 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .clang-format

This file was deleted.

4 changes: 2 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{ pkgs ? import <nixpkgs> {} }:

let
py2hwsw_commit = "764b4e7c7d8941f5693e9ed5ea925ab5ebe5c80c"; # Replace with the desired commit.
py2hwsw_sha256 = "sha256-2A4cmvB+TCXX2p6Z+nvz55rsMLPjCaEbUPbH/KnSWzU="; # Replace with the actual SHA256 hash.
py2hwsw_commit = "7978effd91b87fdb5e0bddf6eaa5e5b8f16abae5"; # Replace with the desired commit.
py2hwsw_sha256 = "tX1wHbD6XpjbSSd1tBkZv2tXJ461Yd5C9BXeRrE4/10="; # Replace with the actual SHA256 hash.
# Get local py2hwsw path from `PY2HWSW_PATH` env variable
py2hwswPath = builtins.getEnv "PY2HWSW_PATH";

Expand Down
2 changes: 1 addition & 1 deletion iob_soc.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def setup(py_params_dict):
{
"name": "rs232_m",
"descr": "iob-system uart interface",
"interface": {
"signals": {
"type": "rs232",
},
},
Expand Down
2 changes: 1 addition & 1 deletion software/src/iob_soc_firmware.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/

#include "bsp.h"
#include "iob_bsp.h"
#include "iob_soc_conf.h"
#include "iob_soc_periphs.h"
#include "iob_soc_system.h"
Expand Down