From: Stefan Roese Date: Mon, 27 Jul 2009 07:13:38 +0000 (+0200) Subject: ppc4xx: Fix problem with NOR range assignment in Canyonlands ft_board_setup X-Git-Tag: v2009.08-rc2~41^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=042d01c72e0ea95731708dd24bb8b6cf42e75c80;p=oweals%2Fu-boot.git ppc4xx: Fix problem with NOR range assignment in Canyonlands ft_board_setup This patch fixes the problem, that the current fdt board fixup code only set's one range, the one for NOR. By this it's overwriting the already correctly configured values done in __ft_board_setup(). Just remove this now unneeded NOR fixup and all the ranges are correctly defined. Signed-off-by: Stefan Roese Cc: Dirk Eibach Cc: Felix Radensky --- diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index c0c135201f..5071c8d4e6 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -585,23 +585,8 @@ 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_board_setup(blob, bd); - /* Fixup NOR mapping */ - 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; - rc = fdt_find_and_setprop(blob, "/plb/opb/ebc", "ranges", - val, sizeof(val), 1); - if (rc) { - printf("Unable to update property NOR mapping, err=%s\n", - fdt_strerror(rc)); - } - if (gd->board_type == BOARD_CANYONLANDS_SATA) { /* * When SATA is selected we need to disable the first PCIe