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

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

diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h
index 47760ef7ba9cd84c4aeeda76f2647cd206305d7a..d2f4c441c8a85a7b92bc2e440ce4f0fe6f5cecdc 100644 (file)
--- a/include/configs/aspenite.h
+++ b/include/configs/aspenite.h
@@ -10,23 +10,12 @@
 #ifndef __CONFIG_ASPENITE_H
 #define __CONFIG_ASPENITE_H
 
-/*
- * Generic board support
- */
-#define CONFIG_SYS_GENERIC_BOARD
-
-/*
- * Version number information
- */
-#define CONFIG_IDENT_STRING    "\nMarvell-Aspenite DB"
-
 /*
  * High Level Configuration Options
  */
 #define CONFIG_SHEEVA_88SV331xV5       1       /* CPU Core subversion */
 #define CONFIG_ARMADA100               1       /* SOC Family Name */
 #define CONFIG_ARMADA168               1       /* SOC Used on this Board */
-#define CONFIG_MACH_ASPENITE                   /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 
 /*
@@ -39,22 +28,15 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
-#define CONFIG_CMD_I2C
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
  */
 #include "mv-common.h"
-#undef CONFIG_ARCH_MISC_INIT
 
 /*
  * Environment variables configurations
  */
-#define CONFIG_ENV_IS_NOWHERE  1       /* if env in SDRAM */
 #define CONFIG_ENV_SIZE        0x20000 /* 64k */
 
 #endif /* __CONFIG_ASPENITE_H */