From: mahi <devnull@localhost>
Date: Mon, 10 Sep 2012 13:22:23 +0000 (+0200)
Subject: Merge with 6c0406457e55f82d7a30afd3b7cec1c458993ef4
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain/c2149e2a2b877007e2b34558fb580346dd0ad9a4

Merge with 6c0406457e55f82d7a30afd3b7cec1c458993ef4
---

c2149e2a2b877007e2b34558fb580346dd0ad9a4
diff --cc arch/ppc/mpc55xx/scripts/linkscript_gcc.ldf
index 945bbbcc,f8f90100..146e6443
--- a/arch/ppc/mpc55xx/scripts/linkscript_gcc.ldf
+++ b/arch/ppc/mpc55xx/scripts/linkscript_gcc.ldf
@@@ -134,17 -141,7 +141,16 @@@ __FLS_PROG_START__ = 0;	/* Must be alig
  	.sbss2 : {
  		*(.sbss2 .sbss2.* .gnu.linkonce.sb2.*);
  		__TEXT_END = .;
- 		. = . + ALIGN(8);
  	} > flash
 +
 +#if defined(CFG_MPC5516)
 +	.McuE_LowPowerRecoverFlash 0x000ff000: {
 +	    *(.lowpower_text);
 +	}
 +	.lowpower_vector 0x000ffffc: {
 +	    *(.lowpower_vector);
 +	}
 +#endif	
  	
  
  	.data : {