MPC832XEMDS: Migrate to CONFIG_TARGET_MPC832XEMDS

Use the proper CONFIG_TARGET_MPC832XEMDS Kconfig option to replace the
CONFIG_MPC832XEMDS ad-hoc config option.

Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/board/freescale/common/pq-mds-pib.c b/board/freescale/common/pq-mds-pib.c
index d152a7821f4a41edbc84e2f5ae7435c1c2f127c2..ae6603985751d7dd48d534f43072a0be4c579614 100644 (file)
--- a/board/freescale/common/pq-mds-pib.c
+++ b/board/freescale/common/pq-mds-pib.c
@@ -36,7 +36,7 @@ int pib_init(void)
        i2c_write(0x26, 0x6, 1, &val8, 1);
        val8 = 0x34;
        i2c_write(0x26, 0x7, 1, &val8, 1);
-#if defined(CONFIG_MPC832XEMDS)
+#if defined(CONFIG_TARGET_MPC832XEMDS)
        val8 = 0xf9;            /* PMC2, PMC3 slot to PCI bus */
 #else
        val8 = 0xf3;            /* PMC1, PMC2, PMC3 slot to PCI bus */
@@ -55,7 +55,7 @@ int pib_init(void)
 
        eieio();
 
-#if defined(CONFIG_MPC832XEMDS)
+#if defined(CONFIG_TARGET_MPC832XEMDS)
        printf("PCI 32bit bus on PMC2 &PMC3\n");
 #else
        printf("PCI 32bit bus on PMC1 & PMC2 &PMC3\n");
@@ -76,7 +76,7 @@ int pib_init(void)
        eieio();
 
        printf("QOC3 ATM card on PMC0\n");
-#elif defined(CONFIG_MPC832XEMDS)
+#elif defined(CONFIG_TARGET_MPC832XEMDS)
        val8 = 0;
        i2c_write(0x26, 0x7, 1, &val8, 1);
        val8 = 0xf7;

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 0bb7db9bc374fd61a8f40e86148f7c21ca9c0469..4cb595bb8e5f531b4fb3ffe3f1e9960257051d63 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -11,7 +11,6 @@
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC832XEMDS     1       /* MPC832XEMDS board specific */
 
 /*
  * System Clock Setup

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 761cdf6748c16454f8949c325b76260550464ab1..b426f2a777d9762e7ee8ca27419d26f4bb0eeddc 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1222,7 +1222,6 @@ CONFIG_MMU
 CONFIG_MONITOR_IS_IN_RAM
 CONFIG_MPC8313ERDB
 CONFIG_MPC8315ERDB
-CONFIG_MPC832XEMDS
 CONFIG_MPC8349ITX
 CONFIG_MPC837XEMDS
 CONFIG_MPC837XERDB