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

[u-boot] / include / configs / dlvision.h

diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index d5bf73558184eec9cf683463eaaa9f72d90fd749..2f8d6b4c904becbfd01791798d33cf95c5469944 100644 (file)
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -18,7 +18,7 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME                dlvision
-#define CONFIG_IDENT_STRING    " dlvision 0.01"
+#define CONFIG_IDENT_STRING    " dlvision 0.02"
 #include "amcc-common.h"
 
 #define CONFIG_BOARD_EARLY_INIT_F      /* call board_early_init_f */
@@ -91,7 +91,7 @@
 /*
  * I2C stuff
  */
-#define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed and slave address*/
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          100000
 
 /*
  * FLASH organization
@@ -109,7 +109,6 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write/ms */
 
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1    /* use buff'd writes */
-#define CONFIG_SYS_FLASH_PROTECTION    1       /* use hardware flash protect */
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* 'E' for empty sector on flinfo */
 #define CONFIG_SYS_FLASH_QUIET_TEST    1       /* no warn upon unknown flash */