summaryrefslogtreecommitdiff
path: root/arch/unicore32/boot/compressed/Makefile
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-06-14 12:53:42 (GMT)
committerTony Lindgren <tony@atomide.com>2011-06-14 12:53:42 (GMT)
commitb8ce9fb8e18af7466e0b915bb5979322cdace322 (patch)
treeeec6f9b58ce154fd863f0f78b374a697a5a7139b /arch/unicore32/boot/compressed/Makefile
parentc8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff)
parente9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff)
downloadlinux-fsl-qoriq-b8ce9fb8e18af7466e0b915bb5979322cdace322.tar.xz
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'arch/unicore32/boot/compressed/Makefile')
-rw-r--r--arch/unicore32/boot/compressed/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/boot/compressed/Makefile b/arch/unicore32/boot/compressed/Makefile
index 9537342..b0954a2 100644
--- a/arch/unicore32/boot/compressed/Makefile
+++ b/arch/unicore32/boot/compressed/Makefile
@@ -59,7 +59,7 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \
# We now have a PIC decompressor implementation. Decompressors running
# from RAM should not define ZTEXTADDR. Decompressors running directly
# from ROM or Flash must define ZTEXTADDR (preferably via the config)
-ZTEXTADDR := 0
+ZTEXTADDR := 0x03000000
ZBSSADDR := ALIGN(4)
SEDFLAGS_lds = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/