From 871896a93eb54f4d354cad5462e045cb74860a63 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 11 Jun 2008 13:07:03 +0000 Subject: [PATCH] u-boot: evaluate U_BOOT_ARCH at use time, rather than Makefile parse time U_BOOT_ARCH seems to race with KERNEL_ARCH in some situations, so it end up empty. It's only used once, so fix it by using a use-time evaluated variable instead (=). --- target/u-boot/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in index 6ba5c0f10..541e71f78 100644 --- a/target/u-boot/Makefile.in +++ b/target/u-boot/Makefile.in @@ -12,7 +12,7 @@ U_BOOT_CAT:=$(BZCAT) U_BOOT_BIN:=u-boot.bin U_BOOT_TOOLS_BIN:=mkimage # u-boot still uses arch=ppc for powerpc -U_BOOT_ARCH:=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/') +U_BOOT_ARCH=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/') ifneq ($(BR2_TARGET_U_BOOT_CONFIG_BOARD),) U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(subst _config,,$(BR2_TARGET_U_BOOT_CONFIG_BOARD)).h