summaryrefslogtreecommitdiff
path: root/nand_spl
diff options
context:
space:
mode:
authorHaiying Wang <Haiying.Wang@freescale.com>2008-10-29 11:05:55 -0400
committerScott Wood <scottwood@freescale.com>2008-10-29 11:12:53 -0500
commit4e190b03aaf2309bd2e025d1187a2ca880fedc95 (patch)
tree57afb19280a15c5918a66c36482686c2095e6615 /nand_spl
parent695c130e4bf75b444720ddfd83aca88f41c046cf (diff)
downloadu-boot-imx-4e190b03aaf2309bd2e025d1187a2ca880fedc95.zip
u-boot-imx-4e190b03aaf2309bd2e025d1187a2ca880fedc95.tar.gz
u-boot-imx-4e190b03aaf2309bd2e025d1187a2ca880fedc95.tar.bz2
Make Freescale local bus registers available for both 83xx and 85xx.
- Rename lbus83xx_t to fsl_lbus_t and move it to asm/fsl_lbc.h so that it can be shared by both 83xx and 85xx - Remove lbus83xx_t and replace it with fsl_lbus_t in all 83xx boards files which use lbus83xx_t. - Move FMR, FIR, FCR, FPAR, LTESR from mpc83xx.h to asm/fsl_lbc.h so that 85xx can share them. Signed-off-by: Jason Jin <Jason.Jin@freescale.com> Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'nand_spl')
-rw-r--r--nand_spl/nand_boot_fsl_elbc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nand_spl/nand_boot_fsl_elbc.c b/nand_spl/nand_boot_fsl_elbc.c
index 273478f..4a961ea 100644
--- a/nand_spl/nand_boot_fsl_elbc.c
+++ b/nand_spl/nand_boot_fsl_elbc.c
@@ -33,7 +33,7 @@
static void nand_wait(void)
{
- lbus83xx_t *regs = (lbus83xx_t *)(CONFIG_SYS_IMMR + 0x5000);
+ fsl_lbus_t *regs = (fsl_lbus_t *)(CONFIG_SYS_IMMR + 0x5000);
for (;;) {
uint32_t status = in_be32(&regs->ltesr);
@@ -50,7 +50,7 @@ static void nand_wait(void)
static void nand_load(unsigned int offs, int uboot_size, uchar *dst)
{
- lbus83xx_t *regs = (lbus83xx_t *)(CONFIG_SYS_IMMR + 0x5000);
+ fsl_lbus_t *regs = (fsl_lbus_t *)(CONFIG_SYS_IMMR + 0x5000);
uchar *buf = (uchar *)CONFIG_SYS_NAND_BASE;
int large = in_be32(&regs->bank[0].or) & OR_FCM_PGS;
int block_shift = large ? 17 : 14;