diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2013-07-08 00:24:32 +0200 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-07-15 10:06:36 +0000 |
| commit | 0f0545d6dc8e8bf1b472c9ef2afcb76739d22f80 (patch) | |
| tree | b8c452f39a1b80e4a533c51aa88340fdbf535493 /src | |
| parent | 7009d8f913e4e75c4eac7ef946b822ad8f44ae6d (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jtag/drivers/Makefile.am | 6 | ||||
| -rw-r--r-- | src/jtag/drivers/ulink.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 22bc89bb..e242cc67 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -6,9 +6,6 @@ libocdjtagdrivers_la_LIBADD = libocdjtagdrivers_la_SOURCES = \ $(DRIVERFILES) -ocddatadir = $(pkglibdir) -nobase_dist_ocddata_DATA = - ULINK_FIRMWARE = $(srcdir)/OpenULINK EXTRA_DIST = $(ULINK_FIRMWARE) @@ -78,7 +75,8 @@ DRIVERFILES += rlink.c rlink_speed_table.c endif if ULINK DRIVERFILES += ulink.c -nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex +ulinkdir = $(pkgdatadir)/OpenULINK +dist_ulink_DATA = $(ULINK_FIRMWARE)/ulink_firmware.hex endif if VSLLINK DRIVERFILES += versaloon/usbtoxxx/usbtogpio.c diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c index 82663392..c195bb2f 100644 --- a/src/jtag/drivers/ulink.c +++ b/src/jtag/drivers/ulink.c @@ -63,7 +63,7 @@ #define ULINK_RENUMERATION_DELAY 1500000 /** 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 */ #define SECTION_BUFFERSIZE 8192 |