summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-22 21:57:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-08-04 21:00:57 +0200
commitca22ccd7cdbb6b2bd720dd7e14280ee1efa29074 (patch)
treeddcf709dc26045e507de8a43a92edd61deb4ac6e /common
parent6696e95bf54162caa96aa526bf1b88a2bdbd11a1 (diff)
downloadbarebox-ca22ccd7cdbb6b2bd720dd7e14280ee1efa29074.tar.gz
barebox-ca22ccd7cdbb6b2bd720dd7e14280ee1efa29074.tar.xz
Revert "common: resource: print conflicts as warning"
On several i.MX boards we register SDRAM with the values from the SDRAM controller and also with values from the device tree. This now issues a warning each time the board is started. Revert the commit for now. A better solution might be to check if the same SDRAM region already exists before trying to register it again. This reverts commit c9e2e08edcdce4205821226817686e62dc349eab. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r--common/resource.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/resource.c b/common/resource.c
index 1ea2a7522a..fe4680e3bd 100644
--- a/common/resource.c
+++ b/common/resource.c
@@ -71,7 +71,7 @@ struct resource *__request_region(struct resource *parent,
goto ok;
if (start > r->end)
continue;
- pr_warn("%s: 0x%08llx:0x%08llx conflicts with 0x%08llx:0x%08llx\n",
+ debug("%s: 0x%08llx:0x%08llx conflicts with 0x%08llx:0x%08llx\n",
__func__,
(unsigned long long)start,
(unsigned long long)end,