Merge branch 'next' of git://git.denx.de/u-boot-coldfire

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

diff --git a/include/configs/ADS860.h b/include/configs/ADS860.h
index 916272d..688e77a 100644 (file)
--- a/include/configs/ADS860.h
+++ b/include/configs/ADS860.h
@@ -26,29 +26,33 @@
 
 #define CONFIG_BAUDRATE                38400   /* Console baudrate */
 
-/* CFG_8XX_FACT * CFG_8XX_XIN = 50 MHz */
 #if 0
-#define CFG_8XX_XIN            32768   /* 32.768 kHz input frequency   */
-#define CFG_8XX_FACT           0x5F6   /* Multiply by 1526 */
+#define CONFIG_SYS_8XX_FACT            1526    /* 32.768 kHz crystal on XTAL/EXTAL */
 #else
-#define CFG_8XX_XIN            4000000 /* 4 MHz input frequency        */
-#define CFG_8XX_FACT           12      /* Multiply by 12 */
+#define CONFIG_SYS_8XX_FACT            12      /* 4 MHz oscillator on EXTCLK */
 #endif
 
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL   \
-                        | CFG_CMD_DHCP   \
-                        | CFG_CMD_IMMAP  \
-                        | CFG_CMD_PCMCIA \
-                        | CFG_CMD_PING   \
-                       )
+#define CONFIG_SYS_PLPRCR  (((CONFIG_SYS_8XX_FACT-1) << PLPRCR_MF_SHIFT) |     \
+               PLPRCR_SPLSS | PLPRCR_TEXPS | PLPRCR_TMIST)
 
 #define CONFIG_DRAM_50MHZ              1
 
-#include "fads.h"
 
-#define CFG_PLPRCR  (((CFG_8XX_FACT-1) << PLPRCR_MF_SHIFT) |   \
-               PLPRCR_SPLSS | PLPRCR_TEXPS | PLPRCR_TMIST)
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_PCMCIA
+#define CONFIG_CMD_PING
+
+/* This is picked up again in fads.h */
+#define FADS_COMMANDS_ALREADY_DEFINED
+
+#include "../../board/fads/fads.h"
 
-#define CFG_PC_IDE_RESET       ((ushort)0x0008)    /* PC 12    */
+#define CONFIG_SYS_PC_IDE_RESET        ((ushort)0x0008)    /* PC 12    */
 
 #endif /* __CONFIG_H */