Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/io64.h b/include/configs/io64.h
index 6915b2071c03652ea136cb2fd1cbf3ba01db0826..8619de4af9a4f4f565c1e9127ce903181591b5bf 100644 (file)
--- a/include/configs/io64.h
+++ b/include/configs/io64.h
@@ -36,22 +36,12 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME                io64
-#define CONFIG_IDENT_STRING    " io64 0.02"
 #include "amcc-common.h"
 
-#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
 
-#undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
-#define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
-#define CONFIG_AUTOBOOT_STOP_STR " "
-
-/* new uImage format support */
-#define CONFIG_FIT
-#define CONFIG_FIT_VERBOSE
-
 /*-----------------------------------------------------------------------
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
@@ -403,8 +393,6 @@
 #define CONFIG_LOGBUFFER
 #define CONFIG_SYS_POST_CACHE_ADDR     0x00800000 /* free virtual address */
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
 /*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup
  *----------------------------------------------------------------------*/