powerpc: mpc83xx: remove redundant CONFIG_MPC83xx definition

We do not have to define CONFIG_MPC83xx in board config headers
because it is defined in arch/powerpc/cpu/mpc83xx/config.mk.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h
index 8a400298096e6099333eb62bfcd125e167fc2431..3dcea0b595bc725e021dafc3e9ec9085f93dcf4c 100644 (file)
--- a/include/configs/MERGERBOX.h
+++ b/include/configs/MERGERBOX.h
@@ -16,7 +16,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300    1
-#define CONFIG_MPC83xx 1
 #define CONFIG_MPC837x 1
 #define CONFIG_MPC8377 1
 

diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 0131b9c6d48579ab91506d914277faabd3dd1490..bf974fd46189310c22de4e551ce7f7e79ccd53fe 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -13,7 +13,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1 /* E300 family */
-#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC830x         1 /* MPC830x family */
 #define CONFIG_MPC8308         1 /* MPC8308 CPU specific */
 #define CONFIG_MPC8308RDB      1 /* MPC8308RDB board specific */

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 07719e9265fde526677ee0a4ad275ac75908ac84..69b2cb197056dedee2fbc91d49c1f48d6a5e7b08 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -14,7 +14,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1
-#define CONFIG_MPC83xx         1
 #define CONFIG_MPC831x         1
 #define CONFIG_MPC8313         1
 #define CONFIG_MPC8313ERDB     1

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index aedb529f86133133541e0d6e2b73e00ffc677836..3dd52ce30f38297a01c9e7fc271787e45dfdf079 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -35,7 +35,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1 /* E300 family */
-#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC831x         1 /* MPC831x CPU family */
 #define CONFIG_MPC8315         1 /* MPC8315 CPU specific */
 #define CONFIG_MPC8315ERDB     1 /* MPC8315ERDB board specific */

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index c4c771b502eac0c285dc24eb7a2a92fa84b57fb8..65a63e2b7fc6b0f5cbc6721942b09638de350c53 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -14,7 +14,6 @@
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC832x         1       /* MPC832x CPU specific */
 
 #define        CONFIG_SYS_TEXT_BASE    0xFE000000

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index f5b62025d6ff27010579eb9f1c8e363ca45ae8a3..1735b3c5216e1f8002a04f90767673d0bfb1f04a 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -12,7 +12,6 @@
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC832x         1       /* MPC832x CPU specific */
 #define CONFIG_MPC832XEMDS     1       /* MPC832XEMDS board specific */
 

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 7640d06ee77aa76f9815585db66ffef6cb27e3ef..6b7d648944385d9b088803703899c263a8164aee 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -17,7 +17,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 Family */
-#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC834x         1       /* MPC834x family */
 #define CONFIG_MPC8349         1       /* MPC8349 specific */
 #define CONFIG_MPC8349EMDS     1       /* MPC8349EMDS board specific */

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index ffb9a158aec96f8a8580fde30f74bb4b6732cc07..398918a94002674e545da6c9e29d6d8414ef4d5b 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -47,7 +47,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_MPC83xx         1
 #define CONFIG_MPC834x         /* MPC834x family (8343, 8347, 8349) */
 #define CONFIG_MPC8349         /* MPC8349 specific */
 

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index d4c82cd669ed5bbe90608ab48e3c2e082ef481f4..aefde74fc52d68825e9ca2a9c825fc96c6402ae3 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -14,7 +14,6 @@
  */
 #define CONFIG_E300            1 /* E300 family */
 #define CONFIG_QE              1 /* Has QE */
-#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC8360         1 /* MPC8360 CPU specific */
 #define CONFIG_MPC8360EMDS     1 /* MPC8360EMDS board specific */
 

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 01e7ac76817b086896baef979994c0523a5ee117..1b8bad179b5221ce18daec4f127eb5db18e09e10 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -19,7 +19,6 @@
  */
 #define CONFIG_E300            1 /* E300 family */
 #define CONFIG_QE              1 /* Has QE */
-#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC8360         1 /* MPC8360 CPU specific */
 #define CONFIG_MPC8360ERDK     1 /* MPC8360ERDK board specific */
 

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index f52e77a3a7c71591f331811dea5363a8634464a3..695e47bf07f46589befccee6028c8ab4ce1e6b27 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -12,7 +12,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1 /* E300 family */
-#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC837x         1 /* MPC837x CPU specific */
 #define CONFIG_MPC837XEMDS     1 /* MPC837XEMDS board specific */
 

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 938f7ab3c4f59654dfaafae37c12288e795716f3..1d1f4c0e2224b29769ee462d1bca7af325809a76 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -13,7 +13,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1 /* E300 family */
-#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC837x         1 /* MPC837x CPU specific */
 #define CONFIG_MPC837XERDB     1
 

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index efdf1aa670dab2dd6f7e8de8fa76f6eb6fb58125..30af691c5a3a2ae0877c01278e4b11e9f3abd854 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -17,7 +17,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300    1
-#define CONFIG_MPC83xx 1
 #define CONFIG_MPC834x 1
 #define CONFIG_MPC8343 1
 

diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index 40fb63d14f889065ef5d8634e75ed4a0dc11d900..46157ccc400ff2a79a0ab7a083e28ff5b5cbb99b 100644 (file)
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -16,7 +16,6 @@
 #define CONFIG_NAND_U_BOOT
 
 #define CONFIG_E300                    1
-#define CONFIG_MPC83xx                 1
 #define CONFIG_MPC831x                 1
 #define CONFIG_MPC8313                 1
 

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 15cf2bd793eb6620d3f673f110c128abedf2b51e..6762e3a57e2c71587ac4b2ded949cdfe06d25fab 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -16,7 +16,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 Family */
-#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC834x         1       /* MPC834x specific */
 #define CONFIG_MPC8349         1       /* MPC8349 specific */
 #define CONFIG_TQM834X         1       /* TQM834X board specific */

diff --git a/include/configs/km/km8309-common.h b/include/configs/km/km8309-common.h
index 47355abed944ebdd042d0b800aece13bacc06dc7..29c6f60971aa0776d0e841aacaf19f061bc8484f 100644 (file)
--- a/include/configs/km/km8309-common.h
+++ b/include/configs/km/km8309-common.h
@@ -15,7 +15,6 @@
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC830x         1       /* MPC830x family */
 #define CONFIG_MPC8309         1       /* MPC8309 CPU specific */
 

diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index de7a53a8c22b5fe6454c23f1587b0376c9f66905..4ae9afd4e5a79fb3ddf6dcf559abf3dde545823b 100644 (file)
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -13,7 +13,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1 /* E300 family */
-#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC830x         1 /* MPC830x family */
 #define CONFIG_MPC8308         1 /* MPC8308 CPU specific */
 #define CONFIG_MPC8308_P1M     1 /* mpc8308_p1m board specific */

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index b7f83e010525eb81bd3c9f71050eb0aef932b986..2516a3e97e335cff14732439afc72e35d4c9d162 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -19,7 +19,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 Family */
-#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC834x         1       /* MPC834x family */
 #define CONFIG_MPC8349         1       /* MPC8349 specific */
 #define CONFIG_SBC8349         1       /* WRS SBC8349 board specific */

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 5cf4ae5be879d54eed40c8664d15c0bb45cd1f8b..00787bbb281c749d6348ca132ec201f42e05b786 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -17,7 +17,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1
-#define CONFIG_MPC83xx         1
 #define CONFIG_MPC831x         1
 #define CONFIG_MPC8313         1
 #define CONFIG_VE8313          1

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 7ecbafe2e582276c1787c8a96307e449811bc3b4..175311cad9204467f1689ec540dac03b9e33f162 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -29,7 +29,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 Family */
-#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC834x         1       /* MPC834x family */
 #define CONFIG_MPC8349         1       /* MPC8349 specific */
 #define CONFIG_VME8349         1       /* ESD VME8349 board specific */