ppc: Get rid of unused machine type definitions

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/board/fads/fads.h b/board/fads/fads.h
index dea8a0dc10082c0a52b26ea95ade74a0350e6421..83c67049cea18d1eee98894b458cb5c1897dfa00 100644 (file)
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -457,10 +457,6 @@
 */
 #define NR_8259_INTS   0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 /*-----------------------------------------------------------------------
  * PCMCIA stuff
  *-----------------------------------------------------------------------

diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index aec325b470aba707984e1841b80c09a046151299..4c049a5e932affad58e690261de1f3cdb17647a5 100644 (file)
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -911,55 +911,6 @@
 #define SVR_8641       0x809000
 #define SVR_8641D      0x809001
 
-/* I am just adding a single entry for 8260 boards.  I think we may be
- * able to combine mbx, fads, rpxlite, bseip, and classic into a single
- * generic 8xx as well.  The boards containing these processors are either
- * identical at the processor level (due to the high integration) or so
- * wildly different that testing _machine at run time is best replaced by
- * conditional compilation by board type (found in their respective .h file).
- *     -- Dan
- */
-#define _MACH_prep     0x00000001
-#define _MACH_Pmac     0x00000002      /* pmac or pmac clone (non-chrp) */
-#define _MACH_chrp     0x00000004      /* chrp machine */
-#define _MACH_mbx      0x00000008      /* Motorola MBX board */
-#define _MACH_apus     0x00000010      /* amiga with phase5 powerup */
-#define _MACH_fads     0x00000020      /* Motorola FADS board */
-#define _MACH_rpxlite  0x00000040      /* RPCG RPX-Lite 8xx board */
-#define _MACH_bseip    0x00000080      /* Bright Star Engineering ip-Engine */
-#define _MACH_yk       0x00000100      /* Motorola Yellowknife */
-#define _MACH_gemini   0x00000200      /* Synergy Microsystems gemini board */
-#define _MACH_classic  0x00000400      /* RPCG RPX-Classic 8xx board */
-#define _MACH_oak      0x00000800      /* IBM "Oak" 403 eval. board */
-#define _MACH_walnut   0x00001000      /* AMCC "Walnut" 405GP eval. board */
-#define _MACH_8260     0x00002000      /* Generic 8260 */
-#define _MACH_sandpoint 0x00004000     /* Motorola SPS Processor eval board */
-#define _MACH_tqm860   0x00008000      /* TQM860/L */
-#define _MACH_tqm8xxL  0x00010000      /* TQM8xxL */
-#define _MACH_hidden_dragon 0x00020000 /* Motorola Hidden Dragon eval board */
-
-/* see residual.h for these */
-#define _PREP_Motorola 0x01  /* motorola prep */
-#define _PREP_Firm     0x02  /* firmworks prep */
-#define _PREP_IBM      0x00  /* ibm prep */
-#define _PREP_Bull     0x03  /* bull prep */
-#define _PREP_Radstone 0x04  /* Radstone Technology PLC prep */
-
-/*
- * Radstone board types
- */
-#define RS_SYS_TYPE_PPC1   0
-#define RS_SYS_TYPE_PPC2   1
-#define RS_SYS_TYPE_PPC1a  2
-#define RS_SYS_TYPE_PPC2a  3
-#define RS_SYS_TYPE_PPC4   4
-#define RS_SYS_TYPE_PPC4a  5
-#define RS_SYS_TYPE_PPC2ep 6
-
-/* these are arbitrary */
-#define _CHRP_Motorola 0x04  /* motorola chrp, the cobra */
-#define _CHRP_IBM      0x05  /* IBM chrp, the longtrail and longtrail 2 */
-
 #define _GLOBAL(n)\
        .globl n;\
 n:

diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index f810af2ceca6fdb37397a3a83726c678c929e890..86cbe5872ad2feda890b883f29ce2303db2c26a1 100644 (file)
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -458,10 +458,6 @@
 */
 #define NR_8259_INTS   0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 /*
  * MPC8xx CPM Options
  */

diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index a09c0e0393fd4b4ee5056029a2a28de674f048e0..356705ba1fda5cf92bc87418370dd451e286ac7e 100644 (file)
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -410,10 +410,6 @@
 */
 #define NR_8259_INTS   0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 #define CONFIG_DISK_SPINUP_TIME 1000000
 
 

diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h
index 785355a8e6679bde8b826308b254a9fa4e2525c3..3a660edae22986240b3e06433c219c958fc04b02 100644 (file)
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -348,10 +348,6 @@
 */
 #define NR_8259_INTS   0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 /*
  * MPC8xx CPM Options
  */

diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h
index 69d195dc028671ebf4a3727719e20544814b075c..3b88507ded72b84317cb5fc098f7c0d8118d91ae 100644 (file)
--- a/include/configs/MBX860T.h
+++ b/include/configs/MBX860T.h
@@ -379,10 +379,6 @@
 */
 #define NR_8259_INTS   0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 /*
  * MPC8xx CPM Options
  */

diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index 2efc8f10ec198415466b4e90ac730019127e8d46..6f2425fc7f8bc488067913dc872e138e24bef66a 100644 (file)
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -429,8 +429,4 @@
 #define        BOOTFLAG_COLD   0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 #endif /* __CONFIG_H */