[Buildroot] [PATCH 1/2] omap-u-boot-utils: add new package

[Buildroot] [PATCH 1/2] omap-u-boot-utils: add new package

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 boot/Config.in                                 |    1 +
 boot/omap-u-boot-utils/Config.in               |    7 ++++++
 package/omap-u-boot-utils/omap-u-boot-utils.mk |   25 ++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 boot/omap-u-boot-utils/Config.in
 create mode 100644 package/omap-u-boot-utils/omap-u-boot-utils.mk

diff --git a/boot/Config.in b/boot/Config.in
index 2a97695..7e5a52d 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -7,6 +7,7 @@ source "boot/uboot/Config.in"
 source "boot/at91bootstrap/Config.in"
 source "boot/at91dataflashboot/Config.in"
 source "boot/xloader/Config.in"
+source "boot/omap-u-boot-utils/Config.in"
 
 endmenu
 
diff --git a/boot/omap-u-boot-utils/Config.in b/boot/omap-u-boot-utils/Config.in
new file mode 100644
index 0000000..3e4567c
--- /dev/null
+++ b/boot/omap-u-boot-utils/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
+	bool "omap-u-boot-utils"
+	help
+	  U-Boot Utilities for Texas Instrument's OMAP platforms.
+	  Say Y if you want these utilities on the development host.
+
+	  https://github.com/nmenon/omap-u-boot-utils
diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
new file mode 100644
index 0000000..dc5b22c
--- /dev/null
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -0,0 +1,25 @@
+#############################################################
+#
+# omap-u-boot-utils
+#
+#############################################################
+
+OMAP_U_BOOT_UTILS_VERSION = d086cb5c0
+OMAP_U_BOOT_UTILS_SOURCE = omap-u-boot-utils-$(OMAP_U_BOOT_UTILS_VERSION).tar.gz
+OMAP_U_BOOT_UTILS_SITE = git://github.com/nmenon/omap-u-boot-utils.git
+OMAP_U_BOOT_UTILS_SITE_METHOD = git
+
+OMAP_U_BOOT_UTILS_TARGETS = gpsign pserial tagger ucmd ukermit
+
+define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS
+	for f in ${OMAP_U_BOOT_UTILS_TARGETS} ; do \
+		[ -f ${HOST_DIR}/usr/bin/$$f ] || \
+		  install -m 755 -D $(@D)/$$f ${HOST_DIR}/usr/bin/$$f ; \
+	done
+endef
+
+$(eval $(call GENTARGETS,package,omap-u-boot-utils,host))
-- 
1.7.4.1

[Buildroot] [PATCH 2/2] u-boot: build signed image for OMAP processors

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 boot/uboot/Config.in |   15 +++++++++++++++
 boot/uboot/uboot.mk  |   24 ++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index a0b2bfc..5a8af98 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -91,6 +91,21 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 
 endchoice
 
+config BR2_TARGET_UBOOT_OMAP_IFT
+	depends on BR2_TARGET_UBOOT_FORMAT_BIN
+	select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
+	bool "produce a .ift signed image (OMAP)"
+	help
+	  Use gpsign to produce an image of u-boot.bin signed with
+	  a Configuration Header for booting on OMAP processors.
+
+if BR2_TARGET_UBOOT_OMAP_IFT
+
+config BR2_TARGET_UBOOT_OMAP_IFT_CONFIG
+	string "gpsign Configuration Header config file"
+
+endif
+
 menuconfig BR2_TARGET_UBOOT_NETWORK
 	bool "Network Settings"
 	default y
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 776bdef..499aab9 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -29,6 +29,9 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
 UBOOT_BIN          = u-boot.ldr
 else
 UBOOT_BIN          = u-boot.bin
+ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
+UBOOT_BIN_IFT      = ${UBOOT_BIN}.ift
+endif
 endif
 
 UBOOT_ARCH=$(KERNEL_ARCH)
@@ -84,10 +87,31 @@ define UBOOT_BUILD_CMDS
 		$(UBOOT_MAKE_TARGET)
 endef
 
+define UBOOT_BUILD_OMAP_IFT
+	${HOST_DIR}/usr/bin/gpsign -f $(@D)/u-boot.bin \
+		-c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))
+endef
+
 define UBOOT_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
 endef
 
+define UBOOT_INSTALL_OMAP_IFT_IMAGE
+	cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/
+endef
+
+ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
+# we NEED a config file unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)),)
+$(error No gpsign config file. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
+endif
+endif
+UBOOT_DEPENDENCIES += host-omap-u-boot-utils
+UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
+endif
+
 $(eval $(call GENTARGETS,boot,uboot))
 
 ifeq ($(BR2_TARGET_UBOOT),y)
-- 
1.7.4.1

[Buildroot] [PATCH 1/2] omap-u-boot-utils: add new package

[Thomas Petazzoni]

Le Tue, 13 Sep 2011 19:19:32 +0200,
Luca Ceresoli <luca@lucaceresoli.net> a ?crit :

> +++ b/boot/omap-u-boot-utils/Config.in
> @@ -0,0 +1,7 @@
> +config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
> +	bool "omap-u-boot-utils"
> +	help
> +	  U-Boot Utilities for Texas Instrument's OMAP platforms.
> +	  Say Y if you want these utilities on the development host.
> +
> +	  https://github.com/nmenon/omap-u-boot-utils

This is a pure host package, so it shouldn't be present in any
Config.in file. See package/fakeroot as an example.

And even if it also was a target package, the Config.in should be in
the package directory, not in boot/.

> +OMAP_U_BOOT_UTILS_VERSION = d086cb5c0
> +OMAP_U_BOOT_UTILS_SOURCE = omap-u-boot-utils-$(OMAP_U_BOOT_UTILS_VERSION).tar.gz

xxx_SOURCE is useless with the git download method.

> +OMAP_U_BOOT_UTILS_TARGETS = gpsign pserial tagger ucmd ukermit

Used only once, just hardcode.

Otherwise looks good!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 2/2] u-boot: build signed image for OMAP processors

[Gustavo Zacarias]

On Tue, 13 Sep 2011 19:19:33 +0200, Luca Ceresoli wrote:

> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> ---
>  boot/uboot/Config.in |   15 +++++++++++++++
>  boot/uboot/uboot.mk  |   24 ++++++++++++++++++++++++
>  2 files changed, 39 insertions(+), 0 deletions(-)
>
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index a0b2bfc..5a8af98 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -91,6 +91,21 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
>
>  endchoice
>
> +config BR2_TARGET_UBOOT_OMAP_IFT
> +	depends on BR2_TARGET_UBOOT_FORMAT_BIN
> +	select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
> +	bool "produce a .ift signed image (OMAP)"
> +	help
> +	  Use gpsign to produce an image of u-boot.bin signed with
> +	  a Configuration Header for booting on OMAP processors.

Maybe make it depend on BR2_ARCH = arm || armeb to avoid pointless 
options for other architectures?
Regards.

[Buildroot] [PATCH 2/2] u-boot: build signed image for OMAP processors

[Luca Ceresoli]

Gustavo Zacarias wrote:
...
>> +config BR2_TARGET_UBOOT_OMAP_IFT
>> + depends on BR2_TARGET_UBOOT_FORMAT_BIN
>> + select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
>> + bool "produce a .ift signed image (OMAP)"
>> + help
>> + Use gpsign to produce an image of u-boot.bin signed with
>> + a Configuration Header for booting on OMAP processors.
>
> Maybe make it depend on BR2_ARCH = arm || armeb to avoid pointless
> options for other architectures?

Right, will do.

Thanks,
Luca

[Buildroot] [PATCH 1/2] omap-u-boot-utils: add new package

[Luca Ceresoli]

Thomas,
thanks for the review.

Thomas Petazzoni wrote:
> Le Tue, 13 Sep 2011 19:19:32 +0200,
> Luca Ceresoli<luca@lucaceresoli.net>  a ?crit :
>
>> +++ b/boot/omap-u-boot-utils/Config.in
>> @@ -0,0 +1,7 @@
>> +config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
>> +	bool "omap-u-boot-utils"
>> +	help
>> +	  U-Boot Utilities for Texas Instrument's OMAP platforms.
>> +	  Say Y if you want these utilities on the development host.
>> +
>> +	  https://github.com/nmenon/omap-u-boot-utils
>
> This is a pure host package, so it shouldn't be present in any
> Config.in file. See package/fakeroot as an example.
>
> And even if it also was a target package, the Config.in should be in
> the package directory, not in boot/.

If I understand correctly your point, you would make omap-u-boot-utils
automatically compile if BR2_TARGET_UBOOT_OMAP_IFT (patch 2/2) is on,
without any user-visible option.

But this would reduce flexibility.

To understand why, consider this package is a set of utilities, loosely
related to each other.

gpsign is absolutely OMAP-specific, and it's what I use in patch 2/2 in
order to build a .ift image from a .bin image.

OTOH, ucmd "sends a command and expects a provided matching response
from target", and is aimed at creating automated scripts to interact
with a commandline program over a serial line. This can be used in any
architecture. I have board-specific scripts that use it to write
bootloader + kernel + rootfs onto a new (or bricked) board from files in
output/images.

So, while omap-u-boot-utils is a requirement for building a signed
image, I think it should be also available as a user option in
menuconfig.
I'm not sure boot/omap-u-boot-utils/Config.in is the correct place
anyway, I'm open to suggestions on a better location.


Oh, and to be complete, this might be a target package too; I did not
implement that because cross-compilation is a bit tricky and the use
case is possibly not interesting to anybody.

>
>> +OMAP_U_BOOT_UTILS_VERSION = d086cb5c0
>> +OMAP_U_BOOT_UTILS_SOURCE = omap-u-boot-utils-$(OMAP_U_BOOT_UTILS_VERSION).tar.gz
>
> xxx_SOURCE is useless with the git download method.

Right. Will fix.

>
>> +OMAP_U_BOOT_UTILS_TARGETS = gpsign pserial tagger ucmd ukermit
>
> Used only once, just hardcode.

Well, ok. Will do.

Luca

[Buildroot] [PATCH v2 1/2] omap-u-boot-utils: add new package

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

---

New in v2:
 - xxx_SOURCE is useless with the git download method, remove it;
 - OMAP_U_BOOT_UTILS_TARGETS is used only once, hardcoded it.

---
 boot/Config.in                                 |    1 +
 boot/omap-u-boot-utils/Config.in               |    7 +++++++
 package/omap-u-boot-utils/omap-u-boot-utils.mk |   22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 boot/omap-u-boot-utils/Config.in
 create mode 100644 package/omap-u-boot-utils/omap-u-boot-utils.mk

diff --git a/boot/Config.in b/boot/Config.in
index 2a97695..7e5a52d 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -7,6 +7,7 @@ source "boot/uboot/Config.in"
 source "boot/at91bootstrap/Config.in"
 source "boot/at91dataflashboot/Config.in"
 source "boot/xloader/Config.in"
+source "boot/omap-u-boot-utils/Config.in"
 
 endmenu
 
diff --git a/boot/omap-u-boot-utils/Config.in b/boot/omap-u-boot-utils/Config.in
new file mode 100644
index 0000000..3e4567c
--- /dev/null
+++ b/boot/omap-u-boot-utils/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
+	bool "omap-u-boot-utils"
+	help
+	  U-Boot Utilities for Texas Instrument's OMAP platforms.
+	  Say Y if you want these utilities on the development host.
+
+	  https://github.com/nmenon/omap-u-boot-utils
diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
new file mode 100644
index 0000000..8bc6c23
--- /dev/null
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# omap-u-boot-utils
+#
+#############################################################
+
+OMAP_U_BOOT_UTILS_VERSION = d086cb5c0
+OMAP_U_BOOT_UTILS_SITE = git://github.com/nmenon/omap-u-boot-utils.git
+OMAP_U_BOOT_UTILS_SITE_METHOD = git
+
+define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS
+	for f in gpsign pserial tagger ucmd ukermit ; do \
+		[ -f ${HOST_DIR}/usr/bin/$$f ] || \
+		  install -m 755 -D $(@D)/$$f ${HOST_DIR}/usr/bin/$$f ; \
+	done
+endef
+
+$(eval $(call GENTARGETS,package,omap-u-boot-utils,host))
-- 
1.7.4.1

[Buildroot] [PATCH v2 2/2] u-boot: build signed image for OMAP processors

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

---

New in v2: add depends on BR2_arm || BR2_armeb.

---
 boot/uboot/Config.in |   16 ++++++++++++++++
 boot/uboot/uboot.mk  |   24 ++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index daccd8b..ade6330 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -91,6 +91,22 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 
 endchoice
 
+config BR2_TARGET_UBOOT_OMAP_IFT
+	depends on BR2_TARGET_UBOOT_FORMAT_BIN
+	depends on BR2_arm || BR2_armeb
+	select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
+	bool "produce a .ift signed image (OMAP)"
+	help
+	  Use gpsign to produce an image of u-boot.bin signed with
+	  a Configuration Header for booting on OMAP processors.
+
+if BR2_TARGET_UBOOT_OMAP_IFT
+
+config BR2_TARGET_UBOOT_OMAP_IFT_CONFIG
+	string "gpsign Configuration Header config file"
+
+endif
+
 menuconfig BR2_TARGET_UBOOT_NETWORK
 	bool "Custom Network Settings"
 	help
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 202995a..71397f8 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -29,6 +29,9 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
 UBOOT_BIN          = u-boot.ldr
 else
 UBOOT_BIN          = u-boot.bin
+ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
+UBOOT_BIN_IFT      = ${UBOOT_BIN}.ift
+endif
 endif
 
 UBOOT_ARCH=$(KERNEL_ARCH)
@@ -84,10 +87,31 @@ define UBOOT_BUILD_CMDS
 		$(UBOOT_MAKE_TARGET)
 endef
 
+define UBOOT_BUILD_OMAP_IFT
+	${HOST_DIR}/usr/bin/gpsign -f $(@D)/u-boot.bin \
+		-c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))
+endef
+
 define UBOOT_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
 endef
 
+define UBOOT_INSTALL_OMAP_IFT_IMAGE
+	cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/
+endef
+
+ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
+# we NEED a config file unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)),)
+$(error No gpsign config file. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
+endif
+endif
+UBOOT_DEPENDENCIES += host-omap-u-boot-utils
+UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
+endif
+
 $(eval $(call GENTARGETS,boot,uboot))
 
 ifeq ($(BR2_TARGET_UBOOT),y)
-- 
1.7.4.1

[Buildroot] [PATCH v2 1/2] omap-u-boot-utils: add new package

[Thomas Petazzoni]

Le Mon, 19 Sep 2011 16:53:26 +0200,
Luca Ceresoli <luca@lucaceresoli.net> a ?crit :

> +config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
> +	bool "omap-u-boot-utils"
> +	help
> +	  U-Boot Utilities for Texas Instrument's OMAP platforms.
> +	  Say Y if you want these utilities on the development host.
> +
> +	  https://github.com/nmenon/omap-u-boot-utils

I continue to disagree with the fact of adding an host utility in the
Config.in menu, or at least not without a broader discussion about this.

Since we have started to normalize the generation of host packages
(late 2009/early 2010), we decided that host packages should *not*
appear in the menuconfig, but that they rather should only be handled
through make dependencies. If we decide to change this decision, we
need to think about it globally, i.e what we want to do for *all* host
packages and not only particular cases.

I must admit there are other cases for which being able to show host
packages to users would be useful. For example, on AT91 platforms,
there is an host utility called SAM-BA which allows to reflash an AT91
device through the USB device port. This host utility could be
conveniently downloaded, extracted and installed into $(HOST_DIR) by
Buildroot, but we have currently no way of doing this.

Some thing for OpenOCD. Jean-Christophe has recently added support for
it for the target, but being able to build OpenOCD on the host and
install it in $(HOST_DIR) would also be useful for those of us who want
to build ready-to-use development environments with Buildroot.

Anyway, in the mean time, I'm NACKing those patches until a proper
discussion has taken place, resulting in the definition of a solution
that works for all host packages.

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH v2 1/2] omap-u-boot-utils: add new package

[Luca Ceresoli]

Thomas,

Thomas Petazzoni wrote:
> Le Mon, 19 Sep 2011 16:53:26 +0200,
> Luca Ceresoli<luca@lucaceresoli.net>  a ?crit :
>
>> +config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
>> +	bool "omap-u-boot-utils"
>> +	help
>> +	  U-Boot Utilities for Texas Instrument's OMAP platforms.
>> +	  Say Y if you want these utilities on the development host.
>> +
>> +	  https://github.com/nmenon/omap-u-boot-utils
>
> I continue to disagree with the fact of adding an host utility in the
> Config.in menu, or at least not without a broader discussion about this.
>
> Since we have started to normalize the generation of host packages
> (late 2009/early 2010), we decided that host packages should *not*
> appear in the menuconfig, but that they rather should only be handled
> through make dependencies.

Sorry, I didn't know: I was not closely following the buildroot
development at that time.

 > If we decide to change this decision, we
> need to think about it globally, i.e what we want to do for *all* host
> packages and not only particular cases.
>
> I must admit there are other cases for which being able to show host
> packages to users would be useful. For example, on AT91 platforms,
> there is an host utility called SAM-BA which allows to reflash an AT91
> device through the USB device port. This host utility could be
> conveniently downloaded, extracted and installed into $(HOST_DIR) by
> Buildroot, but we have currently no way of doing this.
>
> Some thing for OpenOCD. Jean-Christophe has recently added support for
> it for the target, but being able to build OpenOCD on the host and
> install it in $(HOST_DIR) would also be useful for those of us who want
> to build ready-to-use development environments with Buildroot.
>
> Anyway, in the mean time, I'm NACKing those patches until a proper
> discussion has taken place, resulting in the definition of a solution
> that works for all host packages.

I understand. I just posted a v2 to have the trivial fixes and
improvements requested so far and stop thinking about them.

I'm going to start a new thread right now to open the discussion.

Luca