diff --git a/[refs] b/[refs] index 7ad69a2028cc..a37d6ebc4ec1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2809e80b8a73d556b2302e273966fb15db16c51e +refs/heads/master: f4728fd21f6d81bb2100da7eb9c675f1a74ad30d diff --git a/trunk/arch/unicore32/boot/compressed/Makefile b/trunk/arch/unicore32/boot/compressed/Makefile index 95373428cb3d..b0954a2d23cf 100644 --- a/trunk/arch/unicore32/boot/compressed/Makefile +++ b/trunk/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)/