diff options
| author | Benoît Thébaudeau <benoit.thebaudeau@advansee.com> | 2012-10-08 08:34:22 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-10-16 12:35:12 +0200 |
| commit | 5676f598e7b62b0ed8f34c6dfb02940c0f66b84b (patch) | |
| tree | 13db29df8a478de0924883fa9c72a4397cfc1007 /arch | |
| parent | e58010b554500eab87603cb1ff9c546b46d8fd60 (diff) | |
| download | blackbird-obmc-uboot-5676f598e7b62b0ed8f34c6dfb02940c0f66b84b.tar.gz blackbird-obmc-uboot-5676f598e7b62b0ed8f34c6dfb02940c0f66b84b.zip | |
mx25: Clean up imx-regs.h
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-mx25/imx-regs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h index e78029604b..53aafe3075 100644 --- a/arch/arm/include/asm/arch-mx25/imx-regs.h +++ b/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) |
