diff options
| author | Bernard Xiong <[email protected]> | 2017-10-24 12:44:13 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-24 12:44:13 +0800 |
| commit | 6c0a2e8ffc88da96ce7b25729492df2df414a4eb (patch) | |
| tree | 49e61c5e3bd2eb57fcd4572e839c5049c4089218 | |
| parent | 7a36b1f918d23dd7fa6c30992ea2bec896808f20 (diff) | |
| parent | a1902f2de0b8dda7530c43d4bd1f8674884b5a8d (diff) | |
Merge pull request #898 from aozima/pulls
[BSP] Fix the align issue in __bss_start.
[Tools] Auto-detect the parameter type in SrcRemove.
| -rw-r--r-- | bsp/beaglebone/beaglebone_ram.lds | 2 | ||||
| -rw-r--r-- | bsp/imx6sx/cortex-a9/imx6.lds | 2 | ||||
| -rw-r--r-- | bsp/zynq7000/zynq7000.ld | 2 | ||||
| -rw-r--r-- | tools/building.py | 12 |
4 files changed, 8 insertions, 10 deletions
diff --git a/bsp/beaglebone/beaglebone_ram.lds b/bsp/beaglebone/beaglebone_ram.lds index 52795e68ba..cf9bf6944d 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 d8d7480006..e05132025b 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 ae9b8ea38d..b8f2eb7690 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 204fd5037f..f5cbd31617 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 |