| Message ID | 971982734.6395478.1349721262165.JavaMail.root@advansee.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
On 08/10/2012 20:34, Benoît Thébaudeau wrote: > Clean up i.MX25 imx-regs.h: > - Update mx31 imx-regs.h filename. > - Test for __KERNEL_STRICT_NAMES just in case. > - Define internal RAM size. > > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > Cc: Stefano Babic <sbabic@denx.de> > --- Applied to u-boot-imx, next branch, thanks. Best regards, Stefano Babic
On 08/10/2012 20:34, Benoît Thébaudeau wrote: > Clean up i.MX25 imx-regs.h: > - Update mx31 imx-regs.h filename. > - Test for __KERNEL_STRICT_NAMES just in case. > - Define internal RAM size. > > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > Cc: Stefano Babic <sbabic@denx.de> > --- Applied to u-boot-imx, next branch, thanks. Best regards, Stefano Babic
diff --git u-boot-imx-next-5cddb49.orig/arch/arm/include/asm/arch-mx25/imx-regs.h u-boot-imx-next-5cddb49/arch/arm/include/asm/arch-mx25/imx-regs.h index e780296..53aafe3 100644 --- u-boot-imx-next-5cddb49.orig/arch/arm/include/asm/arch-mx25/imx-regs.h +++ u-boot-imx-next-5cddb49/arch/arm/include/asm/arch-mx25/imx-regs.h @@ -2,7 +2,7 @@ * Copyright (C) 2009, DENX Software Engineering * Author: John Rigby <jcrigby@gmail.com * - * Based on arch-mx31/mx31-regs.h + * Based on arch-mx31/imx-regs.h * Copyright (C) 2009 Ilya Yanok, * Emcraft Systems <yanok@emcraft.com> * and arch-mx27/imx-regs.h @@ -33,8 +33,7 @@ #ifndef _IMX_REGS_H #define _IMX_REGS_H -#ifndef __ASSEMBLY__ - +#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> #ifdef CONFIG_FEC_MXC @@ -254,6 +253,7 @@ struct aips_regs { /* 128K Internal Static RAM */ #define IMX_RAM_BASE (0x78000000) +#define IMX_RAM_SIZE (128 * 1024) /* SDRAM BANKS */ #define IMX_SDRAM_BANK0_BASE (0x80000000)
Clean up i.MX25 imx-regs.h: - Update mx31 imx-regs.h filename. - Test for __KERNEL_STRICT_NAMES just in case. - Define internal RAM size. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Stefano Babic <sbabic@denx.de> --- .../arch/arm/include/asm/arch-mx25/imx-regs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)