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

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

diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index c034813193f7b87e4e7bf2e778b5a8a5260bd403..41b41077e22ffac4ccf6fa9a698c78aec197e31c 100644 (file)
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -15,10 +15,8 @@
 #elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_MACH_TYPE               MACH_TYPE_NETSPACE_V2
 #elif defined(CONFIG_NETSPACE_LITE_V2)
-#define MACH_TYPE_NETSPACE_LITE_V2     2983 /* missing in mach-types.h */
 #define CONFIG_MACH_TYPE               MACH_TYPE_NETSPACE_LITE_V2
 #elif defined(CONFIG_NETSPACE_MINI_V2)
-#define MACH_TYPE_NETSPACE_MINI_V2     2831 /* missing in mach-types.h */
 #define CONFIG_MACH_TYPE               MACH_TYPE_NETSPACE_MINI_V2
 #elif defined(CONFIG_NETSPACE_MAX_V2)
 #define CONFIG_MACH_TYPE               MACH_TYPE_NETSPACE_MAX_V2
@@ -45,9 +43,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_IDE
 #ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */
 #endif
 
@@ -78,7 +73,6 @@
 #include "mv-common.h"
 
 /* Remove or override few declarations from mv-common.h */
-#undef CONFIG_RBTREE
 #undef CONFIG_ENV_SPI_MAX_HZ
 #undef CONFIG_SYS_IDE_MAXBUS
 #undef CONFIG_SYS_IDE_MAXDEVICE
@@ -123,7 +117,6 @@
  */
 #ifdef CONFIG_CMD_I2C
 /* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */
-#define CONFIG_CMD_EEPROM
 #define CONFIG_SYS_I2C_EEPROM_ADDR             0x50
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      4 /* 16-byte page size */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1 /* 8-bit device address */
@@ -135,7 +128,6 @@
 /*
  * Partition support
  */
-#define CONFIG_EFI_PARTITION
 
 /*
  * File systems support
@@ -144,7 +136,6 @@
 /*
  * Environment variables configurations
  */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE           0x10000 /* 64KB */
 #define CONFIG_ENV_SIZE                        0x1000  /* 4KB */
 #define CONFIG_ENV_ADDR                        0x70000
@@ -153,8 +144,6 @@
 /*
  * Default environment variables
  */
-#define CONFIG_BOOTARGS "console=ttyS0,115200"
-
 #define CONFIG_BOOTCOMMAND                                     \
        "dhcp && run netconsole; "                              \
        "if run usbload || run diskload; then bootm; fi"