Commit 0370d92d authored by Sam bobroff's avatar Sam bobroff Committed by Thomas Petazzoni
Browse files

boot/barebox: handle generated defconfigs 



Signed-off-by: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 3f971789

boot/barebox/barebox.mk

+7 −6
Original line number Diff line number Diff line
@@ -56,13 +56,11 @@ BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" 
BAREBOX_MAKE_ENV = $(TARGET_MAKE_ENV)



ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)

BAREBOX_SOURCE_CONFIG = $(BAREBOX_DIR)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,\

	$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig

BAREBOX_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig

else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)

BAREBOX_SOURCE_CONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE))

BAREBOX_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE))

endif



BAREBOX_KCONFIG_FILE = $(BAREBOX_SOURCE_CONFIG)

BAREBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES))

BAREBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig

BAREBOX_KCONFIG_OPTS = $(BAREBOX_MAKE_FLAGS)
@@ -111,8 +109,11 @@ endif 
# 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)

# We must use the user-supplied kconfig value, because

# BAREBOX_KCONFIG_DEFCONFIG will at least contain the

# trailing _defconfig

ifeq ($(or $(BAREBOX_KCONFIG_FILE),$(BAREBOX_KCONFIG_DEFCONFIG)),)

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

endif

endif