Skip to content

Commit 6403a4f

Browse files
committed
merge riscv
1 parent 011f850 commit 6403a4f

11 files changed

+47
-25
lines changed

.gitmodules

+6-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
[submodule "vim/bundle/ex-autocomplpop"]
1414
path = vim/bundle/ex-autocomplpop
1515
url = https://github.com/exvim/ex-autocomplpop.git
16-
[submodule "font/fonts"]
17-
path = font/fonts
18-
url = https://github.com/powerline/fonts.git
1916
[submodule "vim/bundle/gruvbox"]
2017
path = vim/bundle/gruvbox
2118
url = https://github.com/morhetz/gruvbox.git
@@ -82,3 +79,9 @@
8279
[submodule "vim/bundle/vim-easy-align"]
8380
path = vim/bundle/vim-easy-align
8481
url = https://github.com/junegunn/vim-easy-align.git
82+
[submodule "font/fonts"]
83+
path = font/powerline
84+
url = https://github.com/powerline/fonts.git
85+
[submodule "font/figlet-fonts"]
86+
path = font/figlet-fonts
87+
url = https://github.com/xero/figlet-fonts.git

env/cadence.bashrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# Cadence Set
33
#*******************************************************************************
44

5-
export CADENCE_HOME=/opt/cadence
5+
export CADENCE_HOME=/opt/tools/cadence
66
export INN_HOME=$CADENCE_HOME/innovus/INNOVUS152
77
export CDSHOME=$CADENCE_HOME/ic/IC-6.17.722
88
export SPECTRE_HOME=$CADENCE_HOME/spectre/SPECTRE-17.10.389
9-
export CDS_LIC_FILE=27001@wbr
9+
export CDS_LIC_FILE=27001@Chipyard
1010
export OA_HOME=$CDSHOME/oa_v22.50.092
1111
export OA_UNSUPPORTED_PLAT=linux_rhel50_gcc48x
1212

env/mentor.bashrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Mentor Set
33
#*******************************************************************************
44

5-
export MGC_HOME=/opt/mentor/calibre/Calibre-2016.3_28.17
5+
export MGC_HOME=/opt/tools/mentor/calibre/Calibre-2016.3_28.17
66
export CALIBRE_HOME=$MGC_HOME/aoi_cal_2016.3_28.17
77
export MGLS_LICENSE_FILE=/opt/licenses/mentor/license/mentor.dat
88
export -n XMODIFIERS

env/riscv.bashrc

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# RISCV Set
33
#*******************************************************************************
44

5-
export ANT_HOME="/opt/apache-ant"
6-
export MVN_HOME="/opt/apache-maven"
7-
export GRADLE_HOME="/opt/gradle"
8-
export JAVA_HOME="/opt/java/jdk1.8.0_201"
9-
export JRE_HOME="/opt/java/jdk1.8.0_201/jre"
10-
export SCALA_HOME="/opt/scala"
11-
export SBT_HOME="/opt/sbt"
5+
export ANT_HOME="/opt/tools/apache-ant/apache-ant-1.10.5"
6+
export MVN_HOME="/opt/tools/apache-maven/apache-maven-3.6.0"
7+
export GRADLE_HOME="/opt/tools/gradle/gradle-5.0"
8+
export JAVA_HOME="/opt/tools/java/jdk1.8.0_201"
9+
export JRE_HOME="/opt/tools/java/jdk1.8.0_201/jre"
10+
export SCALA_HOME="/opt/tools/scala"
11+
export SBT_HOME="/opt/tools/sbt"
1212
export RISCV_TESTS="/home/wbr/riscv/riscv-tests"
1313
#export RISCV="/opt/riscv/riscv-tools-embed"
14-
export RISCV="/opt/riscv/riscv-tools"
14+
export RISCV="/opt/tools/riscv/riscv-tools"
1515
export INSTALLED_VERILATOR="/usr/local/bin/verilator"
16-
export FREEDOMSTUDIO=/opt/freedomstudio
16+
export FREEDOMSTUDIO="/opt/tools/freedomstudio"
1717

1818
function fs {
1919
FreedomStudio "$@" &

env/synopsys.bashrc

+8-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
# Synopsys Set
33
#*******************************************************************************
44

5-
export SNPSYS_HOME=/opt/synopsys
6-
export VERDI_HOME=$SNPSYS_HOME/verdi/verdi_N-2017.12
5+
export SNPSYS_HOME=/opt/tools/synopsys
6+
export VERDI_HOME=$SNPSYS_HOME/verdi/verdi-2018.9-sp2
77
export LD_LIBRARY_PATH=$VERDI_HOME/share/PLI/VCS/LINUX64
88
export SCL_HOME=$SNPSYS_HOME/scl/amd64
9-
export VCS_HOME=$SNPSYS_HOME/vcs/vcs_vM-2017.03
9+
export VCS_HOME=$SNPSYS_HOME/vcs/vcs_vO-2018.09-SP2
1010
export DC_HOME=$SNPSYS_HOME/dc/dc_2018
11-
export LM_LICENSE_FILE=27000@wbr
11+
export LM_LICENSE_FILE=27000@Chipyard
12+
export LIB_HOME=/opt/lib.eda
1213

1314
export PATH=$PATH:$VCS_HOME/bin:$SCL_HOME/bin:$VERDI_HOME/bin:$VERDI_HOME/platform/LINUX/bin:$DC_HOME/bin
1415

@@ -20,8 +21,10 @@ function verdi {
2021
Verdi "$@" &
2122
}
2223

23-
alias lic='rm -rf ~/log/*;lmgrd -c /usr/local/synopsys/vcs/vcs-mx_vL-2016.06/license/synopsys.dat -l ~/log/synopsys.log'
24+
alias lic='\rm -rf ~/tmp/synopsys.log; /opt/licenses/synopsys/bin/lmgrd -c /opt/licenses/synopsys/license/synopsys.dat -l ~/tmp/synopsys.log'
2425
alias clean='pkill -9 lmgrd;pkill -9 snslmgrd;pkill -9 snpslmd;'
26+
#lsof -i :27000
27+
alias portstatus='lsof -i :'
2528

2629
#*******************************************************************************
2730
# Synopsys End

env/wbr.bashrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ alias gdiff='gvimdiff'
1717
alias tnew='tmux new -s'
1818
alias ls='ls --color=auto'
1919
alias lf='ls | sed "s:^:`pwd`/:"'
20-
alias ll='ls -lFrt'
20+
alias ll='ls -laFrt'
2121
alias la='ls -LaF'
2222
alias cp='cp -r'
2323
alias python3='python3.6'
@@ -47,7 +47,7 @@ alias glog='git log --oneline --graph'
4747
#***************************************************************************
4848
# Set PS1 End
4949
#***************************************************************************
50-
export PS1="\[$(tput bold)\]\[\033[38;5;1m\]o(〃\[\033[38;5;11m\]^▽^\[\033[38;5;14m\]〃)\[$(tput sgr0)\]\[\033[38;5;90m\]:\[\033[38;5;48m\]<<--\[$(tput bold)\]\[\033[38;5;9m\]\w\[$(tput sgr0)\]\[\033[38;5;48m\]-->>\[$(tput sgr0)\]\n\[$(tput sgr0)\]\[\033[38;5;45m\]└─\h\[$(tput sgr0)\]\[$(tput bold)\]@\[$(tput sgr0)\]\[\033[38;5;160m\]\u\[$(tput sgr0)\]\[\033[38;5;227m\]\$(__git_ps1 '(%s)')\[$(tput sgr0)\]\[\033[38;5;46m\]▶\$\[$(tput sgr0)\]"
50+
export PS1="\[$(tput bold)\]\[\033[38;5;1m\]o(〃\[\033[38;5;11m\]^▽^\[\033[38;5;14m\]〃)\[$(tput sgr0)\]\[\033[38;5;90m\]:\[\033[38;5;48m\]<<\[$(tput bold)\]\[\033[38;5;9m\]\w\[$(tput sgr0)\]\[\033[38;5;48m\]>>\[$(tput sgr0)\]\n\[$(tput sgr0)\]\[\033[38;5;45m\]└─\h\[$(tput sgr0)\]\[$(tput bold)\]@\[$(tput sgr0)\]\[\033[38;5;160m\]\u\[$(tput sgr0)\]\[\033[38;5;227m\]\$(__git_ps1 '(%s)')\[$(tput sgr0)\]\[\033[38;5;46m\]▶\$\[$(tput sgr0)\]"
5151
#***************************************************************************
5252
# Set PS1 End
5353
#***************************************************************************

git/.gitconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[http]
55
postBuffer = 52428800
66
sslVerify = false
7-
[url "https://github.com.cnpmjs.org/"]
8-
insteadOf = https://github.com/
7+
# [url "https://github.com.cnpmjs.org/"]
8+
# insteadOf = https://github.com/
99
[credential]
1010
helper = store
1111
# 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

scripts/init.sh

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
git submodule update --init

scripts/install.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
cat packagelist.txt | while read a b
4+
do
5+
echo "start to install" $a
6+
apt-get install -y $a
7+
if [ $? -ne 0 ]; then
8+
echo "failed"
9+
exit
10+
else
11+
echo "succeed"
12+
fi
13+
done

tmux/.tmux.conf

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
set-option -g mouse on # 等于启动了鼠标的所有操作
66
set-window-option -g mode-keys vi #可以设置为vi或emacs
7+
bind-key / copy-mode \; send-key ? #Pressing Ctrl+a+/ (will search the words in pane).
78
bind-key -n C-S-Left swap-window -t -1 #Pressing Ctrl+Shift+Left (will move the current window to the left).
89
bind-key -n C-S-Right swap-window -t +1 #Pressing Ctrl+Shift+Right (will move the current window to the right).
910

vim/plugin/autocmd.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif
2222

2323
if has("autocmd")
2424
" Clear all spaces before <Enter> before save files
25-
autocmd BufWritePre * :%s/\s\+$//e
25+
" autocmd BufWritePre * :%s/\s\+$//e
2626
" Make views automatic
2727
autocmd BufWinLeave *. mkview
2828
autocmd BufWinEnter *. silent loadview

0 commit comments

Comments
 (0)