diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-08 22:01:50 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-08 22:01:50 +0200 |
| commit | d073aeea4f46c2d2842010edba8e8a6ed92dbe1b (patch) | |
| tree | 61ed8c222fb72e731ec0d630c04e7bddb64a4e16 /board | |
| parent | 2e8a6f551cba550e9220dca4d8504066203b1f74 (diff) | |
| parent | 0580e48f53f972783e56fcedadb9ce6e5b0b6f32 (diff) | |
| download | blackbird-obmc-uboot-d073aeea4f46c2d2842010edba8e8a6ed92dbe1b.tar.gz blackbird-obmc-uboot-d073aeea4f46c2d2842010edba8e8a6ed92dbe1b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board')
| -rw-r--r-- | board/amcc/canyonlands/canyonlands.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 2b74689231..cfc1023f4f 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; |
