Merge git://git.denx.de/u-boot-mpc85xx

[platform/kernel/u-boot.git] / include / configs / iocon.h

diff --git a/include/configs/iocon.h b/include/configs/iocon.h
index 4d1f309..9c3be78 100644 (file)
--- a/include/configs/iocon.h
+++ b/include/configs/iocon.h
@@ -17,13 +17,11 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME                iocon
-#define CONFIG_IDENT_STRING    " iocon 0.06"
 #include "amcc-common.h"
 
 /* Reclaim some space. */
 #undef CONFIG_SYS_LONGHELP
 
-#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_LAST_STAGE_INIT
 
@@ -35,8 +33,6 @@
 #define PLLMR0_DEFAULT PLLMR0_266_133_66
 #define PLLMR1_DEFAULT PLLMR1_266_133_66
 
-#undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
-
 /* new uImage format support */
 #define CONFIG_FIT_DISABLE_SHA256
 
@@ -61,7 +57,6 @@
 /*
  * Commands additional to the ones defined in amcc-common.h
  */
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_FPGAD
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_IRQ