diff --git a/board/freescale/common/pixis.h b/board/freescale/common/pixis.h
index df3cc09b9c205019aeca2ee585e0943d916ccebf..bb0e65e356532bd92c885fa28d8acabb00d0613b 100644
--- a/board/freescale/common/pixis.h
+++ b/board/freescale/common/pixis.h
@@ -102,7 +102,7 @@ typedef struct pixis {
 	u8 res4[25];
 } __attribute__ ((packed)) pixis_t;
 
-#elif defined(CONFIG_MPC8610HPCD)
+#elif defined(CONFIG_TARGET_MPC8610HPCD)
 typedef struct pixis {
 	u8 id;
 	u8 ver;	/* also called arch */
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index b71a0f5130e6b3164179be922524062c4cb13b88..75693a0423af1608ffe3bbbd80f25fae831ff652 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -12,7 +12,6 @@
 #define __CONFIG_H
 
 /* High Level Configuration Options */
-#define CONFIG_MPC8610HPCD	1	/* MPC8610HPCD board specific */
 #define CONFIG_LINUX_RESET_VEC	0x100	/* Reset vector used by Linux */
 
 #define	CONFIG_SYS_TEXT_BASE	0xfff00000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e5e91d9a5a4dabfe0eaab819e36e82323da4c778..75fe00b7eaf8ac6ec94b31716d21a5c47a31ac52 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3146,7 +3146,6 @@ CONFIG_MPC85XX_FEC_NAME
 CONFIG_MPC85XX_PCI2
 CONFIG_MPC860
 CONFIG_MPC860T
-CONFIG_MPC8610HPCD
 CONFIG_MPC862
 CONFIG_MPC8641
 CONFIG_MPC8641HPCN