zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ulink: Move firmware install from pkglibdir to pkgdatadir 

The precompiled OpenULINK firmware is just data to OpenOCD so I think it
belongs in $(prefix)/share/openocd rather than in $(prefix)/lib.

Change-Id: Id84c32cd0ddfb96861e903e8f23c16a81e1a0ca1
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1487
Tested-by: jenkins
Reviewed-by: Martin Schmölzer <martin.schmoelzer@student.tuwien.ac.at>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
__archive__
Andreas Fritiofson 2013-07-08 00:24:32 +02:00 committed by Spencer Oliver
parent 7009d8f913
commit 0f0545d6dc
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jtag/drivers/Makefile.am
View File

@ -6,9 +6,6 @@ libocdjtagdrivers_la_LIBADD =
libocdjtagdrivers_la_SOURCES = \ libocdjtagdrivers_la_SOURCES = \
$(DRIVERFILES) $(DRIVERFILES)
ocddatadir = $(pkglibdir)
nobase_dist_ocddata_DATA =
ULINK_FIRMWARE = $(srcdir)/OpenULINK ULINK_FIRMWARE = $(srcdir)/OpenULINK
EXTRA_DIST = $(ULINK_FIRMWARE) EXTRA_DIST = $(ULINK_FIRMWARE)
@ -78,7 +75,8 @@ DRIVERFILES += rlink.c rlink_speed_table.c
endif endif
if ULINK if ULINK
DRIVERFILES += ulink.c DRIVERFILES += ulink.c
nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex ulinkdir = $(pkgdatadir)/OpenULINK
dist_ulink_DATA = $(ULINK_FIRMWARE)/ulink_firmware.hex
endif endif
if VSLLINK if VSLLINK
DRIVERFILES += versaloon/usbtoxxx/usbtogpio.c DRIVERFILES += versaloon/usbtoxxx/usbtogpio.c

2
src/jtag/drivers/ulink.c
View File

@ -63,7 +63,7 @@
#define ULINK_RENUMERATION_DELAY 1500000 #define ULINK_RENUMERATION_DELAY 1500000
/** Default location of OpenULINK firmware image. */ /** Default location of OpenULINK firmware image. */
#define ULINK_FIRMWARE_FILE PKGLIBDIR "/OpenULINK/ulink_firmware.hex" #define ULINK_FIRMWARE_FILE PKGDATADIR "/OpenULINK/ulink_firmware.hex"
/** Maximum size of a single firmware section. Entire EZ-USB code space = 8kB */ /** Maximum size of a single firmware section. Entire EZ-USB code space = 8kB */
#define SECTION_BUFFERSIZE 8192 #define SECTION_BUFFERSIZE 8192