From 277b99283bcd30e4eb1581280bbab7b737ba22ed Mon Sep 17 00:00:00 2001
From: Jyotheeswar Reddy <jyotheeswar.reddy.mutthareddyvari@xilinx.com>
Date: Mon, 19 Oct 2015 11:39:35 +0530
Subject: [PATCH] Revert "PMUFW: lscript: Force generation of single loadable
 section"

This reverts commit 73154541df060ecfda0386c1df6160ce8ff005c6.
Linker script was modified to work-around a bootgen issue with handling
multiple loadable sections. Now this issue is fixed in bootgen (PR#875808).
So reverting the commit.
---
 lib/sw_apps/zynqmp_pmufw/src/lscript.ld | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/lib/sw_apps/zynqmp_pmufw/src/lscript.ld b/lib/sw_apps/zynqmp_pmufw/src/lscript.ld
index 2f584309..db241c43 100644
--- a/lib/sw_apps/zynqmp_pmufw/src/lscript.ld
+++ b/lib/sw_apps/zynqmp_pmufw/src/lscript.ld
@@ -93,7 +93,6 @@ SECTIONS
    *(.gnu.linkonce.s2.*)
    . = ALIGN(8);
    __sdata2_end = .;
-   BYTE(0);
 } > PMU_RAM
 
 .sbss2 : {
@@ -102,7 +101,6 @@ SECTIONS
    *(.sbss2.*)
    *(.gnu.linkonce.sb2.*)
    __sbss2_end = .;
-   BYTE(0);
 } > PMU_RAM
 
 .sdata : {
@@ -112,10 +110,9 @@ SECTIONS
    *(.sdata.*)
    *(.gnu.linkonce.s.*)
    __sdata_end = .;
-   BYTE(0);
 } > PMU_RAM
 
-.sbss  : {
+.sbss (NOLOAD) : {
    . = ALIGN(4);
    __sbss_start = .;
    *(.sbss)
@@ -123,7 +120,6 @@ SECTIONS
    *(.gnu.linkonce.sb.*)
    . = ALIGN(8);
    __sbss_end = .;
-   BYTE(0);
 } > PMU_RAM
 
 .tdata : {
@@ -142,7 +138,7 @@ SECTIONS
    __tbss_end = .;
 } > PMU_RAM
 
-.bss  : {
+.bss (NOLOAD) : {
    . = ALIGN(4);
    __bss_start = .;
    *(.bss)
@@ -151,7 +147,6 @@ SECTIONS
    *(COMMON)
    . = ALIGN(4);
    __bss_end = .;
-   BYTE(0);
 } > PMU_RAM
 
 _SDA_BASE_ = __sdata_start + ((__sbss_end - __sdata_start) / 2 );
@@ -159,25 +154,15 @@ _SDA_BASE_ = __sdata_start + ((__sbss_end - __sdata_start) / 2 );
 _SDA2_BASE_ = __sdata2_start + ((__sbss2_end - __sdata2_start) / 2 );
 
 /* Generate Stack definitions */
-.stack  : {
+.stack (NOLOAD) : {
    _stack_end = .;
    . += _STACK_SIZE;
    . = ALIGN(8);
    _stack = .;
    __stack = _stack;
-   BYTE(0);
-} > PMU_RAM
-
-.filler  : {
-   FILL(0);
-   _fill_start = .;
-   BYTE(0);
-   . += (_srv_tbl_start - _fill_start -1 );
-   _fill_end = .;
 } > PMU_RAM
 
 .xpbr_serv_ext_tbl 0xffddf6e0: {
-   _srv_tbl_start = .;
    KEEP (*(.xpbr_serv_ext_tbl))
 } > PMU_RAM