Skip to content

Commit 0746170

Browse files
committed
DE10_Nano_FB_Cramps:
Change framebuffer master bus to f2h_sdram (uboot needs to take the port out of reset via: mw.w 0xffc25080 0x0303;) Signed-off-by: Michael Brown <producer@holotronic.dk>
1 parent 843dd4e commit 0746170

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

HW/QuartusProjects/DE10_Nano_FB_Cramps/DE10_Nano_FB_Cramps.qsf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,4 +719,5 @@ set_global_assignment -name SYSTEMVERILOG_FILE ../Common/adc_ltc2308_fifo.sv
719719
set_global_assignment -name SYSTEMVERILOG_FILE ../Common/bidir_io.sv
720720
set_global_assignment -name SYSTEMVERILOG_FILE ../Common/gpio_adr_decoder_reg.sv
721721
set_global_assignment -name QIP_FILE ../Common/hdmi_config.qip
722-
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
722+
723+
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top

HW/QuartusProjects/DE10_Nano_FB_Cramps/soc_system.qsys

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
}
5656
datum baseAddress
5757
{
58-
value = "331776";
58+
value = "200704";
5959
type = "String";
6060
}
6161
}
@@ -483,7 +483,7 @@
483483
<parameter name="V_SYNC_LENGTH" value="6" />
484484
</module>
485485
<module name="alt_vip_vfr_hdmi" kind="alt_vip_vfr" version="14.0" enabled="1">
486-
<parameter name="AUTO_CLOCK_MASTER_CLOCK_RATE" value="50000000" />
486+
<parameter name="AUTO_CLOCK_MASTER_CLOCK_RATE" value="150000000" />
487487
<parameter name="AUTO_CLOCK_RESET_CLOCK_RATE" value="150000000" />
488488
<parameter name="BITS_PER_PIXEL_PER_COLOR_PLANE" value="8" />
489489
<parameter name="CLOCKS_ARE_SEPARATE" value="1" />
@@ -658,7 +658,7 @@
658658
<parameter name="EXPORT_AFI_HALF_CLK" value="false" />
659659
<parameter name="EXTRA_SETTINGS" value="" />
660660
<parameter name="F2H_AXI_CLOCK_FREQ" value="50000000" />
661-
<parameter name="F2H_SDRAM0_CLOCK_FREQ" value="50000000" />
661+
<parameter name="F2H_SDRAM0_CLOCK_FREQ" value="150000000" />
662662
<parameter name="F2H_SDRAM1_CLOCK_FREQ" value="100" />
663663
<parameter name="F2H_SDRAM2_CLOCK_FREQ" value="100" />
664664
<parameter name="F2H_SDRAM3_CLOCK_FREQ" value="100" />
@@ -671,8 +671,8 @@
671671
<parameter name="F2SCLK_SDRAMCLK_Enable" value="false" />
672672
<parameter name="F2SCLK_SDRAMCLK_FREQ" value="0" />
673673
<parameter name="F2SCLK_WARMRST_Enable" value="false" />
674-
<parameter name="F2SDRAM_Type">Avalon-MM Bidirectional</parameter>
675-
<parameter name="F2SDRAM_Width" value="256" />
674+
<parameter name="F2SDRAM_Type" value="AXI-3" />
675+
<parameter name="F2SDRAM_Width" value="128" />
676676
<parameter name="F2SINTERRUPT_Enable" value="true" />
677677
<parameter name="F2S_Width" value="3" />
678678
<parameter name="FORCED_NON_LDC_ADDR_CMD_MEM_CK_INVERT" value="false" />
@@ -1381,7 +1381,7 @@
13811381
kind="avalon"
13821382
version="15.1"
13831383
start="alt_vip_vfr_hdmi.avalon_master"
1384-
end="hps_0.f2h_axi_slave">
1384+
end="hps_0.f2h_sdram0_data">
13851385
<parameter name="arbitrationPriority" value="1" />
13861386
<parameter name="baseAddress" value="0x0000" />
13871387
<parameter name="defaultConnection" value="false" />
@@ -1419,7 +1419,7 @@
14191419
start="mm_bridge_0.m0"
14201420
end="alt_vip_vfr_hdmi.avalon_slave">
14211421
<parameter name="arbitrationPriority" value="1" />
1422-
<parameter name="baseAddress" value="0x00051000" />
1422+
<parameter name="baseAddress" value="0x00031000" />
14231423
<parameter name="defaultConnection" value="false" />
14241424
</connection>
14251425
<connection
@@ -1496,7 +1496,7 @@
14961496
start="fpga_only_master.master"
14971497
end="alt_vip_vfr_hdmi.avalon_slave">
14981498
<parameter name="arbitrationPriority" value="1" />
1499-
<parameter name="baseAddress" value="0x00051000" />
1499+
<parameter name="baseAddress" value="0x00031000" />
15001500
<parameter name="defaultConnection" value="false" />
15011501
</connection>
15021502
<connection
@@ -1591,11 +1591,6 @@
15911591
<connection kind="clock" version="15.1" start="clk_0.clk" end="dipsw_pio.clk" />
15921592
<connection kind="clock" version="15.1" start="clk_0.clk" end="button_pio.clk" />
15931593
<connection kind="clock" version="15.1" start="clk_0.clk" end="jtag_uart.clk" />
1594-
<connection
1595-
kind="clock"
1596-
version="15.1"
1597-
start="clk_0.clk"
1598-
end="f2sdram_only_master.clk" />
15991594
<connection kind="clock" version="15.1" start="clk_0.clk" end="mm_bridge_0.clk" />
16001595
<connection kind="clock" version="15.1" start="clk_0.clk" end="ILC.clk" />
16011596
<connection kind="clock" version="15.1" start="clk_0.clk" end="hm2reg_io_0.clock" />
@@ -1608,33 +1603,38 @@
16081603
kind="clock"
16091604
version="15.1"
16101605
start="clk_0.clk"
1611-
end="alt_vip_vfr_hdmi.clock_master" />
1606+
end="hps_0.f2h_axi_clock" />
16121607
<connection
16131608
kind="clock"
16141609
version="15.1"
16151610
start="clk_0.clk"
1616-
end="hps_0.f2h_axi_clock" />
1611+
end="hps_0.h2f_axi_clock" />
16171612
<connection
16181613
kind="clock"
16191614
version="15.1"
16201615
start="clk_0.clk"
1621-
end="hps_0.f2h_sdram0_clock" />
1616+
end="hps_0.h2f_lw_axi_clock" />
1617+
<connection kind="clock" version="15.1" start="clk_0.clk" end="pll_stream.refclk" />
16221618
<connection
16231619
kind="clock"
16241620
version="15.1"
1625-
start="clk_0.clk"
1626-
end="hps_0.h2f_axi_clock" />
1621+
start="pll_stream.outclk0"
1622+
end="f2sdram_only_master.clk" />
16271623
<connection
16281624
kind="clock"
16291625
version="15.1"
1630-
start="clk_0.clk"
1631-
end="hps_0.h2f_lw_axi_clock" />
1632-
<connection kind="clock" version="15.1" start="clk_0.clk" end="pll_stream.refclk" />
1626+
start="pll_stream.outclk0"
1627+
end="alt_vip_vfr_hdmi.clock_master" />
16331628
<connection
16341629
kind="clock"
16351630
version="15.1"
16361631
start="pll_stream.outclk0"
16371632
end="alt_vip_vfr_hdmi.clock_reset" />
1633+
<connection
1634+
kind="clock"
1635+
version="15.1"
1636+
start="pll_stream.outclk0"
1637+
end="hps_0.f2h_sdram0_clock" />
16381638
<connection
16391639
kind="clock"
16401640
version="15.1"

0 commit comments

Comments
 (0)