diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-26 13:12:00 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-26 13:12:00 +0100 |
commit | a30b9d48729fa22d1798bf73c9344ba9594406ca (patch) | |
tree | 7c837e71b608dc05b93e4bed45c0dfddbc94a49c | |
parent | a968fad1cda0d6ba338b945bdaad5bfb87e7070d (diff) | |
download | barebox-a30b9d48729fa22d1798bf73c9344ba9594406ca.tar.gz barebox-a30b9d48729fa22d1798bf73c9344ba9594406ca.tar.xz |
IMX_NAND_BASE -> IMX_NFC_BASE
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | board/freescale-mx25-3-stack/3stack.c | 2 | ||||
-rw-r--r-- | board/freescale-mx25-3-stack/lowlevel_init.S | 6 | ||||
-rw-r--r-- | board/pcm043/pcm043.c | 2 | ||||
-rw-r--r-- | drivers/nand/nand_imx_v2.c | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-imx/imx25-regs.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-imx/imx35-regs.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c index 63217736ff..0f770ee5ca 100644 --- a/board/freescale-mx25-3-stack/3stack.c +++ b/board/freescale-mx25-3-stack/3stack.c @@ -124,7 +124,7 @@ struct imx_nand_platform_data nand_info = { static struct device_d nand_dev = { .name = "imx_nand", - .map_base = IMX_NAND_BASE, + .map_base = IMX_NFC_BASE, .platform_data = &nand_info, }; diff --git a/board/freescale-mx25-3-stack/lowlevel_init.S b/board/freescale-mx25-3-stack/lowlevel_init.S index 9dcb84b211..9d1916469d 100644 --- a/board/freescale-mx25-3-stack/lowlevel_init.S +++ b/board/freescale-mx25-3-stack/lowlevel_init.S @@ -109,8 +109,8 @@ board_init_lowlevel: #ifdef CONFIG_NAND_IMX_BOOT ldr sp, =0xa0f00000 /* Setup a temporary stack in SDRAM */ - ldr r0, =IMX_NAND_BASE /* start of NFC SRAM */ - ldr r2, =IMX_NAND_BASE + 0x1000 /* end of NFC SRAM */ + ldr r0, =IMX_NFC_BASE /* start of NFC SRAM */ + ldr r2, =IMX_NFC_BASE + 0x1000 /* end of NFC SRAM */ /* skip NAND boot if not running from NFC space */ cmp pc, r0 @@ -131,7 +131,7 @@ copy_loop: 1: bl nand_boot /* Load U-Boot from NAND Flash */ - ldr r1, =IMX_NAND_BASE - TEXT_BASE + ldr r1, =IMX_NFC_BASE - TEXT_BASE sub r10, r10, r1 /* adjust return address from NFC SRAM */ /* to SDRAM */ diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c index 166f2fa1cd..e977e8d7da 100644 --- a/board/pcm043/pcm043.c +++ b/board/pcm043/pcm043.c @@ -83,7 +83,7 @@ struct imx_nand_platform_data nand_info = { static struct device_d nand_dev = { .name = "imx_nand", - .map_base = IMX_NAND_BASE, + .map_base = IMX_NFC_BASE, .platform_data = &nand_info, }; diff --git a/drivers/nand/nand_imx_v2.c b/drivers/nand/nand_imx_v2.c index 6b47022130..fcdfb79f7f 100644 --- a/drivers/nand/nand_imx_v2.c +++ b/drivers/nand/nand_imx_v2.c @@ -1052,7 +1052,7 @@ void __bare_init imx_nand_load_image(void *dest, int size, int pagesize, int width = 1; u32 page, block; - host->regs = (void *)IMX_NAND_BASE; + host->regs = (void *)IMX_NFC_BASE; debug("%s\n", __func__); diff --git a/include/asm-arm/arch-imx/imx25-regs.h b/include/asm-arm/arch-imx/imx25-regs.h index efbdbaad9b..001b5157e1 100644 --- a/include/asm-arm/arch-imx/imx25-regs.h +++ b/include/asm-arm/arch-imx/imx25-regs.h @@ -44,7 +44,7 @@ #define IMX_IIM_BASE 0x53FF0000 #define IMX_OTG_BASE 0x53FF4000 #define IMX_M3IF_BASE 0xB8003000 -#define IMX_NAND_BASE 0xBB000000 +#define IMX_NFC_BASE 0xBB000000 /* * Clock Controller Module (CCM) diff --git a/include/asm-arm/arch-imx/imx35-regs.h b/include/asm-arm/arch-imx/imx35-regs.h index db1eeba70d..a9b363868d 100644 --- a/include/asm-arm/arch-imx/imx35-regs.h +++ b/include/asm-arm/arch-imx/imx35-regs.h @@ -43,7 +43,7 @@ #define IMX_CCM_BASE 0x53F80000 #define IMX_IIM_BASE 0x53FF0000 #define IMX_M3IF_BASE 0xB8003000 -#define IMX_NAND_BASE 0xBB000000 +#define IMX_NFC_BASE 0xBB000000 /* * Clock Controller Module (CCM) |