summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-02-26 09:30:59 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-02-26 09:35:56 +0100
commit02224c623d885afb90b00b3a82e6f6697d29699c (patch)
treec40d933d4f74c990a8d5d7b5e0342a744d654099 /arch
parent645e06e3584279826206c816c23ab739e82d64ac (diff)
downloadbarebox-02224c623d885afb90b00b3a82e6f6697d29699c.tar.gz
barebox-02224c623d885afb90b00b3a82e6f6697d29699c.tar.xz
ARM/i.MX53: fix compiler warning
The code wants to test if the lower 16bits of the content of MX53_CSD0_BASE_ADDR and SDRAM_COMPARE_CONST1 are identical. The assembly this code was derived from did: mov r5, r0, lsl #16 mov r6, r7, lsl #16 cmp r5, r6 In C this is better written with masks which is better readable and avoid this compiler warning: arch/arm/mach-imx/esdctl-v4.c:613:63: warning: result of '305419896 << 16' requires 46 bits to represent, but 'int' only has 32 bits [-Wshift-overflow=] Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/esdctl-v4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/esdctl-v4.c b/arch/arm/mach-imx/esdctl-v4.c
index 6de4a8d6e7..b32f56d622 100644
--- a/arch/arm/mach-imx/esdctl-v4.c
+++ b/arch/arm/mach-imx/esdctl-v4.c
@@ -610,7 +610,7 @@ void imx_esdctlv4_init(void)
* ok, last possibility is 16b bus on low data-lines, check that
* (i.MX25 also suports 16b on high data-lines, but i.MX53 doesn't)
*/
- if (readl(MX53_CSD0_BASE_ADDR) << 16 == SDRAM_COMPARE_CONST1 << 16) {
+ if ((readl(MX53_CSD0_BASE_ADDR) & 0xffff) == (SDRAM_COMPARE_CONST1 & 0xffff)) {
esdctl0 |= ESDCTL_V4_ESDCTLx_DSIZ_16B_LOW;
mask >>= 16;
goto sdram_bussize_found;