Commit 902609fb authored by Maxime Ripard's avatar Maxime Ripard Committed by Thomas Petazzoni
Browse files

Factorize the u-boot images code 



This patch introduces the BR2_LINUX_KERNEL_UBOOT_IMAGE boolean to
factorize more code that will be shared in the next patches that
introduces other uImage-like targets.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 69fc497d

linux/Config.in

+4 −0
Original line number Diff line number Diff line
@@ -129,12 +129,16 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE 
# 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"

linux/linux.mk

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,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)" \
@@ -64,7 +68,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)