Skip to contentSkip to conversation

Pull request for branch for-2012.02/host-tools

GIT PULL New Thomas Petazzoni 2 participants 15 messages Jan 28, 2012 – Feb 2, 2012

lore
Share & tools
lore
#0 lore raw

Hello,

This is the third posting of this patch set that allows some host utilities to be visible in menuconfig, when those host utilities are not simply build dependencies, but might also be directly interesting for the user (image creation utilities, device programming utilities, etc.).

Changes since v2 (posted on December, 28th 2011) :

* Ensured that the entries are sorted alphabetically

* Added Acked-by received by Buildroot contributors

* Rebased on current master

Changes since v1 (posted on October, 1st 2011) :

* Fix a commit log, as per the comment from Luca Ceresoli

* Add the SAM-BA utility from Atmel as another host utility. This tool can be used from the development machine to reflash a virgin AT91-based device, through USB or serial.

Regards,

Thomas

The following changes since commit 5796753b6b4caba703cf23f45f68b7715d1150a4:

mplayer: add optional vorbis dependency (2012-01-27 11:18:52 +0100)

are available in the git repository at:
http://free-electrons.com/~thomas/buildroot.git for-2012.02/host-tools

Thomas Petazzoni (7):
Add basic config infrastructure for host utilities
uboot-tools: expose host package in menuconfig
libftdi: add host variant
libusb-compat: add host variant
libusb: add host variant
openocd: add host variant
sam-ba: new package with host variant only

 Config.in                              |    2 ++
 package/Config.in.host                 |    7 +++++++
 package/libftdi/libftdi.mk             |    3 +++
 package/libusb-compat/libusb-compat.mk |    4 ++++
 package/libusb/libusb.mk               |    3 +++
 package/openocd/Config.in.host         |    6 ++++++
 package/openocd/openocd.mk             |   10 ++++++++++
 package/sam-ba/Config.in.host          |    6 ++++++
 package/sam-ba/sam-ba.mk               |   23 +++++++++++++++++++++++
 package/uboot-tools/Config.in.host     |    6 ++++++
 10 files changed, 70 insertions(+), 0 deletions(-)
 create mode 100644 package/Config.in.host
 create mode 100644 package/openocd/Config.in.host
 create mode 100644 package/sam-ba/Config.in.host
 create mode 100644 package/sam-ba/sam-ba.mk
 create mode 100644 package/uboot-tools/Config.in.host

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/7 Add basic config infrastructure for host utilities

Most of the host packages don't have to be exposed to the user as they are only used as build dependencies of target packages.

However, some host utilities, such as flashing utilities, image creation programs, specific debuggers, might be useful and should be presented to the user.

Therefore, we have a new global menu, which lists those host utilities. These utilities are described in package/*/Config.in.host files, which will be sourced by package/Config.in.host.

---
 Config.in              |    2 ++
 package/Config.in.host |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 package/Config.in.host
Config.in +2 -0
index ab77ef3..8579a63 100644
@@ -371,6 +371,8 @@ source "target/generic/Config.in"
 
 source "package/Config.in"
 
+source "package/Config.in.host"
+
 source "fs/Config.in"
 
 source "boot/Config.in"
package/Config.in.host new file +3 -0
new file mode 100644
index 0000000..54f6a59
@@ -0,0 +1,3 @@
+menu "Host utilities"
+
+endmenu
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 1/7 Add basic config infrastructure for host utilities

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Most of the host packages don't have to be exposed to the user as they Thomas> are only used as build dependencies of target packages.

Thomas> However, some host utilities, such as flashing utilities, image Thomas> creation programs, specific debuggers, might be useful and should be Thomas> presented to the user.

Thomas> Therefore, we have a new global menu, which lists those host Thomas> utilities. These utilities are described in package/*/Config.in.host Thomas> files, which will be sourced by package/Config.in.host.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/7 uboot-tools: expose host package in menuconfig

In reply to Thomas Petazzoni
---
 package/Config.in.host             |    2 ++
 package/uboot-tools/Config.in.host |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100644 package/uboot-tools/Config.in.host
package/Config.in.host +2 -0
index 54f6a59..b8f8aab 100644
@@ -1,3 +1,5 @@
 menu "Host utilities"
 
+source "package/uboot-tools/Config.in.host"
+
 endmenu
package/uboot-tools/Config.in.host new file +6 -0
new file mode 100644
index 0000000..7a844e9
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_UBOOT_TOOLS
+	bool "host u-boot tools"
+	help
+	  Companion tools for Das U-Boot bootloader.
+
+	  http://www.denx.de/wiki/U-Boot/WebHome
Signature · 1 line
1.7.4.1
#4 lore raw

PATCH 2/7 uboot-tools: expose host package in menuconfig

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 3/7 libftdi: add host variant

In reply to Thomas Petazzoni
---
 package/libftdi/libftdi.mk |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
package/libftdi/libftdi.mk +3 -0
index 55481d9..2c0afe7 100644
@@ -20,4 +20,7 @@ else
 LIBFDTI_CONF_OPT += --disable-libftdipp
 endif
 
+HOST_LIBFTDI_DEPENDENCIES = host-libusb-compat host-libusb
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
Signature · 1 line
1.7.4.1
#6 lore raw

PATCH 3/7 libftdi: add host variant

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> Acked-by: Luca Ceresoli <[email protected]>
Thomas> Acked-by: Thomas De Schampheleire <[email protected]> Thomas> ---

 Thomas>  package/libftdi/libftdi.mk |    3 +++

Thomas> 1 files changed, 3 insertions(+), 0 deletions(-)

Thomas> diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk Thomas> index 55481d9..2c0afe7 100644
Thomas> --- a/package/libftdi/libftdi.mk
Thomas> +++ b/package/libftdi/libftdi.mk
Thomas> @@ -20,4 +20,7 @@ else
Thomas> LIBFDTI_CONF_OPT += --disable-libftdipp
Thomas> endif

Thomas> +HOST_LIBFTDI_DEPENDENCIES = host-libusb-compat host-libusb

This line is no longer needed, so I dropped it. Other than that it looks fine - Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 4/7 libusb-compat: add host variant

In reply to Thomas Petazzoni
---
 package/libusb-compat/libusb-compat.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/libusb-compat/libusb-compat.mk +4 -0
index e39cdd8..99e7716 100644
@@ -18,4 +18,8 @@ endef
 
 LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG
 
+HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config host-libusb
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
+
Signature · 1 line
1.7.4.1
#8 lore raw

PATCH 4/7 libusb-compat: add host variant

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> Acked-by: Luca Ceresoli <[email protected]>
Thomas> Acked-by: Thomas De Schampheleire <[email protected]> Thomas> ---

 Thomas>  package/libusb-compat/libusb-compat.mk |    4 ++++

Thomas> 1 files changed, 4 insertions(+), 0 deletions(-)

Thomas> diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk Thomas> index e39cdd8..99e7716 100644
Thomas> --- a/package/libusb-compat/libusb-compat.mk
Thomas> +++ b/package/libusb-compat/libusb-compat.mk
Thomas> @@ -18,4 +18,8 @@ endef

Thomas> LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG

Thomas> +HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config host-libusb

I removed this one as well. This should go before the libftdi patch to not break the build, so I reordered (same for libusb).

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#9 lore raw

PATCH 5/7 libusb: add host variant

In reply to Thomas Petazzoni
---
 package/libusb/libusb.mk |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
package/libusb/libusb.mk +3 -0
index af75f5f..b3ca353 100644
@@ -10,4 +10,7 @@ LIBUSB_DEPENDENCIES = host-pkg-config
 LIBUSB_INSTALL_STAGING = YES
 LIBUSB_INSTALL_TARGET = YES
 
+HOST_LIBUSB_DEPENDENCIES = host-pkg-config
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
Signature · 1 line
1.7.4.1
#10 lore raw

PATCH 5/7 libusb: add host variant

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> Acked-by: Luca Ceresoli <[email protected]>
Thomas> Acked-by: Thomas De Schampheleire <[email protected]> Thomas> ---

 Thomas>  package/libusb/libusb.mk |    3 +++

Thomas> 1 files changed, 3 insertions(+), 0 deletions(-)

Thomas> diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk Thomas> index af75f5f..b3ca353 100644
Thomas> --- a/package/libusb/libusb.mk
Thomas> +++ b/package/libusb/libusb.mk
Thomas> @@ -10,4 +10,7 @@ LIBUSB_DEPENDENCIES = host-pkg-config Thomas> LIBUSB_INSTALL_STAGING = YES
Thomas> LIBUSB_INSTALL_TARGET = YES

Thomas> +HOST_LIBUSB_DEPENDENCIES = host-pkg-config

Same comments as libusb-compat. Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#11 lore raw

PATCH 6/7 openocd: add host variant

In reply to Thomas Petazzoni
---
 package/Config.in.host         |    1 +
 package/openocd/Config.in.host |    6 ++++++
 package/openocd/openocd.mk     |   10 ++++++++++
 3 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 package/openocd/Config.in.host
package/Config.in.host +1 -0
index b8f8aab..6bc828b 100644
@@ -1,5 +1,6 @@
 menu "Host utilities"
 
+source "package/openocd/Config.in.host"
 source "package/uboot-tools/Config.in.host"
 
 endmenu
package/openocd/Config.in.host new file +6 -0
new file mode 100644
index 0000000..2380942
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_OPENOCD
+	bool "host openocd"
+	help
+	  OpenOCD - Open On-Chip Debugger
+
+	  http://openocd.berlios.de/web/
package/openocd/openocd.mk +10 -0
index 5f61367..d79b33b 100644
@@ -29,4 +29,14 @@ ifeq ($(BR2_PACKAGE_OPENOCD_VSLLINK),y)
 OPENOCD_CONF_OPT += --enable-vsllink
 endif
 
+HOST_OPENOCD_DEPENDENCIES = host-libusb-compat host-libftdi
+
+HOST_OPENOCD_CONF_OPT = 	\
+	--disable-doxygen-html 	\
+	--enable-dummy 		\
+	--enable-ft2232_libftdi \
+	--enable-jlink 		\
+	--enable-vsllink
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
Signature · 1 line
1.7.4.1
#13 lore raw

PATCH 7/7 sam-ba: new package with host variant only

In reply to Thomas Petazzoni

sam-ba is a tool needed to reprogram AT91-based systems using an USB connection or a serial port connection.

---
 package/Config.in.host        |    1 +
 package/sam-ba/Config.in.host |    6 ++++++
 package/sam-ba/sam-ba.mk      |   23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 package/sam-ba/Config.in.host
 create mode 100644 package/sam-ba/sam-ba.mk
package/Config.in.host +1 -0
index 6bc828b..1f49e79 100644
@@ -1,6 +1,7 @@
 menu "Host utilities"
 
 source "package/openocd/Config.in.host"
+source "package/sam-ba/Config.in.host"
 source "package/uboot-tools/Config.in.host"
 
 endmenu
package/sam-ba/Config.in.host new file +6 -0
new file mode 100644
index 0000000..27ffd12
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_SAM_BA
+	bool "host sam-ba"
+	help
+	  Atmel SAM-BA software provides an open set of tools for
+	  programming the Atmel SAM3, SAM7 and SAM9 ARM-based
+	  microcontrollers.
package/sam-ba/sam-ba.mk new file +23 -0
new file mode 100644
index 0000000..bdad695
@@ -0,0 +1,23 @@
+SAM_BA_SITE    = http://www.atmel.com/dyn/resources/prod_documents/
+SAM_BA_VERSION = 2.10
+SAM_BA_SOURCE  = sam-ba_$(SAM_BA_VERSION).zip
+
+define HOST_SAM_BA_EXTRACT_CMDS
+        unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)
+        mv $(BUILD_DIR)/sam-ba_cdc_linux/* $(@D)
+        rmdir $(BUILD_DIR)/sam-ba_cdc_linux/
+endef
+
+# Since it's a prebuilt application and it does not conform to the
+# usual Unix hierarchy, we install it in $(HOST_DIR)/opt/sam-ba and
+# then create a symbolic link from $(HOST_DIR)/usr/bin to the
+# application binary, for easier usage.
+
+define HOST_SAM_BA_INSTALL_CMDS
+	mkdir -p $(HOST_DIR)/opt/sam-ba/
+	cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/
+	ln -s ../../opt/sam-ba/sam-ba $(HOST_DIR)/usr/bin/sam-ba
+endef
+
+$(eval $(call GENTARGETS,host))
+
Signature · 1 line
1.7.4.1
#14 lore raw

PATCH 7/7 sam-ba: new package with host variant only

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> sam-ba is a tool needed to reprogram AT91-based systems using an USB Thomas> connection or a serial port connection.

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> Acked-by: Luca Ceresoli <[email protected]>
Thomas> Acked-by: Thomas De Schampheleire <[email protected]> Thomas> ---

 Thomas>  package/Config.in.host        |    1 +
 Thomas>  package/sam-ba/Config.in.host |    6 ++++++
 Thomas>  package/sam-ba/sam-ba.mk      |   23 +++++++++++++++++++++++
 Thomas>  3 files changed, 30 insertions(+), 0 deletions(-)
 Thomas>  create mode 100644 package/sam-ba/Config.in.host
 Thomas>  create mode 100644 package/sam-ba/sam-ba.mk

Thomas> diff --git a/package/Config.in.host b/package/Config.in.host Thomas> index 6bc828b..1f49e79 100644
Thomas> --- a/package/Config.in.host
Thomas> +++ b/package/Config.in.host
Thomas> @@ -1,6 +1,7 @@
Thomas> menu "Host utilities"

Thomas> source "package/openocd/Config.in.host" Thomas> +source "package/sam-ba/Config.in.host" Thomas> source "package/uboot-tools/Config.in.host"

Thomas> endmenu
Thomas> diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host Thomas> new file mode 100644
Thomas> index 0000000..27ffd12
Thomas> --- /dev/null
Thomas> +++ b/package/sam-ba/Config.in.host
Thomas> @@ -0,0 +1,6 @@
Thomas> +config BR2_PACKAGE_HOST_SAM_BA
Thomas> + bool "host sam-ba"
Thomas> + help

 Thomas> +	  Atmel SAM-BA software provides an open set of tools for
 Thomas> +	  programming the Atmel SAM3, SAM7 and SAM9 ARM-based
 Thomas> +	  microcontrollers.

I added

http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools

As upstream URL. Otherwise it looks good - Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard