Commit fa6289bb authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

packages: refactor checks using BR_BUILDING 



Instead of manually testing MAKECMDGOALS, use the newly introduced
BR_BUILDING variable to know if we're building or not.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent 256f142b

boot/at91bootstrap/at91bootstrap.mk

+1 −4
Original line number Diff line number Diff line
@@ -40,11 +40,8 @@ endef 


$(eval $(generic-package))



ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)

# we NEED a board name unless we're at make source

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(BR2_TARGET_AT91BOOTSTRAP)$(BR_BUILDING),yy)

ifeq ($(AT91BOOTSTRAP_BOARD),)

$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting)

endif

endif
 
endif

boot/at91bootstrap3/at91bootstrap3.mk

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ AT91BOOTSTRAP3_KCONFIG_OPTS = $(AT91BOOTSTRAP3_MAKE_OPTS) 
$(eval $(kconfig-package))



# Checks to give errors that the user can understand

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(BR_BUILDING),y)

ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y)

ifeq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG)),)

$(error No at91bootstrap3 defconfig name specified, check your BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG setting)

boot/barebox/barebox.mk

+1 −4
Original line number Diff line number Diff line
@@ -106,11 +106,8 @@ endif 


$(eval $(kconfig-package))



ifeq ($(BR2_TARGET_BAREBOX),y)

# we NEED a board defconfig file unless we're at make source

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(BR2_TARGET_BAREBOX)$(BR_BUILDING),yy)

ifeq ($(BAREBOX_SOURCE_CONFIG),)

$(error No Barebox config file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG or BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE settings)

endif

endif
 
endif

boot/uboot/uboot.mk

+4 −9
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ define UBOOT_INSTALL_OMAP_IFT_IMAGE 
endef



ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)

# we NEED a config file unless we're at make source

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(BR_BUILDING),y)

ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)),)

$(error No gpsign config file. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)

endif
@@ -179,8 +178,7 @@ UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE 
endif



ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y)

# we NEED a environment settings unless we're at make source

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(BR_BUILDING),y)

ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),)

$(error Please define a source file for Uboot environment (BR2_TARGET_UBOOT_ENVIMAGE_SOURCE setting))

endif
@@ -193,9 +191,7 @@ endif 


$(eval $(generic-package))



ifeq ($(BR2_TARGET_UBOOT),y)

# we NEED a board name unless we're at make source

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy)

ifeq ($(UBOOT_BOARD_NAME),)

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

endif
@@ -221,5 +217,4 @@ $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_C 
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
 
endif # BR2_TARGET_UBOOT && BR_BUILDING

boot/xloader/xloader.mk

+1 −5
Original line number Diff line number Diff line
@@ -25,12 +25,8 @@ endef 


$(eval $(generic-package))



ifeq ($(BR2_TARGET_XLOADER),y)

# we NEED a board name unless we're at make source

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(BR2_TARGET_XLOADER)$(BR_BUILDING),yy)

ifeq ($(XLOADER_BOARD_NAME),)

$(error NO x-loader board name set. Check your BR2_BOOT_XLOADER_BOARDNAME setting)

endif

endif
 


endif