commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=e59a514a8e8419dfd4d7ba338ea1202697e469fd
branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk

Xip build need extra 64 bytes offset, this patch fix it.

Signed-off-by: Bob Liu <[email protected]>
---
 arch/blackfin/boot/Makefile |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/blackfin/boot/Makefile b/arch/blackfin/boot/Makefile
index 0a49279..929c38c 100644
--- a/arch/blackfin/boot/Makefile
+++ b/arch/blackfin/boot/Makefile
@@ -12,13 +12,17 @@ targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.lzo v
 extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.xip
 
 UIMAGE_OPTS-y :=
-UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += -a $(CONFIG_BOOT_LOAD)
-UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += -a $(CONFIG_ROM_BASE) -x
+UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += \
+	-a $(CONFIG_BOOT_LOAD) \
+	-e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}')
+UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += \
+	-x \
+	-a $(CONFIG_ROM_BASE) \
+	-e $$( printf '%x' $$(( $(CONFIG_ROM_BASE) + 64 )) )
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \
                    -C $(2) -n '$(CPU_REV)-$(KERNELRELEASE)' \
-                   -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \
                    $(UIMAGE_OPTS-y) -d $< $@
 
 $(obj)/vmlinux.bin: vmlinux FORCE
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to