mirror of
https://github.com/saymrwulf/pulp-runtime.git
synced 2026-11-18 08:54:44 +00:00
Merge pull request #20 from pulp-platform/fpga_improvements
FPGA improvements
This commit is contained in:
commit
04e97f6edd
13 changed files with 50 additions and 19 deletions
|
|
@ -17,6 +17,6 @@ source $scriptDir/../../common.sh
|
||||||
export PULPRUN_PLATFORM=fpga
|
export PULPRUN_PLATFORM=fpga
|
||||||
|
|
||||||
#Genesys2 uses 10MHz SoC Frequency
|
#Genesys2 uses 10MHz SoC Frequency
|
||||||
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_FREQUENCY=10000000'
|
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_PER_FREQUENCY=10000000 -DARCHI_FPGA_SOC_FREQUENCY=20000000'
|
||||||
|
|
||||||
export io=uart
|
export io=uart
|
||||||
|
|
|
||||||
22
configs/fpgas/pulpissimo/nexys.sh
Normal file
22
configs/fpgas/pulpissimo/nexys.sh
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
#!/bin/bash -e
|
||||||
|
|
||||||
|
export PULPRT_TARGET=pulpissimo
|
||||||
|
export PULPRUN_TARGET=pulpissimo
|
||||||
|
|
||||||
|
if [ -n "${ZSH_VERSION:-}" ]; then
|
||||||
|
DIR="$(readlink -f -- "${(%):-%x}")"
|
||||||
|
scriptDir="$(dirname $DIR)"
|
||||||
|
else
|
||||||
|
|
||||||
|
scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
source $scriptDir/../../common.sh
|
||||||
|
|
||||||
|
export PULPRUN_PLATFORM=fpga
|
||||||
|
|
||||||
|
#Nexys Video uses 5MHz SoC Frequency
|
||||||
|
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_PER_FREQUENCY=5000000 -DARCHI_FPGA_SOC_FREQUENCY=10000000'
|
||||||
|
|
||||||
|
export io=uart
|
||||||
|
|
@ -17,6 +17,6 @@ source $scriptDir/../../common.sh
|
||||||
export PULPRUN_PLATFORM=fpga
|
export PULPRUN_PLATFORM=fpga
|
||||||
|
|
||||||
#Nexys Video uses 5MHz SoC Frequency
|
#Nexys Video uses 5MHz SoC Frequency
|
||||||
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_FREQUENCY=5000000'
|
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_PER_FREQUENCY=5000000 -DARCHI_FPGA_SOC_FREQUENCY=10000000'
|
||||||
|
|
||||||
export io=uart
|
export io=uart
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,6 @@ source $scriptDir/../../common.sh
|
||||||
export PULPRUN_PLATFORM=fpga
|
export PULPRUN_PLATFORM=fpga
|
||||||
|
|
||||||
#ZCU102 uses 10MHz SoC Frequency
|
#ZCU102 uses 10MHz SoC Frequency
|
||||||
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_FREQUENCY=10000000'
|
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_PER_FREQUENCY=10000000 -DARCHI_FPGA_SOC_FREQUENCY=20000000'
|
||||||
|
|
||||||
export io=uart
|
export io=uart
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,6 @@ source $scriptDir/../../common.sh
|
||||||
export PULPRUN_PLATFORM=fpga
|
export PULPRUN_PLATFORM=fpga
|
||||||
|
|
||||||
#ZCU104 uses 10MHz SoC Frequency
|
#ZCU104 uses 10MHz SoC Frequency
|
||||||
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_FREQUENCY=10000000'
|
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_PER_FREQUENCY=10000000 -DARCHI_FPGA_SOC_FREQUENCY=20000000'
|
||||||
|
|
||||||
export io=uart
|
export io=uart
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,6 @@ source $scriptDir/../../common.sh
|
||||||
export PULPRUN_PLATFORM=fpga
|
export PULPRUN_PLATFORM=fpga
|
||||||
|
|
||||||
#Zedboard uses 10MHz SoC Frequency
|
#Zedboard uses 10MHz SoC Frequency
|
||||||
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_FREQUENCY=10000000'
|
export PULPRT_CONFIG_CFLAGS='-DARCHI_FPGA_PER_FREQUENCY=10000000 -DARCHI_FPGA_SOC_FREQUENCY=20000000'
|
||||||
|
|
||||||
export io=uart
|
export io=uart
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
* FPGA
|
* FPGA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define ARCHI_FPGA_FREQUENCY 5000000
|
#define ARCHI_FPGA_PER_FREQUENCY 5000000
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MEMORIES
|
* MEMORIES
|
||||||
|
|
|
||||||
|
|
@ -22,12 +22,12 @@
|
||||||
* FPGA
|
* FPGA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ARCHI_FPGA_FREQUENCY
|
#ifndef ARCHI_FPGA_PER_FREQUENCY
|
||||||
#define ARCHI_FPGA_FREQUENCY 5000000
|
#define ARCHI_FPGA_PER_FREQUENCY 5000000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ARCHI_FPGA_FC_FREQUENCY
|
#ifndef ARCHI_FPGA_SOC_FREQUENCY
|
||||||
#define ARCHI_FPGA_FC_FREQUENCY 5000000
|
#define ARCHI_FPGA_SOC_FREQUENCY 5000000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ARCHI_FPGA_CL_FREQUENCY
|
#ifndef ARCHI_FPGA_CL_FREQUENCY
|
||||||
|
|
|
||||||
|
|
@ -22,12 +22,12 @@
|
||||||
* FPGA
|
* FPGA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ARCHI_FPGA_FREQUENCY
|
#ifndef ARCHI_FPGA_PER_FREQUENCY
|
||||||
#define ARCHI_FPGA_FREQUENCY 5000000
|
#define ARCHI_FPGA_PER_FREQUENCY 5000000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ARCHI_FPGA_FC_FREQUENCY
|
#ifndef ARCHI_FPGA_SOC_FREQUENCY
|
||||||
#define ARCHI_FPGA_FC_FREQUENCY 5000000
|
#define ARCHI_FPGA_SOC_FREQUENCY 5000000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,9 @@ void pos_soc_init()
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
pos_freq_domains[PI_FREQ_DOMAIN_FC] = ARCHI_FPGA_FC_FREQUENCY;
|
pos_freq_domains[PI_FREQ_DOMAIN_FC] = ARCHI_FPGA_SOC_FREQUENCY;
|
||||||
|
|
||||||
pos_freq_domains[PI_FREQ_DOMAIN_PERIPH] = ARCHI_FPGA_FREQUENCY;
|
pos_freq_domains[PI_FREQ_DOMAIN_PERIPH] = ARCHI_FPGA_PER_FREQUENCY;
|
||||||
|
|
||||||
pos_freq_domains[PI_FREQ_DOMAIN_CL] = ARCHI_FPGA_CL_FREQUENCY;
|
pos_freq_domains[PI_FREQ_DOMAIN_CL] = ARCHI_FPGA_CL_FREQUENCY;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,9 +28,9 @@ void pos_soc_init()
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
pos_freq_domains[PI_FREQ_DOMAIN_FC] = ARCHI_FPGA_FC_FREQUENCY;
|
pos_freq_domains[PI_FREQ_DOMAIN_FC] = ARCHI_FPGA_SOC_FREQUENCY;
|
||||||
|
|
||||||
pos_freq_domains[PI_FREQ_DOMAIN_PERIPH] = ARCHI_FPGA_FREQUENCY;
|
pos_freq_domains[PI_FREQ_DOMAIN_PERIPH] = ARCHI_FPGA_PER_FREQUENCY;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,15 @@ ifdef RUNNER_CONFIG
|
||||||
override runner_args += --config-user=$(RUNNER_CONFIG)
|
override runner_args += --config-user=$(RUNNER_CONFIG)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq '$(load_mode)' 'fast_debug'
|
||||||
|
LOAD_MODE := FAST_DEBUG_PRELOAD
|
||||||
|
else ifeq '$(load_mode)' 'standalone'
|
||||||
|
LOAD_MODE := STANDALONE
|
||||||
|
else ifeq '$(load_mode)' 'jtag'
|
||||||
|
LOAD_MODE := JTAG
|
||||||
|
else
|
||||||
|
LOAD_MODE := JTAG
|
||||||
|
endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# VSIM Flags
|
# VSIM Flags
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue