diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-11-10 10:04:51 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-11-10 10:04:51 -0600 |
| commit | 33211469f7d7e2afacf103cc55790f734572f7a6 (patch) | |
| tree | 7c374cde48fba08b52b4f83bdf00aae89d7f85a3 /board/amcc | |
| parent | 1266df887781c779deaf6d05eea2ef90a470cb34 (diff) | |
| parent | 1378174a1351c0285736863a665ab758fe8d5f71 (diff) | |
| download | u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.zip u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.tar.gz u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'board/amcc')
| -rw-r--r-- | board/amcc/canyonlands/init.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S index 694cc89..51b46d7 100644 --- a/board/amcc/canyonlands/init.S +++ b/board/amcc/canyonlands/init.S @@ -98,7 +98,7 @@ tlbtab: tlbentry(CONFIG_SYS_AHB_BASE, SZ_1M, 0xbff00000, 4, AC_R|AC_W|AC_X|SA_G|SA_I) #if defined(CONFIG_RAPIDIO) - /* TLB-entries for RapidIO (SRIO) */ + /* TLB-entries for RapidIO (SRIO) */ tlbentry(CONFIG_SYS_SRGPL0_REG_BAR, SZ_16M, CONFIG_SYS_SRGPL0_REG_BAR, 0xD, AC_R|AC_W|SA_G|SA_I) tlbentry(CONFIG_SYS_SRGPL0_CFG_BAR, SZ_16M, CONFIG_SYS_SRGPL0_CFG_BAR, |