diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index c0c135201f8709827d577de5a42d2d4ee3c203e2..5071c8d4e6dc94fd9ada0ec16b30fea7163ebc70 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