diff options
Diffstat (limited to 'boot/uboot')
| -rw-r--r-- | boot/uboot/Config.in | 4 | ||||
| -rw-r--r-- | boot/uboot/uboot.mk | 26 |
2 files changed, 26 insertions, 4 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 1c77f6a656..0f98d7f68d 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -224,11 +224,11 @@ config BR2_TARGET_UBOOT_SPL config BR2_TARGET_UBOOT_SPL_NAME string "U-Boot SPL target name" - default "u-boot-spl.bin" + default "spl/u-boot-spl.bin" depends on BR2_TARGET_UBOOT_SPL help This is the name of the SPL binary, generated during - u-boot build. For most platform it is u-boot-spl.bin + u-boot build. For most platform it is spl/u-boot-spl.bin but not always. It is MLO on OMAP for example. menuconfig BR2_TARGET_UBOOT_ENVIMAGE diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index da67706d31..532ac8b97e 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -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 |
