summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-04-18 17:47:39 +0200
committerWolfgang Denk <wd@denx.de>2007-04-18 17:47:39 +0200
commit5cca4092bd23d255ed304b8f76cd18ac11adb785 (patch)
tree0159b09bbed29dab7b44fc76fd54f8ce7906fec6 /board
parentfd094c6379e2ef8a4d0ceb5640b24cb0c8d04449 (diff)
parentf35a53fc7b0c79fcfe7bdc01163c4b34aaba1460 (diff)
downloadblackbird-obmc-uboot-5cca4092bd23d255ed304b8f76cd18ac11adb785.tar.gz
blackbird-obmc-uboot-5cca4092bd23d255ed304b8f76cd18ac11adb785.zip
Merge with /home/wd/git/u-boot/custodian/u-boot-fdt
Diffstat (limited to 'board')
-rw-r--r--board/mpc8360emds/mpc8360emds.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/board/mpc8360emds/mpc8360emds.c b/board/mpc8360emds/mpc8360emds.c
index deadb5ffbe..5cabe47084 100644
--- a/board/mpc8360emds/mpc8360emds.c
+++ b/board/mpc8360emds/mpc8360emds.c
@@ -664,19 +664,28 @@ U_BOOT_CMD(ecc, 4, 0, do_ecc,
#if (defined(CONFIG_OF_FLAT_TREE) || defined(CONFIG_OF_LIBFDT)) \
&& defined(CONFIG_OF_BOARD_SETUP)
+
+/*
+ * Prototypes of functions that we use.
+ */
+void ft_cpu_setup(void *blob, bd_t *bd);
+
+#ifdef CONFIG_PCI
+void ft_pci_setup(void *blob, bd_t *bd);
+#endif
+
void
ft_board_setup(void *blob, bd_t *bd)
{
#if defined(CONFIG_OF_LIBFDT)
int nodeoffset;
- int err;
int tmp[2];
nodeoffset = fdt_path_offset (fdt, "/memory");
if (nodeoffset >= 0) {
tmp[0] = cpu_to_be32(bd->bi_memstart);
tmp[1] = cpu_to_be32(bd->bi_memsize);
- err = fdt_setprop(fdt, nodeoffset, "reg", tmp, sizeof(tmp));
+ fdt_setprop(fdt, nodeoffset, "reg", tmp, sizeof(tmp));
}
#else
u32 *p;
@@ -694,4 +703,5 @@ ft_board_setup(void *blob, bd_t *bd)
#endif
ft_cpu_setup(blob, bd);
}
-#endif
+#endif /* CONFIG_OF_x */
+
OpenPOWER on IntegriCloud