Update from 2013.01 to 2013.07

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

diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index 868a0b804442d89a28d7fd2dc87543753aeb7549..efe699538ce95e214c1c69d4b8e07cacc03ae558 100644 (file)
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -2,23 +2,7 @@
  * (C) Copyright 2000-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -39,6 +23,7 @@
 #define        CONFIG_SYS_TEXT_BASE    0x40000000
 
 #define CONFIG_LCD
+#define CONFIG_MPC8XX_LCD
 #undef  CONFIG_EDT32F10
 #define CONFIG_SHARP_LQ057Q3DC02
 
@@ -96,10 +81,13 @@
 #define        CONFIG_RTC_MPC8xx               /* use internal RTC of MPC8xx   */
 
 #define CONFIG_HARD_I2C                1       /* To I2C with hardware support */
-#undef CONFIG_SORT_I2C                 /* To I2C with software support */
+#undef CONFIG_SYS_I2C_SOFT             /* To I2C with software support */
 #define CONFIG_SYS_I2C_SPEED           4700    /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 
+#if defined(CONFIG_SYS_I2C_SOFT)
+#define CONFIG_SYS_SYS_I2C_SOFT_SPEED  4700 /* I2C speed and slave address */
+#define CONFIG_SYS_SYS_I2C_SOFT_SLAVE  0x7F
 /*
  * Software (bit-bang) I2C driver configuration
  */
@@ -115,6 +103,7 @@
 #define I2C_SCL(bit)           if(bit) immr->im_cpm.cp_pbdat |=  PB_SCL; \
                                else    immr->im_cpm.cp_pbdat &= ~PB_SCL
 #define I2C_DELAY              udelay(50)
+#endif /* #define(CONFIG_SYS_I2C_SOFT) */
 
 #define CONFIG_SYS_I2C_LCD_ADDR        0x8     /* LCD Control */
 #define CONFIG_SYS_I2C_KEY_ADDR        0x9     /* Keyboard coprocessor */