1 files changed, 8 insertions, 18 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index 8bbe319b3e7..8fba7126555 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -14,32 +14,22 @@
 OUTPUT_ARCH(powerpc)
 ENTRY(_start)
 
-PHDRS
-{
-  text PT_LOAD;
-  bss PT_LOAD;
-}
-
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
-  .bootpg CONFIG_SYS_TEXT_BASE - 0x1000 :
+  .text      :
   {
+#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
     KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
-  } :text = 0xffff
-  . = CONFIG_SYS_TEXT_BASE;
 #endif
-  .text      :
-  {
     *(.text*)
-   } :text
+  }
     _etext = .;
     PROVIDE (etext = .);
     .rodata    :
    {
     *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-  } :text
+  }
 
   /* Read-write section, merged into data segment: */
   . = (. + 0x00FF) & 0xFFFFFF00;
@@ -84,16 +74,16 @@ SECTIONS
   __init_end = .;
   _end = .;
 
-#ifndef CONFIG_SYS_MPC85XX_NO_RESETVEC
+#if !CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
     arch/powerpc/cpu/mpc85xx/start.o	(.bootpg)
-  } :text = 0xffff
+  } = 0xffff
 
   .resetvec RESET_VECTOR_ADDRESS :
   {
     KEEP(*(.resetvec))
-  } :text = 0xffff
+  } = 0xffff
 
   . = RESET_VECTOR_ADDRESS + 0x4;
 
@@ -115,7 +105,7 @@ SECTIONS
    *(.sbss*)
    *(.bss*)
    *(COMMON)
-  } :bss
+  }
 
   . = ALIGN(4);
   __bss_end = . ;