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

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

diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index b9449a4..bdfa42f 100644 (file)
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -69,7 +69,6 @@
        "0x500000@0xc0000(uimage),"\
        "0x1a40000@0x5c0000(rootfs)\0" \
        "mtdids=nand0=orion_nand\0"\
-       "bootdelay=-1\0"\
        "autostart=no\0"\
        "autoload=no\0"
 
@@ -94,8 +93,6 @@
  */
 #define CONFIG_JFFS2_NAND
 #define CONFIG_JFFS2_LZO
-#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
 
 /*
  * SATA
@@ -109,13 +106,6 @@
  * EFI partition
  */
 
-/*
- *  Date Time
- */
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
 #define CONFIG_KIRKWOOD_GPIO
 
 #endif /* _CONFIG_NAS220_H */