[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2656-ga9a1cda

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a9a1cda08a38ab22d76ea73fd4a1d16684f431f0 (commit)
       via  08714d87a7af031b1f9a0fc07d7d368c91ecbbf3 (commit)
      from  a53849a9a4d5aeec27d23c6b44570ae7b4c4d737 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a9a1cda08a38ab22d76ea73fd4a1d16684f431f0
Merge: 08714d8 a53849a
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Jan 5 11:59:18 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 08714d87a7af031b1f9a0fc07d7d368c91ecbbf3
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Jan 5 11:58:47 2012 +0100

    [firmware][linux] update sp_vision_loader for APF51

-----------------------------------------------------------------------

Summary of changes:
 .../apf51_spvision_loader.bin}                     |  Bin 340604 -> 340604 bytes
 ...vision_loader.pod => apf51_spvision_loader.pod} |    4 +-
 firmware/sp_vision_config/README                   |   43 ---
 .../sp_vision_config/bitstream/top_testconfig.bit  |  Bin 149615 -> 0 bytes
 .../sp_vision_config/simulation/apf27_test_pkg.vhd |  157 --------
 .../imx27_wb16_wrapper/imx27_wb16_wrapper.vhd      |   92 -----
 .../imx27_wb16_wrapper00_mwb16_intercon.vhd        |  102 ------
 .../synthesis/rstgen_syscon/rstgen_syscon.vhd      |   61 ----
 .../spartan_select_map/spartan_selectmap.vhd       |  211 -----------
 firmware/sp_vision_config/synthesis/testconfig.tcl |   21 --
 firmware/sp_vision_config/synthesis/testconfig.ucf |   69 ----
 .../sp_vision_config/synthesis/top_testconfig.vhd  |  372 --------------------
 .../spvision_loader/sploader_prober.c              |    2 +-
 .../fpga/virtual_components/sploader/sp-loader.c   |    2 -
 14 files changed, 3 insertions(+), 1133 deletions(-)
 copy firmware/{wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin => pod_scripts/apf51_spvision_loader.bin} (88%)
 copy firmware/pod_scripts/{apf27_spvision_loader.pod => apf51_spvision_loader.pod} (80%)
 delete mode 100644 firmware/sp_vision_config/README
 delete mode 100644 firmware/sp_vision_config/bitstream/top_testconfig.bit
 delete mode 100644 firmware/sp_vision_config/simulation/apf27_test_pkg.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/imx27_wb16_wrapper/imx27_wb16_wrapper.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/imx27_wb16_wrapper00_mwb16/imx27_wb16_wrapper00_mwb16_intercon.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/rstgen_syscon/rstgen_syscon.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/spartan_select_map/spartan_selectmap.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/testconfig.tcl
 delete mode 100644 firmware/sp_vision_config/synthesis/testconfig.ucf
 delete mode 100644 firmware/sp_vision_config/synthesis/top_testconfig.vhd

diff --git a/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin b/firmware/pod_scripts/apf51_spvision_loader.bin
similarity index 88%
copy from firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin
copy to firmware/pod_scripts/apf51_spvision_loader.bin
index 35c6ba7..5950723 100644
Binary files a/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin and b/firmware/pod_scripts/apf51_spvision_loader.bin differ
diff --git a/firmware/pod_scripts/apf27_spvision_loader.pod b/firmware/pod_scripts/apf51_spvision_loader.pod
similarity index 80%
copy from firmware/pod_scripts/apf27_spvision_loader.pod
copy to firmware/pod_scripts/apf51_spvision_loader.pod
index b4a15bb..e560635 100644
--- a/firmware/pod_scripts/apf27_spvision_loader.pod
+++ b/firmware/pod_scripts/apf51_spvision_loader.pod
@@ -1,9 +1,9 @@
 create spvision_loader 
-selectplatform standard.apf27
+selectplatform standard.apf51
 delinstance irq_mngr00
 addinstance components.sp_vision_configure.wb16
 autoconnectbus
-generateintercon imx27_wb16_wrapper00.mwb16
+generateintercon imx51_wb16_wrapper00.mwb16
 generateintercon rstgen_syscon00.candroutput
 generatetop
 driver.selecttoolchain armadeus
diff --git a/firmware/sp_vision_config/README b/firmware/sp_vision_config/README
deleted file mode 100644
index f831609..0000000
--- a/firmware/sp_vision_config/README
+++ /dev/null
@@ -1,43 +0,0 @@
-sp_vision_config
-=======================
-
-This is a minimum design used to configure second fpga on sp_vision daugther
-board.
-This design is designed to configure a spartan6 with SelectMap Slave
-protocol.
-
-FPGA component
---------------
-
-Output component is composed of four 16 bits registers:
-
-|   offset   | name        | description                            |
-|:-----------|:-----------:|:--------------------------------------:|
-|    0x00    | ID          | component identifiant                  |
-|    0x02    | CONFIG      | configuration for control signals      |
-|    0x04    | STATUS      | control signals status                 |
-|    0x06    | DATA        | bitstream 16bits data sent to spartan6 |
-
-* ID : unique number to identify component.
-
-* CONFIG : Drive control signals
-
-| 15 downto 5 |  4  |  3   |  2  |    1    |   0   |
-|:-----------:|:---:|:----:|:---:|:-------:|:-----:|
-|     void    | CLK | void |CSI_n|PROGRAM_n|RDWR_n |
-
-CLK flag is used to switch composant in configuration mode :
-- When CLK=1, component is in idle mode, CCLK output drive general clock and
-	all other output signals are High impedance.
-- When CLK=0, the component is in fpga configuration mode.
-
-* STATUS : read input signal from fpga
-
-| 15 downto 3 |  2   | 1  |   0  |
-|:-----------:|:----:|:--:|:----:|
-|     void    |INIT_n|BUSY|RDWR_n|
-
-* DATA : 16 bits data wrote for configuring FPGA. 
-When a data is written in this register, the value is placed on data output
-port, and one cclk pulse is generated.
-
diff --git a/firmware/sp_vision_config/bitstream/top_testconfig.bit b/firmware/sp_vision_config/bitstream/top_testconfig.bit
deleted file mode 100644
index 288f718..0000000
Binary files a/firmware/sp_vision_config/bitstream/top_testconfig.bit and /dev/null differ
diff --git a/firmware/sp_vision_config/simulation/apf27_test_pkg.vhd b/firmware/sp_vision_config/simulation/apf27_test_pkg.vhd
deleted file mode 100644
index 232cdbd..0000000
--- a/firmware/sp_vision_config/simulation/apf27_test_pkg.vhd
+++ /dev/null
@@ -1,157 +0,0 @@
-----------------------------------------------
--- Design Name : Test bench utils for apf27
--- File Name : apf27_test_pkg.vhd
--- Function : Defines communication functions between imx and fpga
--- Author   : Fabien Marteau <fab...@ar...>
--- Version  : 1.00
----------------------------------------------
------------------------------------------------------------------------------------
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2, or (at your option)
--- any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-----------------------------------------------------------------------------------
-
-
-library ieee;
-use ieee.std_logic_1164.all;
-
-package apf27_test_pkg is
-
-    CONSTANT CS_MIN : time := 13.6 ns;
-    CONSTANT CLOCK_PERIOD : time := 7.5188 ns;
-    CONSTANT WE3 : time := 2.25 ns;
-    CONSTANT WE4 : time := 2.25 ns;
-
-    -- write procedures
-    -- Params :
-    --    address      : Write address 
-    --    value        : value to write 
-    --    gls_clk      : clock signal
-    --    imx_cs_n     : Chip select 
-    --    imx_oe_n     : Read signal
-    --    imx_eb3_n    : Write signal
-    --    imx_address  : Address signal
-    --    imx_data     : Data signal
-    --    WSC          : Value of imx WSC (see MC9328MXLRM.pdf p169) for sync=0
- 
-    procedure imx_write(
-    address     : in std_logic_vector (15 downto 0);
-    value       : in std_logic_vector (15 downto 0);
-    signal   gls_clk     : in std_logic ;
-    signal   imx_cs_n    : out std_logic ;
-    signal   imx_oe_n    : out std_logic ;
-    signal   imx_eb3_n   : out std_logic ;
-    signal   imx_address : out std_logic_vector (12 downto 1);
-    signal   imx_data    : out std_logic_vector (15 downto 0);
-    WSC         : natural
-);
-    -- read procedures
-    -- Params :
-    --    address      : Write address 
-    --    value        : value returned
-    --    gls_clk      : clock signal
-    --    imx_cs_n     : Chip select 
-    --    imx_oe_n     : Read signal
-    -