Commit Graph

29 Commits

Author SHA1 Message Date
Thomas Petazzoni
a148e2da7b openocd: remove BR2_ARCH_HAS_ATOMICS dependency
For some reason, since when openocd was introduced, it was using a
BR2_ARCH_HAS_ATOMICS dependency for all sub-options that selected
BR2_PACKAGE_LIBFTDI1, even if the libftdi1 package did not have any
atomics dependency. Maybe it was confused with the libftdi package,
which did have a BR2_ARCH_HAS_ATOMICS dependency ?

Regardless, openocd with all four sub-options that currently depend on
BR2_ARCH_HAS_ATOMICS builds perfectly fine with a toolchain that does
not implement any of the __sync atomic built-ins, so we can remove the
BR2_ARCH_HAS_ATOMICS dependency.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-01-26 21:33:07 +01:00
Romain Naour
ee2f413800 package/openocd: select libusb when selecting libusb-compat
libusb-compat depends on libusb package, so we need to select
libusb package at the same time as libusb-compat to avoid an
unmet dependency.

Since 28f67899e5, the build
stop if a package build is trigged at Makefile level without
being selected at Config.in level.

This is the case here with BR2_PACKAGE_OPENOCD_USBPROG which
select BR2_PACKAGE_LIBUSB_COMPAT without selecting
BR2_PACKAGE_LIBUSB.

Fixes:
http://autobuild.buildroot.net/results/b4a/b4a8c54eed6bf75ab8ade0653953d19792155727/

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-01 19:56:22 +01:00
Yegor Yefremov
827bf7a24f openocd: bump to 0.9.0
Remove obsolete compilation error patch and update jimtcl related patch.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-01 17:35:41 +01:00
Robert P. J. Day
a241b30278 package: update some home page URLs in Config.in.host files
Some URLs for package/*/Config.in.host files could use some updating.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-18 15:59:34 +02:00
Baruch Siach
37209ef589 openocd: openjtag needs libusb-compat
Since commit 9bdf5926 (package/openocd: depends on libftdi1 instead of
libftdi) the OpenJTAG Programmer can be built without libusb-compat, that is a
dependency of libftdi (but not libftdi1). This breaks the build, because
openjtag.c uses libusb-compat headers. Select BR2_PACKAGE_LIBUSB_COMPAT to fix
this.

Fixes:
http://autobuild.buildroot.net/results/d19/d1969e6df56835568fb908b7f252aec0915d9fa4/
http://autobuild.buildroot.net/results/f06/f06ed6df6138ab399036c397c3f72d33d64fe0a3/
http://autobuild.buildroot.net/results/bd7/bd7f90f3cc1d2b395f9849eb0630c2602a075bf5/
...

Cc: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-25 00:43:00 +01:00
Samuel Martin
9bdf592654 package/openocd: depends on libftdi1 instead of libftdi
Note that, if both libftdi and libftdi1 are available, openocd will
prefer libftdi1, so does Buildroot. ;-)

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-20 23:30:08 +01:00
Samuel Martin
0eec7d8fec package/openocd: disable aice programmer on non-MMU architecture
aice sources use fork function, which is only available on architecture
with MMU.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-03 21:28:51 +01:00
Samuel Martin
deef3a89c8 package/openocd: explicitly disable unselected adapters
Some adapters are automatically enabled, but may not be built because of
missing (archecture) dependencies. So, just set the options symetrically.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-03 21:28:35 +01:00
Thomas Petazzoni
2b937ae4a0 openocd: pass --disable-werror to fix build issues
Should fix:

  http://autobuild.buildroot.org/results/91d/91d2ae34f14f1978e0985e75f803055d51201a93/

and similar build problems.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-02 20:32:47 +01:00
claurita
aa441aa84c openocd: bump to version 0.8.0
This patch adds the management of (almost) all the config options of
openocd 0.8.0. A BR config variable is added for (almost) every
adapter known to openocd and all the dependencies are automatically
calculated from the chosen adapters, so only the necessary libraries
are built.

Note that CMSIS_DAP adapter requires hidapi (not libhid) and hidapi is
not actually included in buildroot, so it has been removed.  Also
zy1000 adapters are actually broken in openocd and have been removed.

The host version of the package enables all the possible adapters and
the related libraries.

[Thomas:
 - Slightly fixup the commit log.
 - Rename the patches to the new patch naming convention.
 - Update hash file using a contribution from Vincent Stehlé.
 - Move the thread dependency from the OpenOCD option down to each
   sub-option that actually needs it (when it needs libusb,
   libusb-compat or libftdi). We keep only one comment, as we would
   otherwise have to add too many repeatitive comments.
 - Remove commented options.
 - Add missing dependency on BR2_ARCH_HAS_ATOMICS when selecting
   BR2_PACKAGE_LIBFTDI.
 - Remove trailing white spaces.
 - Pass -std=gnu99, needed to build with a basic toolchain.
 - Write the OPENOCD_DEPENDENCIES and OPENOCD_CONF_OPTS conditions in
   a more compact way.
 - Adjust indentation for HOST_OPENOCD_CONF_OPTS.
 - Reword the comment above HOST_OPENOCD_CONF_OPTS.]

Signed-off-by: Claudio Laurita <claudio.laurita@integrazionetotale.it>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-02 16:30:15 +01:00
Yann E. MORIN
2ced21f8f9 package: add hashes for SourceForge-hosted packages
Since SourceForge sometimes serves us faulty tarballs, we can tons of
autobuild failures:
    http://autobuild.buildroot.org/results/9fb/9fba5bf086a4e7a29e5f7156ec43847db7aacfc4/
    http://autobuild.buildroot.org/results/6c8/6c837b244c45ac3b3a887734a371cd6d226cf216/
    ...

Fix that by adding hash files for all SourceForge-hosted packages (thos
etht did not already have it).

We normally prefer to use hashes published by upstream, but hunting them
all one by one is a tedious task, so those hashes were all locally
computed with a script that searched for SF-hosted packages, downloades
the associated tarball, computed the hash, and stored it in the
corresponding .hash file.

Also, SF publishes sha1 hashes, while I used the stronger sha256, since
sha1 is now considered to be relatively weak.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Cc: Richard Braun <rbraun@sceen.net>
Cc: Nathaniel Roach <nroach44@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-28 22:21:16 +01:00
Thomas De Schampheleire
aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Anton Kolesov
669ce8c75e libftdi: add dependency on atomic operations
This fixes:
http://autobuild.buildroot.net/results/6cb25ed954840109c9d0e582e922b0ba9d07e174/

Signed-off-by: Anton Kolesov <Anton.Kolesov@synopsys.com>
[yann.morin.1998@free.fr: use the new symbol; remove comment strings]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-18 11:00:17 +02:00
Gustavo Zacarias
f4f5699199 openocd: add license information
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-25 23:09:51 +02:00
Gustavo Zacarias
ee7057c1c7 openocd: switch homepage now that berlios is gone
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-18 14:04:14 +02:00
Thomas De Schampheleire
66bb10b7b0 Config.in files: unify comments of toolchain option dependencies
This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-14 22:45:57 +02:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Thomas Petazzoni
0e4d25ff0f packages: remove all := signs
Finally get rid of all := used for variable definitions in packages,
as we suggest in our manual and during the review of new packages.

While I was at it, I also sometimes added a few missing new lines
between the header and the first variable definition.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-20 20:49:02 +01:00
Stefan Fröberg
23ef45ca1e remove rest of the BR2_SOURCEFORGE_MIRROR references
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-28 22:59:52 +02:00
Gustavo Zacarias
09a29b6a89 libusb: needs thread support
libusb needs thread support, and so do other packages that depend on it.

[thomas.petazzoni@free-electrons.com: adds threads dependency to
libnfc-llp, which selects libnfc.]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-30 21:27:10 +02:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Arnout Vandecappelle (Essensium/Mind)
69e64c42b7 all packages: use new host-xxx-package macros
This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS,host))/$(eval $(host-generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS,host))/$(eval $(host-autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS,host))/$(eval $(host-cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:18:03 +02:00
Gustavo Zacarias
ff3cf35680 openocd: fix breakage with newer autotools
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-24 19:49:13 +02:00
Peter Korsgaard
2b81a500f9 openocd: fix libftdi dependency if _FT2XXX option is selected
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-02 21:05:47 +01:00
Thomas Petazzoni
375d68d110 openocd: add host variant
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-02 21:02:26 +01:00
Peter Korsgaard
839ee76187 openocd: libusb patch: append rather than override LDFLAGS
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-09 22:02:51 +02:00
Peter Korsgaard
a5094a056a openocd: remove fixed ldflags breaking build
The openocd configure script would forcibly add -L/usr/lib to LDFLAGS,
causing the cross compiler to use host libraries, breaking the build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-05 22:50:41 +02:00
Thomas Petazzoni
300f9c9c9d package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:12:27 +02:00
Jean-Christophe PLAGNIOL-VILLARD
6c213d64b3 package: add openocd support
with only the following Adapters
 - FTDI FT2xxx/FT4xxx
 - J-Link (Segger and Atmel SAM-ICE)
 - Versaloon-Link JTAG Adapter

[Peter: Config.in tweaks]
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-21 22:59:15 +02:00