summaryrefslogtreecommitdiff
path: root/board/amcc
diff options
context:
space:
mode:
authorFelix Radensky <felix@embedded-sol.com>2009-06-22 15:30:42 +0300
committerStefan Roese <sr@denx.de>2009-07-08 10:59:06 +0200
commit26d37f0061ad05e5c383c910f00e6006f3c89a3a (patch)
tree268351b2fdf62f9235aa073146fe9fd5879c4df7 /board/amcc
parent59869ca72df8bc4e4ffa9dd17cb6673bbe010272 (diff)
downloadu-boot-imx-26d37f0061ad05e5c383c910f00e6006f3c89a3a.zip
u-boot-imx-26d37f0061ad05e5c383c910f00e6006f3c89a3a.tar.gz
u-boot-imx-26d37f0061ad05e5c383c910f00e6006f3c89a3a.tar.bz2
ppc4xx: Fix FDT EBC mappings on Canyonlands
This patch fixes 2 problems with FDT EBC mappings on Canyonlands. First, NAND EBC mapping was missing, making Linux NAND driver unusable on this board. Second, NOR remapping code assumed that NOR is always on CS0, however when booting from NAND NOR is on CS3. Signed-off-by: Felix Radensky <felix@embedded-sol.com> Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/amcc')
-rw-r--r--board/amcc/canyonlands/canyonlands.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index 2b74689..cfc1023 100644
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@@ -575,15 +575,17 @@ int misc_init_r(void)
#endif /* !defined(CONFIG_ARCHES) */
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+extern void __ft_board_setup(void *blob, bd_t *bd);
+
void ft_board_setup(void *blob, bd_t *bd)
{
u32 val[4];
int rc;
- ft_cpu_setup(blob, bd);
+ __ft_board_setup(blob, bd);
/* Fixup NOR mapping */
- val[0] = 0; /* chip select number */
+ val[0] = CONFIG_SYS_NOR_CS; /* chip select number */
val[1] = 0; /* always 0 */
val[2] = CONFIG_SYS_FLASH_BASE_PHYS_L; /* we fixed up this address */
val[3] = gd->bd->bi_flashsize;