Merge branch 'u-boot/master'

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

diff --git a/include/configs/neo.h b/include/configs/neo.h
index fede8b8b647caf890218a16ba8c43a5d20a6ac91..d549985886c915bc91fb6dc848927cee57c6a592 100644 (file)
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@@ -2,7 +2,7 @@
  * (C) Copyright 2007-2008
  * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -10,7 +10,6 @@
 
 
 #define CONFIG_405EP           1       /* this is a PPC405 CPU */
-#define CONFIG_4xx             1       /*  member of PPC4xx family */
 #define CONFIG_NEO             1       /*  on a Neo board */
 
 #define        CONFIG_SYS_TEXT_BASE    0xFFFC0000
@@ -19,7 +18,7 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME                neo
-#define CONFIG_IDENT_STRING    " neo 0.01"
+#define CONFIG_IDENT_STRING    " neo 0.02"
 #include "amcc-common.h"
 
 #define CONFIG_BOARD_EARLY_INIT_F
@@ -101,7 +100,7 @@
 /*
  * I2C stuff
  */
-#define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed and slave address  */
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          100000
 
 /* RTC */
 #define CONFIG_RTC_DS1337
@@ -130,7 +129,6 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)      */
 
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1    /* use buffered writes (20x faster)     */
-#define CONFIG_SYS_FLASH_PROTECTION    1       /* use hardware flash protection        */
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO            /* print 'E' for empty sector on flinfo */
 #define CONFIG_SYS_FLASH_QUIET_TEST    1       /* don't warn upon unknown flash        */
@@ -222,6 +220,11 @@
 
 #define CONFIG_SYS_FPGA_COUNT          1
 
+#define CONFIG_SYS_FPGA_PTR \
+       { (struct ihs_fpga *)CONFIG_SYS_FPGA0_BASE }
+
+#define CONFIG_SYS_FPGA_COMMON
+
 /* Memory Bank 3 (Latches) initialization                      */
 #define CONFIG_SYS_LATCH_BASE          0x7f200000
 #define CONFIG_SYS_EBC_PB3AP           0x92015480