Skip to content

Commit 3486c96

Browse files
committed
Consolidate config files for: DE0_Nano_SoC_Cramps and DE10_Nano_FB_Cramps into 1 config folder with 1 set of config files
Since the hm2 configs are the same, makes sense to make them use the exact same config files except for the fw-id
1 parent d8a708e commit 3486c96

27 files changed

+10
-1132
lines changed

HW/QuartusProjects/DE0_Nano_SoC_Cramps/DE0_Nano_SoC_Cramps.qsf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ set_global_assignment -name ENABLE_SIGNALTAP OFF
649649
set_global_assignment -name SDC_FILE DE0_Nano_SoC_Cramps.sdc
650650
set_global_assignment -name VHDL_FILE ../Common/firmware_id.vhd
651651
set_global_assignment -name MIF_FILE firmware_id.mif
652-
set_global_assignment -name QIP_FILE hm3_DE0_Nano_SoC.qip
652+
set_global_assignment -name QIP_FILE hm3_DE0_Nano_SoC_Cramps.qip
653653
set_global_assignment -name QIP_FILE ../../hm2/hm3_socfpga.qip
654654
set_global_assignment -name QIP_FILE hm3_pin_config.qip
655655
set_global_assignment -name SYSTEMVERILOG_FILE ../Common/capsense.sv
@@ -663,4 +663,4 @@ set_global_assignment -name SYSTEMVERILOG_FILE ../Common/adc_ltc2308_fifo.sv
663663
set_global_assignment -name SYSTEMVERILOG_FILE ../Common/bidir_io.sv
664664
set_global_assignment -name SYSTEMVERILOG_FILE ../Common/gpio_adr_decoder_reg.sv
665665
set_global_assignment -name USE_SIGNALTAP_FILE stp1.stp
666-
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
666+
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top

HW/QuartusProjects/DE0_Nano_SoC_Cramps/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ OUTPUTDIR=output_files
3131
set -e
3232

3333
# Path to the configuration files
34-
CONFIG_DIR="../../hm2/config/${BOARDNAME}"
34+
CONFIG_DIR="../../hm2/config/DExx_Nano_xxx_Cramps"
3535

3636

3737
# Routine to build a specific configuration
@@ -43,7 +43,7 @@ build_config() {
4343
# which means in rare instances it could match actual VHDL code. Here we use
4444
# the % character to support a batch-style variable scheme
4545
sed "s/%CONFIG%/${1}/g" <${CONFIG_DIR}/hm3_pin_config.in > hm3_pin_config.qip
46-
sed "s/%CONFIG%/${1}/g" <${CONFIG_DIR}/hm3_DE0_Nano_SoC.in > hm3_DE0_Nano_SoC.qip
46+
sed "s/%CONFIG%/${1}/g" <${CONFIG_DIR}/hm3_DExx_Nano_xxx_Cramps.in > hm3_${BOARDNAME}.qip
4747

4848
# Actually build the FPGA bit file
4949
make rbf

HW/QuartusProjects/DE10_Nano_FB_Cramps/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ OUTPUTDIR=output_files
3131
set -e
3232

3333
# Path to the configuration files
34-
CONFIG_DIR="../../hm2/config/${BOARDNAME}"
34+
CONFIG_DIR="../../hm2/config/DExx_Nano_xxx_Cramps"
3535

3636

3737
# Routine to build a specific configuration
@@ -43,7 +43,7 @@ build_config() {
4343
# which means in rare instances it could match actual VHDL code. Here we use
4444
# the % character to support a batch-style variable scheme
4545
sed "s/%CONFIG%/${1}/g" <${CONFIG_DIR}/hm3_pin_config.in > hm3_pin_config.qip
46-
sed "s/%CONFIG%/${1}/g" <${CONFIG_DIR}/hm3_DE10_Nano_FB_Cramps.in > hm3_DE10_Nano_FB_Cramps.qip
46+
sed "s/%CONFIG%/${1}/g" <${CONFIG_DIR}/hm3_DExx_Nano_xxx_Cramps.in > hm3_${BOARDNAME}.qip
4747

4848
# Actually build the FPGA bit file
4949
make rbf

HW/hm2/config/DE0_Nano_SoC_Cramps/hm3_DE0_Nano_SoC.in

Lines changed: 0 additions & 2 deletions
This file was deleted.

HW/hm2/config/DE0_Nano_SoC_Cramps/hm3_pin_config.in

Lines changed: 0 additions & 2 deletions
This file was deleted.

HW/hm2/config/DE10_Nano_FB_Cramps/PIN_3x24.vhd

Lines changed: 0 additions & 200 deletions
This file was deleted.

HW/hm2/config/DE10_Nano_FB_Cramps/PIN_3x24_cap.vhd

Lines changed: 0 additions & 200 deletions
This file was deleted.

HW/hm2/config/DE10_Nano_FB_Cramps/PIN_3x24_cap_enc.vhd

Lines changed: 0 additions & 200 deletions
This file was deleted.

HW/hm2/config/DE10_Nano_FB_Cramps/PIN_3x24_cap_spi.vhd

Lines changed: 0 additions & 200 deletions
This file was deleted.

HW/hm2/config/DE10_Nano_FB_Cramps/atlas_3x24.sv

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)