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

[people/ms/u-boot.git] / include / configs / redwood.h

diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index f75ab6781826455266bf1bf963ecafcd8d70e0fa..72fbf108fa41a074e53bae9f5aa68a0eb5b5585e 100644 (file)
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -4,23 +4,7 @@
  * (C) Copyright 2008
  * Feng Kan, Applied Micro Circuits Corp., fkan@amcc.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+
  */
 #ifndef __CONFIG_H
 #define __CONFIG_H
@@ -28,7 +12,6 @@
 /*-----------------------------------------------------------------------
  * High Level Configuration Options
  *----------------------------------------------------------------------*/
-#define CONFIG_4xx                     1       /* ... PPC4xx family    */
 #define CONFIG_440                     1       /* ... PPC460 family    */
 #define CONFIG_460SX                   1       /* ... PPC460 family    */
 #define CONFIG_BOARD_EARLY_INIT_F      1       /* Call board_pre_init  */
@@ -110,13 +93,13 @@
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
-#define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed                    */
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          400000
 
 #define IIC0_BOOTPROM_ADDR     0x50
 #define IIC0_ALT_BOOTPROM_ADDR 0x54
 
 /* Don't probe these addrs */
-#define CONFIG_SYS_I2C_NOPROBES        {0x50, 0x52, 0x53, 0x54}
+#define CONFIG_SYS_I2C_NOPROBES        { {0, 0x50}, {0, 0x52}, {0, 0x53}, {0, 0x54} }
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2       /* Bytes of address             */
 
@@ -137,7 +120,6 @@
        CONFIG_AMCC_DEF_ENV                                             \
        CONFIG_AMCC_DEF_ENV_POWERPC                                     \
        CONFIG_AMCC_DEF_ENV_NOR_UPD                                     \
-       CONFIG_AMCC_DEF_ENV_NAND_UPD                                    \
        "kernel_addr=fc000000\0"                                        \
        "fdt_addr=fc1e0000\0"                                           \
        "ramdisk_addr=fc200000\0"                                       \
@@ -150,7 +132,6 @@
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
 #define        CONFIG_IBM_EMAC4_V4     1
 #define CONFIG_PHY_RESET       1       /* reset phy upon startup       */