Merge commit 'wd/master'

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

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index cf2d031..c203522 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -34,21 +34,19 @@
 #define CONFIG_RTC_PCF8563             1       /* has PCF8563 RTC */
 #define CONFIG_MPC5200_DDR             1       /* has DDR SDRAM */
 
-#define CONFIG_HW_WATCHDOG             1       /* has watchdog */
+#undef CONFIG_HW_WATCHDOG                      /* don't use watchdog */
 
 #define CONFIG_NETCONSOLE              1
 
 #define CONFIG_BOARD_EARLY_INIT_R      1       /* do board-specific init */
+#define CONFIG_BOARD_EARLY_INIT_F      1       /* do board-specific init */
 
 #define CFG_XLB_PIPELINING             1       /* gives better performance */
 
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM          0x02    /* Software reboot */
 
-#define CFG_CACHELINE_SIZE     32      /* For MPC5xxx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
-#  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value */
-#endif
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
 
 /*
  * Serial console configuration
@@ -88,28 +86,37 @@
 #define CONFIG_USB_CLOCK       0x0001BBBB
 #define CONFIG_USB_CONFIG      0x00001000
 
+
 /*
- * Supported commands
+ * BOOTP options
  */
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_FAT    | \
-                                CFG_CMD_I2C    | \
-                                CFG_CMD_IDE    | \
-                                CFG_CMD_PING   | \
-                                CFG_CMD_DHCP   | \
-                                CFG_CMD_DIAG   | \
-                                CFG_CMD_IRQ    | \
-                                CFG_CMD_JFFS2  | \
-                                CFG_CMD_MII    | \
-                                CFG_CMD_SDRAMi | \
-                                CFG_CMD_DATE   | \
-                                CFG_CMD_USB    | \
-                                CFG_CMD_FAT)
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_SDRAM
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_FAT
 
-#define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
 /*
  * Boot low with 16 MB Flash
@@ -123,7 +130,7 @@
 #define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -135,7 +142,7 @@
        "preboot=echo;echo Type \"run flash_nfs\" to mount root "       \
                "filesystem over NFS; echo\0"                           \
        "netdev=eth0\0"                                                 \
-       "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
+       "ramargs=setenv bootargs root=/dev/ram rw wdt=off \0"           \
        "addip=setenv bootargs $(bootargs) "                            \
                "ip=$(ipaddr):$(serverip):$(gatewayip):"                \
                "$(netmask):$(hostname):$(netdev):off panic=1\0"        \
@@ -144,7 +151,7 @@
                "$(ramdisk_addr)\0"                                     \
        "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=$(serverip):$(rootpath) wdt=off\0"             \
        "hostname=v38b\0"                                               \
        "ethact=FEC ETHERNET\0"                                         \
        "rootpath=/opt/eldk-3.1.1/ppc_6xx\0"                            \
@@ -166,7 +173,7 @@
 /*
  * IPB Bus clocking configuration.
  */
-#undef CFG_IPBSPEED_133                        /* define for 133MHz speed */
+#undef CFG_IPBCLK_EQUALS_XLBCLK                        /* define for 133MHz speed */
 #endif
 
 /*
@@ -246,14 +253,14 @@
 /*
  * GPIO configuration
  */
-#define CFG_GPS_PORT_CONFIG    0x90000404
+#define CFG_GPS_PORT_CONFIG    0x90001404
 
 /*
  * Miscellaneous configurable options
  */
 #define CFG_LONGHELP                   /* undef to save memory */
 #define CFG_PROMPT             "=> "   /* Monitor Command Prompt */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CBSIZE             1024    /* Console I/O Buffer Size */
 #else
 #define CFG_CBSIZE             256     /* Console I/O Buffer Size */
@@ -269,6 +276,11 @@
 
 #define CFG_HZ                 1000    /* decrementer freq: 1 ms ticks */
 
+#define CFG_CACHELINE_SIZE     32      /* For MPC5xxx CPUs */
+#if defined(CONFIG_CMD_KGDB)
+#  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value */
+#endif
+
 /*
  * Various low-level settings
  */