# HG changeset patch
# User pellion
# Date 2015-04-03 11:03:41
# Node ID 049317d554b265ba3e83b5c796c82eefaf093b75
# Parent  87dba9f248670fe241d6403a8c656f3254c910fa

modif 1 : echange des ahbslave 0 (srctrle-0ws) et slave 2 (DSU)
=> empecher le blocage de l'arbitre AHB pendant un SCRUB

diff --git a/boards/LFR-EQM/LFR_EQM_A3PE3000.pdc b/boards/LFR-EQM/LFR_EQM_A3PE3000.pdc
--- a/boards/LFR-EQM/LFR_EQM_A3PE3000.pdc
+++ b/boards/LFR-EQM/LFR_EQM_A3PE3000.pdc
@@ -1,6 +1,6 @@
 set_io	clk49_152MHz		-pinname	D5	-fixed	yes	-DIRECTION	Inout
 set_io	clk50MHz		-pinname	B3	-fixed	yes	-DIRECTION	Inout
-set_io	reset			-pinname	R4	-fixed	yes	-DIRECTION	Inout
+set_io	reset			-pinname	R4	-fixed	yes	-DIRECTION	Inout -SCHMITT_TRIGGER On
 
 set_io	{address[0]}		-pinname	U3	-fixed	yes	-DIRECTION	Inout
 set_io	{address[1]}		-pinname	V14	-fixed	yes	-DIRECTION	Inout
diff --git a/lib/lpp/lpp_leon3_soc/leon3_soc.vhd b/lib/lpp/lpp_leon3_soc/leon3_soc.vhd
--- a/lib/lpp/lpp_leon3_soc/leon3_soc.vhd
+++ b/lib/lpp/lpp_leon3_soc/leon3_soc.vhd
@@ -363,9 +363,12 @@ BEGIN
 
     dsugen : IF CFG_DSU = 1 GENERATE
       dsu0 : dsu3                       -- LEON3 Debug Support Unit
-        GENERIC MAP (hindex => 2, haddr => 16#900#, hmask => 16#F00#,
-                     ncpu   => CFG_NCPU, tbits => 30, tech => memtech, irq => 0, kbytes => CFG_ATBSZ)
-        PORT MAP (rstn, clkm, ahbmi, ahbsi, ahbso(2), dbgo, dbgi, dsui, dsuo);
+        GENERIC MAP (hindex => 0,       --      TODO : hindex => 2
+                     haddr => 16#900#, hmask => 16#F00#,
+                     ncpu   => CFG_NCPU, tbits => 30, tech => memtech,
+                     irq => 0, kbytes => CFG_ATBSZ)
+        PORT MAP (rstn, clkm, ahbmi, ahbsi, ahbso(0),--      TODO :ahbso(2)
+                  dbgo, dbgi, dsui, dsuo);
       dsui.enable <= '1';
       dsui.break  <= '0';
     END GENERATE;
@@ -410,7 +413,7 @@ BEGIN
   IAPMEMCT : IF USES_IAP_MEMCTRLR = 1 GENERATE
     memctrlr : srctrle_0ws
       GENERIC MAP(
-        hindex   => 0,
+        hindex   => 2,                  -- TODO : hindex   => 0
         pindex   => 0,
         paddr    => 0,
         srbanks  => 2,
@@ -429,7 +432,7 @@ BEGIN
         rst       => rstn,
         clk       => clkm,
         ahbsi     => ahbsi,
-        ahbso     => ahbso(0),
+        ahbso     => ahbso(2),          -- TODO :ahbso(0),
         apbi      => apbi,
         apbo      => apbo(0),
         sri       => memi,