summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Snyder <iws@ovro.caltech.edu>2008-04-29 11:18:54 -0700
committerStefan Roese <sr@denx.de>2008-05-08 07:06:05 +0200
commit4adb3023de75bc150f088c8935db340930ad38c8 (patch)
treeb29e6c86126117fa79bff6e8bb352a7c16a993c2
parentb9bbefce1a653ea35f74a66ec117cdda2e043a4b (diff)
downloadu-boot-imx-4adb3023de75bc150f088c8935db340930ad38c8.zip
u-boot-imx-4adb3023de75bc150f088c8935db340930ad38c8.tar.gz
u-boot-imx-4adb3023de75bc150f088c8935db340930ad38c8.tar.bz2
ppc4xx: Add device tree support to AMCC Yosemite
Add support for booting with a device tree blob. This is needed to boot ARCH=powerpc kernels. Also add support for setting the eth0 mac address via the ethaddr variable. Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--board/amcc/yosemite/yosemite.c23
-rw-r--r--include/configs/yosemite.h9
2 files changed, 32 insertions, 0 deletions
diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c
index 6ec922a..212fab8 100644
--- a/board/amcc/yosemite/yosemite.c
+++ b/board/amcc/yosemite/yosemite.c
@@ -26,6 +26,8 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <spd_sdram.h>
+#include <libfdt.h>
+#include <fdt_support.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -554,3 +556,24 @@ void board_reset(void)
/* give reset to BCSR */
*(unsigned char *)(CFG_BCSR_BASE | 0x06) = 0x09;
}
+
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+void ft_board_setup(void *blob, bd_t *bd)
+{
+ u32 val[4];
+ int rc;
+
+ ft_cpu_setup(blob, bd);
+
+ /* Fixup NOR mapping */
+ val[0] = 0; /* chip select number */
+ val[1] = 0; /* always 0 */
+ val[2] = gd->bd->bi_flashstart;
+ 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));
+}
+#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index c9323f6..3bd115a 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -141,6 +141,14 @@
/*-----------------------------------------------------------------------
+ * Device tree support (Linux-2.6.26+)
+ *----------------------------------------------------------------------*/
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT 1
+#define CONFIG_OF_BOARD_SETUP 1
+
+/*-----------------------------------------------------------------------
* I2C
*----------------------------------------------------------------------*/
#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
@@ -227,6 +235,7 @@
#define CONFIG_MII 1 /* MII PHY management */
#define CONFIG_NET_MULTI 1 /* required for netconsole */
#define CONFIG_PHY1_ADDR 3
+#define CONFIG_HAS_ETH0 1 /* add support for "ethaddr" */
#define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */
#define CONFIG_PHY_ADDR 1 /* PHY address, See schematics */