Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 7cfdacd..96bf833 100644 (file)
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -13,10 +13,9 @@
 #define _CONFIG_NAS220_H
 
 /*
- * Machine type definition and ID
+ * Machine type ID
  */
-#define MACH_TYPE_NAS220               MACH_TYPE_RD88F6192_NAS
-#define CONFIG_MACH_TYPE               MACH_TYPE_NAS220
+#define CONFIG_MACH_TYPE               MACH_TYPE_RD88F6192_NAS
 
 /*
  * High Level Configuration Options (easy to change)
@@ -100,7 +99,6 @@
 #define CONFIG_USB_EHCI                        /* Enable EHCI USB support */
 #define CONFIG_USB_EHCI_KIRKWOOD       /* on Kirkwood platform */
 #define CONFIG_EHCI_IS_TDI
-#define CONFIG_DOS_PARTITION
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
@@ -128,7 +126,6 @@
 /*
  * EFI partition
  */
-#define CONFIG_EFI_PARTITION
 
 /*
  *  Date Time