nand: remove CONFIG_SYS_NAND_PAGE_SIZE

[karo-tx-uboot.git] / include / configs / ADS860.h

diff --git a/include/configs/ADS860.h b/include/configs/ADS860.h
index df20965640e64b37a697f41d6cfb9ad84d131e09..82ea172d7a66e8b8434f095a0b245f7e8e57df5c 100644 (file)
--- a/include/configs/ADS860.h
+++ b/include/configs/ADS860.h
@@ -20,6 +20,8 @@
 /* Processor type */
 #define CONFIG_MPC860          1
 
+#define        CONFIG_SYS_TEXT_BASE    0xFE000000
+
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1 */
 #undef CONFIG_8xx_CONS_SMC2
 #undef CONFIG_8xx_CONS_NONE
@@ -27,26 +29,32 @@
 #define CONFIG_BAUDRATE                38400   /* Console baudrate */
 
 #if 0
-#define CFG_8XX_FACT           1526    /* 32.768 kHz crystal on XTAL/EXTAL */
+#define CONFIG_SYS_8XX_FACT            1526    /* 32.768 kHz crystal on XTAL/EXTAL */
 #else
-#define CFG_8XX_FACT           12      /* 4 MHz oscillator on EXTCLK */
+#define CONFIG_SYS_8XX_FACT            12      /* 4 MHz oscillator on EXTCLK */
 #endif
 
-#define CFG_PLPRCR  (((CFG_8XX_FACT-1) << PLPRCR_MF_SHIFT) |   \
+#define CONFIG_SYS_PLPRCR  (((CONFIG_SYS_8XX_FACT-1) << PLPRCR_MF_SHIFT) |     \
                PLPRCR_SPLSS | PLPRCR_TEXPS | PLPRCR_TMIST)
 
 #define CONFIG_DRAM_50MHZ              1
 
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL   \
-                        | CFG_CMD_DHCP   \
-                        | CFG_CMD_IMMAP  \
-                        | CFG_CMD_PCMCIA \
-                        | CFG_CMD_PING   \
-                       )
 
+/*
+ * 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 "fads.h"
+#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 */