From 1df170f8b2a99e1e2f940f9f0b56511e1e4c9e1f Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Fri, 4 Jan 2008 12:07:27 -0600
Subject: Convert MPC8610HPCD to use libfdt.

Assumes the presence of the aliases node in the DTS to
locate the pci and serial nodes for fixups.

Use consistent fdtaddr and fdtfile in environment variables.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
 include/configs/MPC8610HPCD.h | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'include')

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 55df5aa..11c1836 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -245,17 +245,14 @@
 /*
  * Pass open firmware flat tree to kernel
  */
-#define CONFIG_OF_FLAT_TREE	1
-#define CONFIG_OF_BOARD_SETUP	1
+#define CONFIG_OF_LIBFDT		1
+#define CONFIG_OF_BOARD_SETUP		1
+#define CONFIG_OF_STDOUT_VIA_ALIAS	1
+
 
 /* maximum size of the flat tree (8K) */
 #define OF_FLAT_TREE_MAX_SIZE	8192
 
-#define OF_CPU		"PowerPC,8610@0"
-#define OF_SOC		"soc@e0000000"
-#define OF_TBCLK	(bd->bi_busfreq / 4)
-#define OF_STDOUT_PATH	"/soc@e0000000/serial@4500"
-
 #define CFG_64BIT_VSPRINTF	1
 #define CFG_64BIT_STRTOUL	1
 
@@ -618,8 +615,8 @@
  "consoledev=ttyS0\0"						\
  "ramdiskaddr=2000000\0"					\
  "ramdiskfile=8610hpcd/ramdisk.uboot\0"				\
- "dtbaddr=c00000\0"						\
- "dtbfile=8610hpcd/mpc8610_hpcd.dtb\0"				\
+ "fdtaddr=c00000\0"						\
+ "fdtfile=8610hpcd/mpc8610_hpcd.dtb\0"				\
  "bdev=sda3\0"					\
  "en-wd=mw.b f8100010 0x08; echo -expect:- 08; md.b f8100010 1\0" \
  "dis-wd=mw.b f8100010 0x00; echo -expect:- 00; md.b f8100010 1\0" \
@@ -658,8 +655,8 @@
  "consoledev=ttyS0\0"                                           \
  "ramdiskaddr=2000000\0"                                        \
  "ramdiskfile=8610hpcd/ramdisk.uboot\0"                         \
- "dtbaddr=c00000\0"                                             \
- "dtbfile=8610hpcd/mpc8610_hpcd.dtb\0"                          \
+ "fdtaddr=c00000\0"                                             \
+ "fdtfile=8610hpcd/mpc8610_hpcd.dtb\0"                          \
  "bdev=sda3\0"							\
  "othbootargs=diufb=15M video=fslfb:1280x1024-32@60,monitor=0\0"\
  "monitor=0-DVI\0"
@@ -671,22 +668,22 @@
 	"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
 	"console=$consoledev,$baudrate $othbootargs;"		\
  "tftp $loadaddr $bootfile;"					\
- "tftp $dtbaddr $dtbfile;"					\
- "bootm $loadaddr - $dtbaddr"
+ "tftp $fdtaddr $fdtfile;"					\
+ "bootm $loadaddr - $fdtaddr"
 
 #define CONFIG_RAMBOOTCOMMAND \
  "setenv bootargs root=/dev/ram rw "				\
 	"console=$consoledev,$baudrate $othbootargs;"		\
  "tftp $ramdiskaddr $ramdiskfile;"				\
  "tftp $loadaddr $bootfile;"					\
- "tftp $dtbaddr $dtbfile;"					\
- "bootm $loadaddr $ramdiskaddr $dtbaddr"
+ "tftp $fdtaddr $fdtfile;"					\
+ "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
 #define CONFIG_BOOTCOMMAND		\
  "setenv bootargs root=/dev/$bdev rw "	\
 	"console=$consoledev,$baudrate $othbootargs;"	\
  "tftp $loadaddr $bootfile;"		\
- "tftp $dtbaddr $dtbfile;"		\
- "bootm $loadaddr - $dtbaddr"
+ "tftp $fdtaddr $fdtfile;"		\
+ "bootm $loadaddr - $fdtaddr"
 
 #endif	/* __CONFIG_H */
-- 
cgit v1.1


From fe8dd0b2220b7c02b0d4c9c4f9967879970477b1 Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Wed, 9 Jan 2008 12:14:55 -0600
Subject: 86xx: Remove cache config from configs.h

Just use the standard defines in asm/cache.h.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
 include/configs/MPC8610HPCD.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'include')

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 11c1836..eb6ccb6 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -514,13 +514,6 @@
  */
 #define CFG_BOOTMAPSZ	(8 << 20)	/* Initial Memory map for Linux*/
 
-/* Cache Configuration */
-#define CFG_DCACHE_SIZE		32768
-#define CFG_CACHELINE_SIZE	32
-#if defined(CONFIG_CMD_KGDB)
-#define CFG_CACHELINE_SHIFT	5	/*log base 2 of the above value*/
-#endif
-
 /*
  * Internal Definitions
  *
-- 
cgit v1.1