diff --git a/README b/README
index ff4ed8b95c0de979e17c56efcb65238afc1ba8a4..3cb7786d4edada367cdf26477119adb050898f0a 100644
--- a/README
+++ b/README
@@ -368,8 +368,10 @@ The following options need to be configured:
 		 * Adds the "fdt" command
 		 * The bootm command automatically updates the fdt
 
-		OF_CPU - The proper name of the cpus node.
-		OF_SOC - The proper name of the soc node.
+		OF_CPU - The proper name of the cpus node (only required for
+			MPC512X and MPC5xxx based boards).
+		OF_SOC - The proper name of the soc node (only required for
+			MPC512X and MPC5xxx based boards).
 		OF_TBCLK - The timebase frequency.
 		OF_STDOUT_PATH - The path to the console device
 
diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index 4c4af054b2a79ecd87add46120b3195727288e68..147a8b267dace91ed70f44230c71f2b3054b0f60 100644
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -125,8 +125,6 @@
 #define CONFIG_OF_LIBFDT	1
 #define CONFIG_OF_BOARD_SETUP	1
 
-#define OF_CPU	"PowerPC,8247@0"
-#define OF_SOC	"soc@f0000000"
 #define OF_TBCLK	(bd->bi_busfreq / 4)
 #define OF_STDOUT_PATH	"/soc@f0000000/serial8250@e0008000"
 
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 942a4cc487694ca4c2859fad5d6c60747a98f5fb..677a1439c753cc2330f87cbb989ccdb129dbebe4 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -209,7 +209,6 @@
 #define CONFIG_OF_LIBFDT	1
 #define CONFIG_OF_BOARD_SETUP	1
 #if defined(CONFIG_OF_LIBFDT)
-#define OF_CPU			"cpu@0"
 #define OF_TBCLK		(bd->bi_busfreq / 4)
 #endif
 
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 2feb3ae31d41b25d6b1b9e8584a301eadd0937f2..16b464cf6dac5ae7f5fcbea02edea78f0984e051 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -96,8 +96,6 @@
 
 #define CONFIG_OF_LIBFDT	1
 
-#define OF_CPU			"PowerPC,603e"
-#define OF_SOC			"soc10x@80000000"
 #define OF_STDOUT_PATH		"/soc10x/serial@80004600"
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index b955749d8fcb44c2367ed5911025ba6cfc004e31..55d1fc90fc6e4d9abe5622677072a7ed5309ff06 100644
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -347,8 +347,6 @@
 #define CONFIG_OF_LIBFDT	1
 #define CONFIG_OF_BOARD_SETUP	1
 
-#define OF_CPU			"PowerPC,8247@0"
-#define OF_SOC			"soc@f0000000"
 #define OF_TBCLK		(bd->bi_busfreq / 4)
 #define OF_STDOUT_PATH		"/soc/cpm/serial@11a90"
 
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 4f98ba41a5d1b2f07fff8c09c839427f697ae2f6..be12186aca06b12a27ab64ceda51a92d901fdd56 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -79,7 +79,6 @@
 #define CONFIG_OF_LIBFDT	1
 #define CONFIG_OF_BOARD_SETUP	1
 
-#define OF_CPU			"PowerPC,7448@0"
 #define OF_TSI			"tsi108@c0000000"
 #define OF_TBCLK		(bd->bi_busfreq / 8)
 #define OF_STDOUT_PATH		"/tsi108@c0000000/serial@7808"
diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index ae033b2da55a81e0929e5873f4df4de1cba97d93..c94daa3d0335ce82477d907ce60196d82f7ae72c 100644
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -405,8 +405,6 @@
 #define CONFIG_OF_LIBFDT	1
 #define CONFIG_OF_BOARD_SETUP	1
 
-#define OF_CPU			"PowerPC,8270@0"
-#define OF_SOC			"soc@f0000000"
 #define OF_TBCLK		(bd->bi_busfreq / 4)
 #if defined(CONFIG_MUAS_DEV_BOARD)
 #define OF_STDOUT_PATH		"/soc/cpm/serial@11a90"
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index d16262b6cffe8c0c422c5706ba420546edd27227..585436604f2229d42bf3b3055ba5a2393f7de4f9 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -509,7 +509,6 @@ typedef unsigned int led_id_t;
 /* pass open firmware flattened device tree */
 #define CONFIG_OF_LIBFDT	1
 
-#define OF_CPU			"PowerPC,MPC870@0"
 #define OF_TBCLK		(MPC8XX_HZ / 16)
 
 #endif	/* __CONFIG_H */