diff --git a/bsp/beaglebone/beaglebone_ram.lds b/bsp/beaglebone/beaglebone_ram.lds
index 52795e68ba3a8aae296e152dccb924aac10fee29..cf9bf6944dd48c9ed9b48b769fbec8026a0f561e 100644
--- a/bsp/beaglebone/beaglebone_ram.lds
+++ b/bsp/beaglebone/beaglebone_ram.lds
@@ -67,7 +67,7 @@ SECTIONS
     __data_end = .;
 
     . = ALIGN(4);
-    __bss_start = __data_end;
+    __bss_start = .;
     .bss       :
     {
     *(.bss)
diff --git a/bsp/imx6sx/cortex-a9/imx6.lds b/bsp/imx6sx/cortex-a9/imx6.lds
index d8d7480006d3052342f8134253b3e03f47459ee1..e05132025b70d34cb40bd58e7333986c0eb00f8b 100644
--- a/bsp/imx6sx/cortex-a9/imx6.lds
+++ b/bsp/imx6sx/cortex-a9/imx6.lds
@@ -75,7 +75,7 @@ SECTIONS
     __data_end = .;
 
     . = ALIGN(4);
-    __bss_start = __data_end;
+    __bss_start = .;
     .bss       :
     {
     *(.bss)
diff --git a/bsp/zynq7000/zynq7000.ld b/bsp/zynq7000/zynq7000.ld
index ae9b8ea38d704e725dfb38ce4ef55d5177c1c9c9..b8f2eb7690518de4520b0c404133fc2a951ef2c0 100644
--- a/bsp/zynq7000/zynq7000.ld
+++ b/bsp/zynq7000/zynq7000.ld
@@ -92,7 +92,7 @@ SECTIONS
     __data_end = .;
 
     . = ALIGN(4);
-    __bss_start = __data_end;
+    __bss_start = 0;
     .bss       :
     {
     *(.bss)
diff --git a/tools/building.py b/tools/building.py
index 204fd5037fb4eef7e83e7e61f5ce0862d80fabc5..f5cbd31617c5692588d8c0fc74ddc3413b0abdc7 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -695,15 +695,13 @@ def SrcRemove(src, remove):
     if not src:
         return
 
-    if type(src[0]) == type('str'):
-        for item in src:
+    for item in src:
+        if type(item) == type('str'):
             if os.path.basename(item) in remove:
                 src.remove(item)
-        return
-
-    for item in src:
-        if os.path.basename(item.rstr()) in remove:
-            src.remove(item)
+        else:
+            if os.path.basename(item.rstr()) in remove:
+                src.remove(item)
 
 def GetVersion():
     import SCons.cpp