[U-Boot-Users] [PATCH] ppc4xx: Add device tree support to AMCC Yosemite

[Ira Snyder]

Hello Stefan, U-Boot users

I have made the changes that Stefan requested:
* Include headers unconditionally
* Change "eth0addr" to "ethaddr"
* Change "Open Firmware support" to "device tree support"
* Add NOR flash mapping fixup from Sequoia

I have re-tested the same three setups I tested earlier:
1) Old ARCH=ppc 2.6.13 kernel
2) New ARCH=powerpc 2.6.26rc0 kernel (cuImage)
3) New ARCH=powerpc 2.6.26rc0 kernel (uImage + dtb)

I did not test the NOR flash mapping fixup, as I do not have any NOR
flash to test with. It is an exact copy of the Sequoia code, so I hope
it is correct.

Thanks for the comments.
Ira


>From d2775a95e00d5647583763614cdf4c03a53d39c3 Mon Sep 17 00:00:00 2001
From: Ira W. Snyder <iws at ovro.caltech.edu>
Date: Sat, 26 Apr 2008 16:06:26 -0700
Subject: [PATCH] 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 at ovro.caltech.edu>
---
 board/amcc/yosemite/yosemite.c |   23 +++++++++++++++++++++++
 include/configs/yosemite.h     |    9 +++++++++
 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	*/
 
-- 
1.5.4.3