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

Fix archlinux build (python2 and ips script) #275

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ PULPino has the following requirements
ETH. The ETH versions supports all the ISA extensions that were incorporated
into the RI5CY core as well as the reduced base instruction set for zero-riscy.
Please make sure you are using the newlib version of the toolchain.
- python2 >= 2.6
- python2 >= 2.6 (and PyYAML)
- verilator 3.884 only necessary if you want to use Verilator to evaluate PULPino.

## ISA Support
Expand Down Expand Up @@ -86,7 +86,7 @@ It is written in LaTeX and there is no pdf included in the repository. Simply ty

make all

inside the folder to generate the pdf. Note that you need a working version of latex for this step.
inside the folder to generate the pdf. Note that you need a working version of latex and tgif for this step.


## Running simulations
Expand All @@ -96,7 +96,7 @@ Create a build folder somewhere, e.g. in the sw folder

mkdir build

Copy the cmake-configure.{*}.gcc.sh bash script to the build folder.
Copy the cmake_configure.{*}.gcc.sh bash script to the build folder.
This script can be found in the sw subfolder of the git repository.

Modify the cmake-configure script to your needs and execute it inside the build folder.
Expand Down
2 changes: 1 addition & 1 deletion create-archive.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import sys,os,subprocess,re
from time import strftime
Expand Down
2 changes: 1 addition & 1 deletion generate-scripts.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
# Francesco Conti <[email protected]>
#
# Copyright (C) 2016 ETH Zurich, University of Bologna.
Expand Down
8 changes: 6 additions & 2 deletions update-ips.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
# Francesco Conti <[email protected]>
#
# Copyright (C) 2016 ETH Zurich, University of Bologna.
Expand All @@ -23,9 +23,13 @@ def execute_out(cmd, silent=False):
def find_server():
stdout = execute_out("git remote -v")

remote_name = "origin"
if "upstream" in stdout:
remote_name = "upstream"

stdout = stdout.split('\n')
for line in stdout:
if "origin" in line:
if remote_name in line:
tmp = line.split(' ')
tmp = tmp[0].split('\t')

Expand Down