git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v2.6.37-rc8 into powerpc/next
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
Makefile
diff --git
a/arch/arm/boot/Makefile
b/arch/arm/boot/Makefile
index
4a590f4
..
4d26f2c
100644
(file)
--- a/
arch/arm/boot/Makefile
+++ b/
arch/arm/boot/Makefile
@@
-70,12
+70,7
@@
else
$(obj)/uImage: LOADADDR=$(ZRELADDR)
endif
$(obj)/uImage: LOADADDR=$(ZRELADDR)
endif
-ifeq ($(CONFIG_THUMB2_KERNEL),y)
-# Set bit 0 to 1 so that "mov pc, rx" switches to Thumb-2 mode
-$(obj)/uImage: STARTADDR=$(shell echo $(LOADADDR) | sed -e "s/.$$/1/")
-else
$(obj)/uImage: STARTADDR=$(LOADADDR)
$(obj)/uImage: STARTADDR=$(LOADADDR)
-endif
$(obj)/uImage: $(obj)/zImage FORCE
$(call if_changed,uimage)
$(obj)/uImage: $(obj)/zImage FORCE
$(call if_changed,uimage)