Merge branch 'master' into next

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

diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 065006f..f1a7853 100644 (file)
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -19,8 +19,6 @@
 #define CFG_SYS_SDRAM_BASE             EMC_DYCS0_BASE
 #define CFG_SYS_SDRAM_SIZE             SZ_128M
 
-#define CONFIG_RTC_DS1374
-
 /*
  * U-Boot General Configurations
  */
@@ -29,13 +27,13 @@
  * NAND chip timings for FIXME: which one?
  */
 
-#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
-#define CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
-#define CONFIG_LPC32XX_NAND_MLC_NAND_TA      18181818
-#define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
-#define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
-#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
-#define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
+#define CFG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
+#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
+#define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
+#define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
+#define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
+#define CFG_LPC32XX_NAND_MLC_WR_HIGH      40000000
+#define CFG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
 /*
  * NAND