Эх сурвалжийг харах

powerpc/mpc85xx:Avoid fix address of bootpg section

It is not necessary for bootpg to be present at text + 512KB.
With increase of u-boot size (768KB), bootpg section's address
cannot be fixed.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
Prabhakar Kushwaha 11 жил өмнө
parent
commit
0938b6094e

+ 7 - 1
arch/powerpc/cpu/mpc85xx/u-boot-nand.lds

@@ -4,6 +4,12 @@
  * SPDX-License-Identifier:	GPL-2.0+
  * SPDX-License-Identifier:	GPL-2.0+
  */
  */
 
 
+#include "config.h"	/* CONFIG_BOARDDIR */
+
+#ifndef CONFIG_SYS_MONITOR_LEN
+#define CONFIG_SYS_MONITOR_LEN	0x80000
+#endif
+
 OUTPUT_ARCH(powerpc)
 OUTPUT_ARCH(powerpc)
 /* Do we need any of these for elf?
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
    __DYNAMIC = 0;    */
@@ -76,7 +82,7 @@ SECTIONS
     KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
     KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
   } :text = 0xffff
   } :text = 0xffff
 
 
-  . = ADDR(.text) + 0x80000;
+  . = ADDR(.text) + CONFIG_SYS_MONITOR_LEN;
 
 
   __bss_start = .;
   __bss_start = .;
   .bss (NOLOAD)       :
   .bss (NOLOAD)       :

+ 5 - 1
arch/powerpc/cpu/mpc85xx/u-boot.lds

@@ -12,6 +12,10 @@
 #define RESET_VECTOR_ADDRESS	0xfffffffc
 #define RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
 #endif
 
 
+#ifndef CONFIG_SYS_MONITOR_LEN
+#define CONFIG_SYS_MONITOR_LEN	0x80000
+#endif
+
 OUTPUT_ARCH(powerpc)
 OUTPUT_ARCH(powerpc)
 ENTRY(_start_e500)
 ENTRY(_start_e500)
 
 
@@ -85,7 +89,7 @@ SECTIONS
   {
   {
     KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
     KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
   } :text = 0xffff
   } :text = 0xffff
-  . = ADDR(.text) + 0x80000;
+  . = ADDR(.text) + CONFIG_SYS_MONITOR_LEN;
 #else
 #else
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
   {