sh: Fix compile error sh7763rdp board

[oweals/u-boot.git] / include / configs / integratorap.h

diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index ad92f3209bdbb347b3975401c1a192e1a0c5dc57..1452bf2c46769637854edef70c38f786200a7062 100644 (file)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -66,15 +66,26 @@
 #define CFG_SERIAL0            0x16000000
 #define CFG_SERIAL1            0x17000000
 
-/*#define CONFIG_COMMANDS      (CFG_CMD_DHCP | CFG_CMD_IMI | CFG_CMD_NET | CFG_CMD_PING | CFG_CMD_BDI | CFG_CMD_PCI) */
 /*#define CONFIG_NET_MULTI */
-/*#define CONFIG_BOOTP_MASK      CONFIG_BOOTP_DEFAULT */
 
-#define CONFIG_COMMANDS (CFG_CMD_IMI | CFG_CMD_BDI | CFG_CMD_MEMORY)
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
 
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_MEMORY
+
 
 #define CONFIG_BOOTDELAY       2
 #define CONFIG_BOOTARGS                "root=/dev/mtdblock0 mem=32M console=ttyAM0 console=tty"
@@ -275,42 +286,6 @@
  *   to define the necessary CONFIG_ s for the CM involved
  * see e.g. integratorcp_CM926EJ-S_config
  */
+#include "armcoremodule.h"
 
-#define CM_BASE                0x10000000
-
-/* CM registers common to all integrator/CP CMs */
-#define OS_CTRL                        0x0000000C
-#define CMMASK_REMAP           0x00000005      /* Set remap & led           */
-#define CMMASK_RESET           0x00000008
-#define OS_LOCK                        0x00000014
-#define CMVAL_LOCK             0x0000A000      /* Locking value             */
-#define CMMASK_LOCK            0x0000005F      /* Locking value             */
-#define CMVAL_UNLOCK           0x00000000      /* Any value != CM_LOCKVAL   */
-#define OS_SDRAM               0x00000020
-#define OS_INIT                        0x00000024
-#define CMMASK_MAP_SIMPLE      0xFFFDFFFF      /* simple mapping */
-#define CMMASK_TCRAM_DISABLE   0xFFFEFFFF      /* TCRAM disabled */
-#define CMMASK_LOWVEC        0x00000004      /* vectors @ 0x00000000 */
-
-#ifdef CONFIG_CM_SPD_DETECT
-#define OS_SPD         0x00000100      /* The SDRAM SPD data is copied here */
-#endif
-
-#if defined (CONFIG_CM10200E) || defined (CONFIG_CM10220E)
-#define CMMASK_INIT_102              0x00000300      /* see CM102xx ref manual
-                                              * - PLL test clock bypassed
-                                              * - bus clock ratio 2
-                                              * - little endian
-                                              * - vectors at zero
-                                              */
-#endif /* CM1022xx */
-
-#define CMMASK_LE            0x00000008      /* little endian */
-#define CMMASK_CMxx6_COMMON   0x00000100      /* Common value for CMxx6
-                                              * - divisor/ratio b00000001
-                                              *                 bx
-                                              * - HCLKDIV       b000
-                                              *                 bxx
-                                              * - PLL BYPASS    b00
-                                              */
 #endif /* __CONFIG_H */