Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index fcf66b7bc7a13acad742279cc3aa7e9bd2c9ec7f..39eb2ef1336bd8600f4c3628ad0aa3d88097f132 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -1,23 +1,7 @@
 /*
  * (C) Copyright 2004 Sandburst Corporation
  *
- * 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+
  */
 
 /************************************************************************
@@ -96,7 +80,6 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
-#define CONFIG_SERIAL_MULTI   1
 #define CONFIG_BAUDRATE              9600
 
 #define CONFIG_SYS_BAUDRATE_TABLE  \
@@ -134,14 +117,15 @@
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
-#define CONFIG_HARD_I2C              1              /* I2C hardware support    */
-#undef CONFIG_SOFT_I2C                      /* I2C !bit-banged         */
-#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
-#define CONFIG_SYS_I2C_SPEED         400000         /* I2C speed 400kHz        */
-#define CONFIG_SYS_I2C_SLAVE         0x7F           /* I2C slave address       */
-#define CONFIG_SYS_I2C_NOPROBES      {0x69}         /* Don't probe these addrs */
-#define CONFIG_I2C_BUS1              1              /* Include i2c bus 1 supp  */
-
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_PPC4XX
+#define CONFIG_SYS_I2C_PPC4XX_CH0
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000
+#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F
+#define CONFIG_SYS_I2C_PPC4XX_CH1
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_1 400000 /* I2C speed 400kHz */
+#define CONFIG_SYS_I2C_PPC4XX_SLAVE_1 0x7F
+#define CONFIG_SYS_I2C_NOPROBES { { 0, 0x69} } /* Don't probe these addrs */
 
 /*-----------------------------------------------------------------------
  * Environment
@@ -164,7 +148,6 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII           1              /* MII PHY management      */
-#define CONFIG_NET_MULTI      1
 #define CONFIG_PHY_ADDR              0xff           /* no phy on EMAC0         */
 #define CONFIG_PHY1_ADDR      0xff          /* no phy on EMAC1         */
 #define CONFIG_PHY2_ADDR      0x08          /* PHY addr, MGMT, EMAC2   */
@@ -224,7 +207,6 @@
 #define CONFIG_SYS_PROMPT            "KaRefDes=> "  /* Monitor Command Prompt  */
 
 #define CONFIG_SYS_HUSH_PARSER        1             /* HUSH for ext'd cli      */
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
 
 
 /*-----------------------------------------------------------------------
@@ -271,6 +253,7 @@
  *----------------------------------------------------------------------*/
 /* General PCI */
 #define CONFIG_PCI                          /* include pci support     */
+#define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
 #define CONFIG_PCI_PNP                      /* do pci plug-and-play    */
 #define CONFIG_PCI_SCAN_SHOW                /* show pci devices        */
 #define CONFIG_SYS_PCI_TARGBASE      (CONFIG_SYS_PCI_MEMBASE)
@@ -290,7 +273,6 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE  230400        /* kgdb serial port baud   */
-#define CONFIG_KGDB_SER_INDEX 2                     /* kgdb serial port        */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -300,7 +282,4 @@
 #define CONFIG_SYS_LOAD_ADDR         0x8000000      /* default load address    */
 #define CONFIG_SYS_EXTBDINFO         1              /* use extended board_info */
 
-#define CONFIG_SYS_HZ                100            /* decr freq: 1 ms ticks   */
-
-
 #endif /* __CONFIG_H */