HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r34:21db59beeea7

Fixed Makefile (C drivers) for mingw users

yannic -

r34:21db59beeea7 default

parent child

Context file:

r34:21db59beeea7

Collapse all files

LPP_drivers/Makefile +42 -37

@@ -1,37 +1,42
1	#------------------------------------------------------------------------------	1	#------------------------------------------------------------------------------
2	#-- This file is a part of the LPP VHDL IP LIBRARY	2	#-- This file is a part of the LPP VHDL IP LIBRARY
3	#-- Copyright (C) 2010, Laboratory of Plasmas Physic - CNRS	3	#-- Copyright (C) 2010, Laboratory of Plasmas Physic - CNRS
4	#--	4	#--
5	#-- This program is free software; you can redistribute it and/or modify	5	#-- This program is free software; you can redistribute it and/or modify
6	#-- it under the terms of the GNU General Public License as published by	6	#-- it under the terms of the GNU General Public License as published by
7	#-- the Free Software Foundation; either version 3 of the License, or	7	#-- the Free Software Foundation; either version 3 of the License, or
8	#-- (at your option) any later version.	8	#-- (at your option) any later version.
9	#--	9	#--
10	#-- This program is distributed in the hope that it will be useful,	10	#-- This program is distributed in the hope that it will be useful,
11	#-- but WITHOUT ANY WARRANTY; without even the implied warranty of	11	#-- but WITHOUT ANY WARRANTY; without even the implied warranty of
12	#-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	#-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	#-- GNU General Public License for more details.	13	#-- GNU General Public License for more details.
14	#--	14	#--
15	#-- You should have received a copy of the GNU General Public License	15	#-- You should have received a copy of the GNU General Public License
16	#-- along with this program; if not, write to the Free Software	16	#-- along with this program; if not, write to the Free Software
17	#-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	17	#-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	#------------------------------------------------------------------------------	18	#------------------------------------------------------------------------------
19		19
20	.PHONY:exemples lib	20
21		21
22	all:	22	all:
23	make all -C libsrc	23	mkdir -p lib/
24	make all -C exemples	24	mkdir -p includes/
25		25	make all -C libsrc
26		26	make all -C exemples
27	exemples:	27
28	make all -C exemples	28	.PHONY:exemples lib
29		29
30		30	exemples:
31	lib:	31	make all -C exemples
32	make all -C libsrc	32
33		33
34		34	lib:
35	clean:	35	mkdir -p lib/
36	rm lib/*	36	mkdir -p includes/
37	rm includes/*	37	make all -C libsrc
		38
		39
		40	clean:
		41	rm lib/*
		42	rm includes/*

LPP_drivers/exemples/ScanAPB/bin/ScanAPB.bin binary modified 0 0

NO CONTENT: modified file, binary diff hidden

LPP_drivers/libsrc/Makefile +34 -64

@@ -1,64 +1,34
1	#------------------------------------------------------------------------------	1	#------------------------------------------------------------------------------
2	#-- This file is a part of the LPP VHDL IP LIBRARY	2	#-- This file is a part of the LPP VHDL IP LIBRARY
3	#-- Copyright (C) 2010, Laboratory of Plasmas Physic - CNRS	3	#-- Copyright (C) 2010, Laboratory of Plasmas Physic - CNRS
4	#--	4	#--
5	#-- This program is free software; you can redistribute it and/or modify	5	#-- This program is free software; you can redistribute it and/or modify
6	#-- it under the terms of the GNU General Public License as published by	6	#-- it under the terms of the GNU General Public License as published by
7	#-- the Free Software Foundation; either version 3 of the License, or	7	#-- the Free Software Foundation; either version 3 of the License, or
8	#-- (at your option) any later version.	8	#-- (at your option) any later version.
9	#--	9	#--
10	#-- This program is distributed in the hope that it will be useful,	10	#-- This program is distributed in the hope that it will be useful,
11	#-- but WITHOUT ANY WARRANTY; without even the implied warranty of	11	#-- but WITHOUT ANY WARRANTY; without even the implied warranty of
12	#-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	#-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	#-- GNU General Public License for more details.	13	#-- GNU General Public License for more details.
14	#--	14	#--
15	#-- You should have received a copy of the GNU General Public License	15	#-- You should have received a copy of the GNU General Public License
16	#-- along with this program; if not, write to the Free Software	16	#-- along with this program; if not, write to the Free Software
17	#-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	17	#-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	#------------------------------------------------------------------------------	18	#------------------------------------------------------------------------------
19		19
20	include ../rules.mk	20	include ../rules.mk
21		21
22		22
23		23
24	all:	24	all:
25	make all -C AMBA	25	make all -C AMBA
26	make all -C LCD	26	make all -C LCD
27	make all -C DAC	27	make all -C DAC
28		28
29		29
30	cleanall:	30	cleanall:
31	make clean -C AMBA	31	make clean -C AMBA
32	make clean -C LCD	32	make clean -C LCD
33	make clean -C DAC	33	make clean -C DAC
34	#------------------------------------------------------------------------------	34
35	#-- This file is a part of the LPP VHDL IP LIBRARY
36	#-- Copyright (C) 2010, Laboratory of Plasmas Physic - CNRS
37	#--
38	#-- This program is free software; you can redistribute it and/or modify
39	#-- it under the terms of the GNU General Public License as published by
40	#-- the Free Software Foundation; either version 3 of the License, or
41	#-- (at your option) any later version.
42	#--
43	#-- This program is distributed in the hope that it will be useful,
44	#-- but WITHOUT ANY WARRANTY; without even the implied warranty of
45	#-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
46	#-- GNU General Public License for more details.
47	#--
48	#-- You should have received a copy of the GNU General Public License
49	#-- along with this program; if not, write to the Free Software
50	#-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51	#------------------------------------------------------------------------------
52
53	include ../rules.mk
54
55
56
57	all:
58	make all -C AMBA
59	make all -C LCD
60
61
62	cleanall:
63	make clean -C AMBA
64	make clean -C LCD

LPP_drivers/rules.mk +67 -70

@@ -1,70 +1,67
1	#------------------------------------------------------------------------------	1	#------------------------------------------------------------------------------
2	#-- This file is a part of the LPP VHDL IP LIBRARY	2	#-- This file is a part of the LPP VHDL IP LIBRARY
3	#-- Copyright (C) 2010, Laboratory of Plasmas Physic - CNRS	3	#-- Copyright (C) 2010, Laboratory of Plasmas Physic - CNRS
4	#--	4	#--
5	#-- This program is free software; you can redistribute it and/or modify	5	#-- This program is free software; you can redistribute it and/or modify
6	#-- it under the terms of the GNU General Public License as published by	6	#-- it under the terms of the GNU General Public License as published by
7	#-- the Free Software Foundation; either version 3 of the License, or	7	#-- the Free Software Foundation; either version 3 of the License, or
8	#-- (at your option) any later version.	8	#-- (at your option) any later version.
9	#--	9	#--
10	#-- This program is distributed in the hope that it will be useful,	10	#-- This program is distributed in the hope that it will be useful,
11	#-- but WITHOUT ANY WARRANTY; without even the implied warranty of	11	#-- but WITHOUT ANY WARRANTY; without even the implied warranty of
12	#-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	#-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	#-- GNU General Public License for more details.	13	#-- GNU General Public License for more details.
14	#--	14	#--
15	#-- You should have received a copy of the GNU General Public License	15	#-- You should have received a copy of the GNU General Public License
16	#-- along with this program; if not, write to the Free Software	16	#-- along with this program; if not, write to the Free Software
17	#-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	17	#-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	#------------------------------------------------------------------------------	18	#------------------------------------------------------------------------------
19		19
20	CC = sparc-elf-gcc	20	CC = sparc-elf-gcc
21	AR = sparc-elf-ar	21	AR = sparc-elf-ar
22	LIBDIR = ../../lib/	22	LIBDIR = ../../lib/
23	INCPATH = ../../includes	23	INCPATH = ../../includes
24	SCRIPTDIR=../../scripts/	24	SCRIPTDIR=../../scripts/
25	OUTBINDIR=bin/	25	OUTBINDIR=bin/
26	EXEC=exec.bin	26	EXEC=exec.bin
27	INPUTFILE=main.c	27	INPUTFILE=main.c
28		28
29		29
30	all:bin	30
31	@echo " "	31	$(FILE): $(FILE).a
32		32	@echo "library ""lib"$(FILE)" created"
33		33
34	$(FILE): $(FILE).a	34
35	@echo "library ""lib"$(FILE)" created"	35	$(FILE).o:
36		36	mkdir -p tmp
37		37	$(CC) -c $(FILE).c -I $(INCPATH) -o tmp/$(FILE).o
38	$(FILE).o:	38
39	mkdir -p tmp	39	$(FILE).a: $(FILE).o
40	$(CC) -c $(FILE).c -I $(INCPATH) -o tmp/$(FILE).o	40	$(AR) rs $(LIBDIR)"lib"$(FILE).a tmp/$(FILE).o
41		41	cp *.h $(INCPATH)
42	$(FILE).a: $(FILE).o	42	rm -R tmp
43	$(AR) rs $(LIBDIR)"lib"$(FILE).a tmp/$(FILE).o	43
44	cp *.h $(INCPATH)	44	load: all
45	rm -R tmp	45	@echo "load "$(OUTBINDIR)$(EXEC)>$(SCRIPTDIR)load.txt
46		46	grmon-eval -uart $(PORT) -u -c $(SCRIPTDIR)load.txt
47	load: all	47
48	@echo "load "$(OUTBINDIR)$(EXEC)>$(SCRIPTDIR)load.txt	48	bin:
49	grmon-eval -uart $(PORT) -u -c $(SCRIPTDIR)load.txt	49	mkdir -p $(OUTBINDIR)
50		50	$(CC) $(INPUTFILE) -o $(OUTBINDIR)/$(EXEC) -I $(INCPATH) -L $(LIBDIR) -static $(LIBS)
51	bin:	51
52	mkdir -p $(OUTBINDIR)	52
53	$(CC) $(INPUTFILE) -o $(OUTBINDIR)/$(EXEC) -I $(INCPATH) -L $(LIBDIR) -static $(LIBS)	53	clean:
54		54	rm -f -R tmp
55		55	rm -f *.{o,a}
56	clean:	56	rm -f $(INCPATH)*.h
57	rm -f -R tmp	57	rm -f $(LIBDIR)*.{o,a}
58	rm -f *.{o,a}	58
59	rm -f $(INCPATH)*.h	59
60	rm -f $(LIBDIR)*.{o,a}	60	ruleshelp:
61		61	@echo ""
62		62	@echo ""
63	ruleshelp:	63	@echo ""
64	@echo ""	64	@echo " load : call grmon-eval and loads "$(EXEC)" in the leon"
65	@echo ""	65	@echo " usage: make PORT=/dev/ttyUSBx load"
66	@echo ""	66
67	@echo " load : call grmon-eval and loads "$(EXEC)" in the leon"	67
68	@echo " usage: make PORT=/dev/ttyUSBx load"
69
70

Makefile +3 -1

             SCRIPTSDIR=scripts/
             LIBDIR=lib/
             BOARDSDIR=boards/
             DESIGNSDIR=designs/
             all: help
             help:
             	@echo
             	@echo " batch targets:"
             	@echo
             	@echo " make Patch-GRLIB     : install library into GRLIB at : $(GRLIB)"
             	@echo " make dist            : create a tar file for using into an other computer"
             	@echo " make Patched-dist    : create a tar file for with a patched grlib for using into an other computer"
             	@echo " make allGPL          : add a GPL HEADER in all vhdl Files"
             	@echo " make init            : add a GPL HEADER in all vhdl Files, init all files"
             	@echo " make doc             : make documentation for VHDL IPs"
             	@echo " make pdf             : make pdf documentation for VHDL IPs"
             	@echo
             allGPL:
             	@echo "Scanning VHDL files ..."
             	sh $(SCRIPTSDIR)/GPL_Patcher.sh -R vhd lib
             	@echo "Scanning C files ..."
             	sh $(SCRIPTSDIR)/GPL_Patcher.sh -R c LPP_drivers
             	@echo "Scanning H files ..."
             	sh $(SCRIPTSDIR)/GPL_Patcher.sh -R h LPP_drivers
-            init:
+            init: C-libs
             	sh $(SCRIPTSDIR)/vhdlsynPatcher.sh
             	sh $(SCRIPTSDIR)/makeDirs.sh lib/lpp
+            C-libs:
             	make -C LPP_drivers
             Patch-GRLIB: init doc
             	sh $(SCRIPTSDIR)/patch.sh $(GRLIB)
             dist: init
             	tar -cvzf ./../lpp-lib.tgz ./../VHD_Lib/*
             Patched-dist: Patch-GRLIB
             	tar -cvzf ./../lpp-patched-GRLIB.tgz $(GRLIB)/*
             doc:
             	doxygen lib/lpp/Doxyfile
             pdf: doc
             	sh $(SCRIPTSDIR)/doc.sh

lib/lpp/lpp_amba/lpp_amba.vhd +18 0

             ------------------------------------------------------------------------------
             --  This file is a part of the LPP VHDL IP LIBRARY
             --  Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
             --
             --  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 3 of the License, 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------
             library ieee;
             use ieee.std_logic_1164.all;
             library grlib;
             use grlib.amba.all;
             -- pragma translate_off
             use std.textio.all;
             -- pragma translate_on
             package lpp_amba is
             constant VENDOR_LPP        : amba_vendor_type := 16#19#;
             -- LPP device ids
             constant ROCKET_TM	                : amba_device_type := 16#001#;
             constant otherCore         	        : amba_device_type := 16#002#;
             constant LPP_SIMPLE_DIODE	        : amba_device_type := 16#003#;
             constant LPP_MULTI_DIODE	        : amba_device_type := 16#004#;
             constant LPP_LCD_CTRLR		        : amba_device_type := 16#005#;
             constant LPP_UART                       : amba_device_type := 16#006#;
             constant LPP_CNA                        : amba_device_type := 16#007#;
             constant LPP_ADC_7688                   : amba_device_type := 16#008#;
+            constant LPP_CHENILLARD                 : amba_device_type := 16#009#;
+            component APB_CHENILLARD is
+              generic (
+                pindex   : integer := 0;
+                paddr    : integer := 0;
+                pmask    : integer := 16#fff#;
+                pirq     : integer := 0;
+                abits    : integer := 8);
+              port (
+                rst    : in  std_ulogic;
+                clk    : in  std_ulogic;
+                RegLed : in std_logic_vector (7 downto 0);
+                apbi   : in  apb_slv_in_type;
+                apbo   : out apb_slv_out_type;
+                Leds   : out std_logic_vector (7 downto 0)
+                );
+            end component;
             component APB_SIMPLE_DIODE is
               generic (
                 pindex   : integer := 0;
                 paddr    : integer := 0;
                 pmask    : integer := 16#fff#;
                 pirq     : integer := 0;
                 abits    : integer := 8);
               port (
                 rst    : in  std_ulogic;
                 clk    : in  std_ulogic;
                 apbi   : in  apb_slv_in_type;
                 apbo   : out apb_slv_out_type;
                 LED    : out std_ulogic
                 );
             end component;
             component APB_MULTI_DIODE is
               generic (
                 pindex   : integer := 0;
                 paddr    : integer := 0;
                 pmask    : integer := 16#fff#;
                 pirq     : integer := 0;
                 abits    : integer := 8);
               port (
                 rst    : in  std_ulogic;
                 clk    : in  std_ulogic;
                 apbi   : in  apb_slv_in_type;
                 apbo   : out apb_slv_out_type;
                 LED    : out std_logic_vector(2 downto 0)
                 );
             end component;
             end;

lib/lpp/lpp_amba/vhdlsyn.txt +1 -2

+            APB_CHENILLARD.vhd
             APB_MULTI_DIODE.vhd
-            APB_MULTI_DIODE.vhd.orig
             APB_SIMPLE_DIODE.vhd
-            APB_SIMPLE_DIODE.vhd.orig
             lpp_amba.vhd

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages