powerpc: mpc8260: consolidate CONFIG_MPC8260 and CONFIG_8260

[karo-tx-uboot.git] / include / configs / CPU87.h

diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index bbd0022f749bcb2bbc99cb9ef6664e58bebc314a..d3a59e8ba7e32701018fa69fda214ec64c5ca2c2 100644 (file)
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -2,7 +2,7 @@
  * (C) Copyright 2001-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -17,7 +17,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU               */
 #define CONFIG_CPU87           1       /* ...on a CPU87 board  */
 #define CONFIG_PCI
 #define CONFIG_CPM2            1       /* Has a CPM2 */
@@ -117,10 +116,11 @@
 /*-----------------------------------------------------------------------
  * I2C/EEPROM/RTC configuration
  */
-#define CONFIG_SOFT_I2C                        /* Software I2C support enabled */
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT            /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      50000
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0xFE
 
-# define CONFIG_SYS_I2C_SPEED          50000
-# define CONFIG_SYS_I2C_SLAVE          0xFE
 /*
  * Software (bit-bang) I2C driver configuration
  */
@@ -184,7 +184,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory         */
-#define CONFIG_SYS_PROMPT      "=> "           /* Monitor Command Prompt       */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O Buffer Size      */
 #else
@@ -199,8 +198,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR   0x100000        /* default load address */
 
-#define CONFIG_SYS_HZ          1000            /* decrementer freq: 1 ms ticks */
-
 #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100    /* "bad" address                */
 
 #define CONFIG_LOOPW