Patchwork [3/4] Factorise the u-boot images code

login
register
mail settings
Submitter Maxime Ripard
Date July 3, 2012, 10:01 a.m.
Message ID <1341309676-18681-4-git-send-email-maxime.ripard@free-electrons.com>
Download mbox | patch
Permalink /patch/168778/
State Superseded
Headers show

Comments

Maxime Ripard - July 3, 2012, 10:01 a.m.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 linux/Config.in |    4 ++++
 linux/linux.mk  |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
Arnout Vandecappelle - July 15, 2012, 12:42 p.m.
On 07/03/12 12:01, Maxime Ripard wrote:
> Signed-off-by: Maxime Ripard<maxime.ripard@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Thomas Petazzoni - July 16, 2012, 1:03 p.m.
Le Tue,  3 Jul 2012 12:01:15 +0200,
Maxime Ripard <maxime.ripard@free-electrons.com> a écrit :

> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  linux/Config.in |    4 ++++
>  linux/linux.mk  |    5 ++++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/linux/Config.in b/linux/Config.in
> index 46b9756..c5488e8 100644
> --- a/linux/Config.in
> +++ b/linux/Config.in
> @@ -176,12 +176,16 @@ endif
>  # Binary format
>  #
>  
> +config BR2_LINUX_KERNEL_UBOOT_IMAGE
> +       bool

Maybe this should rather be BR2_LINUX_KERNEL_NEEDS_MKIMAGE ?

Thomas

Patch

diff --git a/linux/Config.in b/linux/Config.in
index 46b9756..c5488e8 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -176,12 +176,16 @@  endif
 # Binary format
 #
 
+config BR2_LINUX_KERNEL_UBOOT_IMAGE
+       bool
+
 choice
 	prompt "Kernel binary format"
 
 config BR2_LINUX_KERNEL_UIMAGE
 	bool "uImage"
 	depends on BR2_arm || BR2_armeb || BR2_bfin || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64
+	select BR2_LINUX_KERNEL_UBOOT_IMAGE
 
 config BR2_LINUX_KERNEL_BZIMAGE
 	bool "bzImage"
diff --git a/linux/linux.mk b/linux/linux.mk
index 483974c..8517d2f 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -34,6 +34,10 @@  LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 LINUX_INSTALL_IMAGES = YES
 LINUX_DEPENDENCIES  += host-module-init-tools
 
+ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
+	LINUX_DEPENDENCIES+=host-uboot-tools
+endif
+
 LINUX_MAKE_FLAGS = \
 	HOSTCC="$(HOSTCC)" \
 	HOSTCFLAGS="$(HOSTCFLAGS)" \
@@ -69,7 +73,6 @@  LINUX_IMAGE_NAME=vmImage
 else
 LINUX_IMAGE_NAME=uImage
 endif
-LINUX_DEPENDENCIES+=host-uboot-tools
 else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y)
 LINUX_IMAGE_NAME=bzImage
 else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)