Merge branch 'u-boot/master'

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

diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 774c98faec0f6e728dc90bb70b8357a629bcf3b6..38940194fb48574507d0155801b0ec486496b9f0 100644 (file)
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -6,24 +6,7 @@
  *
  * Copyright (c) 2000-2002 Dave Ellis, SIXNET, dge@sixnetio.com
  *
- * 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+
  */
 
 /*
@@ -121,7 +104,10 @@
 
 #define        CONFIG_RTC_DS1306               /* Dallas 1306 real time clock  */
 
-#define        CONFIG_SOFT_I2C                 /* I2C bit-banged               */
+#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
 /*
  * Software (bit-bang) I2C driver configuration
  */
@@ -138,8 +124,6 @@
                        else    immr->im_cpm.cp_pbdat &= ~PB_SCL
 #define I2C_DELAY      udelay(5)       /* 1/4 I2C clock duration */
 
-# define CONFIG_SYS_I2C_SPEED          50000
-# define CONFIG_SYS_I2C_SLAVE          0xFE
 # define CONFIG_SYS_I2C_EEPROM_ADDR    0x50    /* Atmel 24C64                  */
 # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2      /* two byte address             */
 
@@ -171,7 +155,6 @@
  * Miscellaneous configurable options
  */
 #define        CONFIG_SYS_LONGHELP                     /* undef to save a little memory */
-#define        CONFIG_SYS_PROMPT               "=>"    /* Monitor Command Prompt       */
 #if defined(CONFIG_CMD_KGDB)
 #define        CONFIG_SYS_CBSIZE       1024            /* Console I/O Buffer Size      */
 #else
@@ -186,10 +169,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x00100000
 
-#define        CONFIG_SYS_HZ           1000            /* decrementer freq: 1 ms ticks */
-
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)