Move setting CONFIG_BOOTP_VCI_STRING to before including the vexpress-common header

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

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 0ea34b89d85185971f2c52c2c13ced19a415160a..71cb5dff366c19f69aa8d7ea1d367064fc712103 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -2,23 +2,7 @@
  * (C) Copyright 2004
  * Tolunay Orkun, Nextio Inc., torkun@nextio.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+
  */
 
 /*
@@ -34,7 +18,6 @@
  */
 
 #define CONFIG_405GP           1       /* This is a PPC405GP CPU       */
-#define CONFIG_4xx             1       /* ...member of PPC4xx family   */
 #define CONFIG_CSB272          1       /* on a Cogent CSB272 board     */
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f()    */
 #define CONFIG_LAST_STAGE_INIT 1       /* Call last_stage_init()       */
@@ -88,8 +71,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_ELF
@@ -115,7 +96,6 @@
  */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
 /*
@@ -123,12 +103,8 @@
  *
  */
 #undef CONFIG_SYS_HUSH_PARSER                  /* use "hush" command parser */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "    /* hush shell secondary prompt */
-#endif
 
 #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
@@ -140,8 +116,6 @@
 
 #define CONFIG_SYS_MEMTEST_START       0x0400000 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END         0x0C00000 /* 4 ... 12 MB in DRAM */
-
-#define        CONFIG_SYS_HZ                   1000    /* decrementer freq: 1 ms ticks */
 #define CONFIG_SYS_EXTBDINFO           1       /* To use extended board_info (bd_t) */
 #define CONFIG_SYS_LOAD_ADDR           0x100000 /* default load address */
 
@@ -178,10 +152,11 @@
  * I2C configuration
  *
  */
-#define CONFIG_HARD_I2C                1       /* I2C with hardware support    */
-#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
-#define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed                    */
-#define CONFIG_SYS_I2C_SLAVE           0x7F    /* I2C slave address            */
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_PPC4XX
+#define CONFIG_SYS_I2C_PPC4XX_CH0
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          100000
+#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0          0x7F    /* I2C slave address */
 
 /*
  * MII PHY configuration
@@ -193,7 +168,6 @@
 #define CONFIG_PHY_CMD_DELAY   40      /* PHY COMMAND delay            */
                                        /* 32usec min. for LXT971A      */
 #define CONFIG_PHY_RESET_DELAY 300     /* PHY RESET recovery delay     */
-#define CONFIG_NET_MULTI
 
 /*
  * RTC configuration
@@ -208,6 +182,7 @@
  *
  */
 #define CONFIG_PCI                     /* include pci support          */
+#define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
 #define PCI_HOST_ADAPTER       0       /* configure ar pci adapter     */
 #define PCI_HOST_FORCE         1       /* configure as pci host        */
 #define PCI_HOST_AUTO          2       /* detected via arbiter enable  */