From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Mon, 7 Dec 2015 15:03:30 +0100 Subject: [U-Boot] [PATCH] imx: mx6: fix reg base address when runtime usage In-Reply-To: <1448870691-23115-1-git-send-email-Peng.Fan@freescale.com> References: <1448870691-23115-1-git-send-email-Peng.Fan@freescale.com> Message-ID: <566591B2.5050307@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 30/11/2015 09:04, Peng Fan wrote: > Should use parenthese to wrap the macro definition, otherwise > we will encounter error like the following: > > " > if (base_addr != LCDIF1_BASE_ADDR) { > puts("Wrong LCD interface!\n"); > return -EINVAL; > } > " > > Without this patch, we will always encounter "Wrong LCD interface". > > Signed-off-by: Peng Fan > Cc: Stefano Babic > --- > arch/arm/include/asm/arch-mx6/imx-regs.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h > index 2f068e5..f24525e 100644 > --- a/arch/arm/include/asm/arch-mx6/imx-regs.h > +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h > @@ -335,10 +335,10 @@ > #include > > /* only for i.MX6SX/UL */ > -#define WDOG3_BASE_ADDR (is_cpu_type(MXC_CPU_MX6UL) ? \ > - MX6UL_WDOG3_BASE_ADDR : MX6SX_WDOG3_BASE_ADDR) > -#define LCDIF1_BASE_ADDR (is_cpu_type(MXC_CPU_MX6UL)) ? \ > - MX6UL_LCDIF1_BASE_ADDR : MX6SX_LCDIF1_BASE_ADDR > +#define WDOG3_BASE_ADDR ((is_cpu_type(MXC_CPU_MX6UL) ? \ > + MX6UL_WDOG3_BASE_ADDR : MX6SX_WDOG3_BASE_ADDR)) > +#define LCDIF1_BASE_ADDR ((is_cpu_type(MXC_CPU_MX6UL)) ? \ > + MX6UL_LCDIF1_BASE_ADDR : MX6SX_LCDIF1_BASE_ADDR) > > > extern void imx_get_mac_from_fuse(int dev_id, unsigned char *mac); > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================