From: Tomasz Maciej Nowak Date: Mon, 10 Feb 2020 15:33:27 +0000 (+0100) Subject: uboot-mvebu: point to UBOOT_CONFIG when setting options X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=af878339ae28391dd7509cd27496fa4ca8d2a339;p=openwrt%2Fstaging%2Fjow.git uboot-mvebu: point to UBOOT_CONFIG when setting options The BUILD_VARIANT might differ from UBOOT_CONFIG, so point to a file we are actually changing. Being here let's call 'Build/Configure/U-Boot' definition, instead of definig the same command. This'll be more future proof, if U-Boot configuration procedure will change. Signed-off-by: Tomasz Maciej Nowak --- diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile index d171daa717..029018b414 100644 --- a/package/boot/uboot-mvebu/Makefile +++ b/package/boot/uboot-mvebu/Makefile @@ -42,11 +42,11 @@ UBOOT_TARGETS:= \ Build/Exports:=$(Host/Exports) define Build/Configure - # enable additional options beyond clearfog_defconfig - echo CONFIG_NET_RANDOM_ETHADDR=y >> $(PKG_BUILD_DIR)/configs/$(BUILD_VARIANT)_defconfig - echo CONFIG_CMD_SETEXPR=y >> $(PKG_BUILD_DIR)/configs/$(BUILD_VARIANT)_defconfig + # enable additional options beyond _defconfig + echo CONFIG_NET_RANDOM_ETHADDR=y >> $(PKG_BUILD_DIR)/configs/$(UBOOT_CONFIG)_defconfig + echo CONFIG_CMD_SETEXPR=y >> $(PKG_BUILD_DIR)/configs/$(UBOOT_CONFIG)_defconfig - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIGURE_VARS) $(UBOOT_CONFIG)_config + $(call Build/Configure/U-Boot) endef define Build/InstallDev