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 branch 'master' into upstream.
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
compressed
/
Makefile
diff --git
a/arch/arm/boot/compressed/Makefile
b/arch/arm/boot/compressed/Makefile
index
8ebbb51
..
0c6852d
100644
(file)
--- a/
arch/arm/boot/compressed/Makefile
+++ b/
arch/arm/boot/compressed/Makefile
@@
-74,7
+74,7
@@
ZTEXTADDR := $(CONFIG_ZBOOT_ROM_TEXT)
ZBSSADDR := $(CONFIG_ZBOOT_ROM_BSS)
else
ZTEXTADDR := 0
-ZBSSADDR := ALIGN(
4
)
+ZBSSADDR := ALIGN(
8
)
endif
SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/