[PATCH 1/4] ARM i.MX bbu: Fix compiling with DEBUG enabled

[PATCH 1/4] ARM i.MX bbu: Fix compiling with DEBUG enabled

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-imx/imx-bbu-internal.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index 85d10cf..c34f86f 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -63,7 +63,7 @@ static int imx_bbu_write_device(struct imx_internal_bbu_handler *imx_handler,
 	if (imx_handler->flags & IMX_INTERNAL_FLAG_KEEP_DOSPART) {
 		void *mbr = xzalloc(512);
 
-		debug("%s: reading DOS partition table in order to keep it\n");
+		debug("%s: reading DOS partition table in order to keep it\n", __func__);
 
 		ret = read(fd, mbr, 512);
 		if (ret < 0) {
@@ -484,7 +484,7 @@ static int imx53_bbu_internal_init_dcd(struct imx_internal_bbu_handler *imx_hand
 	if ((*dcd32 & 0xff0000ff) != DCD_WR_CMD(0)) {
 		__be32 *buf;
 
-		debug("%s: dcd does not have a DCD_WR_CMD. Prepending one\n");
+		debug("%s: dcd does not have a DCD_WR_CMD. Prepending one\n", __func__);
 
 		buf = xmalloc(dcdsize + sizeof(__be32));
 
@@ -494,7 +494,7 @@ static int imx53_bbu_internal_init_dcd(struct imx_internal_bbu_handler *imx_hand
 		imx_handler->dcd = buf;
 		imx_handler->dcdsize = dcdsize + sizeof(__be32);
 	} else {
-		debug("%s: dcd already has a DCD_WR_CMD. Using original dcd data\n");
+		debug("%s: dcd already has a DCD_WR_CMD. Using original dcd data\n", __func__);
 
 		imx_handler->dcd = dcd;
 		imx_handler->dcdsize = dcdsize;
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/4] ARM i.MX esdctl.h: Add double include protection

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-imx/include/mach/esdctl.h |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-imx/include/mach/esdctl.h b/arch/arm/mach-imx/include/mach/esdctl.h
index 8124c87..b601ff8 100644
--- a/arch/arm/mach-imx/include/mach/esdctl.h
+++ b/arch/arm/mach-imx/include/mach/esdctl.h
@@ -1,3 +1,5 @@
+#ifndef __MACH_ESDCTL_V2_H
+#define __MACH_ESDCTL_V2_H
 
 /* SDRAM Controller registers */
 #define IMX_ESDCTL0 0x00 /* Enhanced SDRAM Control Register 0       */
@@ -124,3 +126,4 @@
 //#define ESDCFGx_tRC_14		0x0000000e	// 15 seems to not exist
 #define ESDCFGx_tRC_16			0x0000000f
 
+#endif /* __MACH_ESDCTL_V2_H */
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/4] i.MX27 regs remove unnecessary include

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/phycard-i.MX27/lowlevel_init.S |    1 +
 arch/arm/mach-imx/include/mach/imx27-regs.h    |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boards/phycard-i.MX27/lowlevel_init.S b/arch/arm/boards/phycard-i.MX27/lowlevel_init.S
index 8f0000f..38cc55c 100644
--- a/arch/arm/boards/phycard-i.MX27/lowlevel_init.S
+++ b/arch/arm/boards/phycard-i.MX27/lowlevel_init.S
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <mach/imx27-regs.h>
 #include <mach/imx-pll.h>
+#include <mach/esdctl.h>
 #include <asm/barebox-arm-head.h>
 
 #define writel(val, reg) \
diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h
index 90b4614..44bc1d3 100644
--- a/arch/arm/mach-imx/include/mach/imx27-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx27-regs.h
@@ -124,8 +124,6 @@
 #define MX27_WBCR	0x1C	/* Well Bias Control Register */
 #define MX27_DSCR(x)	(0x1C + ((x) << 2))	/* Driving Strength Control Register 1 - 13 */
 
-#include "esdctl.h"
-
 /* PLL registers (base: MX27_CCM_BASE_ADDR) */
 #define MX27_CSCR	0x00 /* Clock Source Control Register       */
 #define MX27_MPCTL0	0x04 /* MCU PLL Control Register 0          */
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/4] serial i.MX: Make locally used variables static

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/serial/serial_imx.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 694eac2..3f219ae 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -141,7 +141,7 @@ struct imx_serial_devtype_data {
 	u32 onems;
 };
 
-struct imx_serial_devtype_data imx1_data = {
+static struct imx_serial_devtype_data imx1_data = {
 	.ucr1_val = UCR1_UARTCLKEN,
 	.ucr3_val = 0,
 	.ucr4_val = UCR4_CTSTL_32 | UCR4_REF16,
@@ -149,7 +149,7 @@ struct imx_serial_devtype_data imx1_data = {
 	.onems = 0,
 };
 
-struct imx_serial_devtype_data imx21_data = {
+static struct imx_serial_devtype_data imx21_data = {
 	.ucr1_val = 0,
 	.ucr3_val = 0x700 | UCR3_RXDMUXSEL,
 	.ucr4_val = UCR4_CTSTL_32,
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox