Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/neo.h b/include/configs/neo.h
index bd2b190..f6b4cc0 100644 (file)
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@@ -8,7 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-
 #define CONFIG_405EP           1       /* this is a PPC405 CPU */
 #define CONFIG_NEO             1       /*  on a Neo board */
 
@@ -18,10 +17,8 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME                neo
-#define CONFIG_IDENT_STRING    " neo 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
@@ -61,10 +58,8 @@
  * Commands additional to the ones defined in amcc-common.h
  */
 #define CONFIG_CMD_DTT
-#undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
 /*