Commit 1ed01c9a authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

uboot: check various configuration parameters and bail out if empty 



Following the issues reported by Jerry <g4@novadsp.com>, it appears
that there are a number of U-Boot configuration variables we are not
checking properly, leaving users with weird behavior at build time.

This commit extends the existing U-Boot checks to verify that when a
custom version, custom tarball, or custom Git or Mercurial
repositories are selected, the appropriate fields are not empty in the
configuration.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 1698bbe4

boot/uboot/uboot.mk

+24 −2
Original line number Diff line number Diff line
@@ -174,5 +174,27 @@ ifeq ($(filter source,$(MAKECMDGOALS)),) 
ifeq ($(UBOOT_BOARD_NAME),)

$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)

endif

endif

endif
 


ifeq ($(BR2_TARGET_UBOOT_CUSTOM_VERSION),y)

ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE)),)

$(error No custom U-Boot version specified. Check your BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE setting)

endif # qstrip BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE

endif # BR2_TARGET_UBOOT_CUSTOM_VERSION



ifeq ($(BR2_TARGET_UBOOT_CUSTOM_TARBALL),y)

ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)),)

$(error No custom U-Boot tarball specified. Check your BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION setting)

endif # qstrip BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION

endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL



ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y)

ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),)

$(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting)

endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL

ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),)

$(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting)

endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION

endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG



endif # filter source

endif # BR2_TARGET_UBOOT