summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-08-16 11:01:21 -0500
committerAndrew Fleming-AFLEMING <afleming@freescale.com>2007-08-16 16:18:21 -0500
commitea5877e31ed63ade948fd1293895ec23fe01472e (patch)
treeb96829a437fa066665943e32ddbc39a81777233f
parentd35b508a55508535b6e8445b718585d27df733d3 (diff)
downloadu-boot-imx-ea5877e31ed63ade948fd1293895ec23fe01472e.zip
u-boot-imx-ea5877e31ed63ade948fd1293895ec23fe01472e.tar.gz
u-boot-imx-ea5877e31ed63ade948fd1293895ec23fe01472e.tar.bz2
Fix up some fdt issues on 8544DS
It looks like we had a merge issue that duplicated a bit of code in ft_board_setup. Also, we need to set CONFIG_HAS_ETH0 to get the MAC address properly set in the device tree on boot for TSEC1 Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--board/freescale/mpc8544ds/mpc8544ds.c7
-rw-r--r--include/configs/MPC8544DS.h1
2 files changed, 1 insertions, 7 deletions
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index 8ddbb01..80822be 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -540,12 +540,5 @@ ft_board_setup(void *blob, bd_t *bd)
debug("PCI@b000 first_busno=%d last_busno=%d\n",p[0],p[1]);
}
#endif
- ft_cpu_setup(blob, bd);
-
- p = ft_get_prop(blob, "/memory/reg", &len);
- if (p != NULL) {
- *p++ = cpu_to_be32(bd->bi_memstart);
- *p = cpu_to_be32(bd->bi_memsize);
- }
}
#endif
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 7863447..fcb92fa 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -472,6 +472,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/* The mac addresses for all ethernet interface */
#if defined(CONFIG_TSEC_ENET)
+#define CONFIG_HAS_ETH0
#define CONFIG_ETHADDR 00:E0:0C:02:00:FD
#define CONFIG_HAS_ETH1
#define CONFIG_ETH1ADDR 00:E0:0C:02:01:FD