From: Yann E. MORIN Date: Mon, 13 Jul 2015 10:32:02 +0000 (+0200) Subject: boot/barebox: check for config file before calling kconfig-package X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06d126fdc1813dad84c95c2500f400f45853ffae;p=buildroot.git boot/barebox: check for config file before calling kconfig-package If we check that the user provides a config file after we call to the kconfig-package infra, the error message we get is the one for the kconfig-package infra, not the custom error message we want to show to the user. So, only call kconfig-package after we do the check. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 7e530371c3..e45976d33b 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -109,10 +109,12 @@ define BAREBOX_INSTALL_TARGET_CMDS endef endif -$(eval $(kconfig-package)) - +# Checks to give errors that the user can understand +# Must be before we call to kconfig-package 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 + +$(eval $(kconfig-package))