소스 검색

Merge pull request #898 from aozima/pulls

[BSP] Fix the align issue in __bss_start. 
[Tools] Auto-detect the parameter type in SrcRemove.
Bernard Xiong 7 년 전
부모
커밋
6c0a2e8ffc
4개의 변경된 파일8개의 추가작업 그리고 10개의 파일을 삭제
  1. 1 1
      bsp/beaglebone/beaglebone_ram.lds
  2. 1 1
      bsp/imx6sx/cortex-a9/imx6.lds
  3. 1 1
      bsp/zynq7000/zynq7000.ld
  4. 5 7
      tools/building.py

+ 1 - 1
bsp/beaglebone/beaglebone_ram.lds

@@ -67,7 +67,7 @@ SECTIONS
     __data_end = .;
 
     . = ALIGN(4);
-    __bss_start = __data_end;
+    __bss_start = .;
     .bss       :
     {
     *(.bss)

+ 1 - 1
bsp/imx6sx/cortex-a9/imx6.lds

@@ -75,7 +75,7 @@ SECTIONS
     __data_end = .;
 
     . = ALIGN(4);
-    __bss_start = __data_end;
+    __bss_start = .;
     .bss       :
     {
     *(.bss)

+ 1 - 1
bsp/zynq7000/zynq7000.ld

@@ -92,7 +92,7 @@ SECTIONS
     __data_end = .;
 
     . = ALIGN(4);
-    __bss_start = __data_end;
+    __bss_start = 0;
     .bss       :
     {
     *(.bss)

+ 5 - 7
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