summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd (renamed from arch/arm/cpu/arm926ejs/mxs/u-boot.bd)0
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 53dbdd378d..d6d8ab2b2b 100644
--- a/Makefile
+++ b/Makefile
@@ -461,8 +461,11 @@ $(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \
$(obj)u-boot.ais
+# Specify the target for use in elftosb call
+ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
+
$(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
- elftosb -zdf imx28 -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot.bd \
+ elftosb -zdf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \
-o $(obj)u-boot.sb
# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
index c60615a456..c60615a456 100644
--- a/arch/arm/cpu/arm926ejs/mxs/u-boot.bd
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd