sh: Fix compile error sh7763rdp board

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

diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index f7338034b74725f3791f935eb200a2369fbd4ccd..863029d146d8511e100f96f777df16ab742b1dda 100644 (file)
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -30,12 +30,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL           /* undef for developing */
-
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -72,10 +66,23 @@
 
 #define CONFIG_BAUDRATE                115200
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL & ~CFG_CMD_NET)
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_NET
+
 
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_ETHADDR         08:00:3e:26:0a:5b
@@ -89,7 +96,7 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400          /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2               /* which serial port to use */
 #endif
@@ -208,8 +215,8 @@
 #define CFG_MDCNFG_VAL         0x00000aC9 /* Memory timings for the SDRAM.
                                              tRP=2, CL=2, tRCD=2, tRAS=5, tRC=8 */
 
-#define CFG_MDREFR_VAL         0x00403018 /* Initial setting, individual
-                                             bits set in memsetup.S      */
+#define CFG_MDREFR_VAL         0x00403018 /* Initial setting, individual       */
+                                          /* bits set in lowlevel_init.S       */
 #define CFG_MDMRS_VAL          0x00000000
 
 /*