From 479e31e0907e273b0ca4a8ad5326b1503144637a Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 20 Apr 2016 09:33:30 -0700 Subject: imgtec/pistachio: Fix memlayout ASSERT with new binutils With binutils 2.26 our memlayout ASSERT for mirrored SRAM regions gets confused due to the lack of parentheses grouping the expressions. This fixes the following issue: LINK cbfs/fallback/bootblock.debug mipsel-elf-ld.bfd: bootblock and gram_bootblock do not match! mipsel-elf-ld.bfd: romstage and kseg0_romstage do not match! Change-Id: Ib406e229b8a552d9ffc4538b55ee0269bfed62a8 Signed-off-by: Stefan Reinauer Reviewed-on: https://review.coreboot.org/14440 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/soc/imgtec/pistachio/include/soc/memlayout.ld | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/soc/imgtec/pistachio/include/soc/memlayout.ld b/src/soc/imgtec/pistachio/include/soc/memlayout.ld index 9891baec5a..05042efb9f 100644 --- a/src/soc/imgtec/pistachio/include/soc/memlayout.ld +++ b/src/soc/imgtec/pistachio/include/soc/memlayout.ld @@ -20,8 +20,8 @@ /* SRAM memory is mapped in two different locations. Define regions in both for * full overlap checking and use this to guarantee they're kept in sync. */ #define ASSERT_MIRRORED(r1, r2) \ - _ = ASSERT(_e##r1 - _##r1 == _e##r2 - _##r2 && \ - _##r1 & 0x7fffffff == _##r2 & 0x7fffffff, \ + _ = ASSERT((_e##r1 - _##r1) == (_e##r2 - _##r2) && \ + (_##r1 & 0x7fffffff) == (_##r2 & 0x7fffffff), \ STR(r1 and r2 do not match!)); SECTIONS -- cgit v1.2.3