Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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

diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index 9bb5b8304712d42f681a3e0d4a54c23656b471eb..f097e2c2f09042b7a085273b096ef030140bedbc 100644 (file)
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -31,7 +31,7 @@
 
 #define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
 #define CONFIG_MPC5200         1       /* More exactly a MPC5200 */
-#define CONFIG_CANMB           1       /* ... on canmb board - we need this for FEC.C */
+#define CONFIG_CANMB           1       /* ... on canmb board - we need this for FEC.C */
 
 #define CFG_MPC5XXX_CLKIN      33000000 /* ... running at 33.000000MHz */
 
@@ -40,6 +40,8 @@
 
 #define CONFIG_BOARD_EARLY_INIT_R
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 /*
  * Serial console configuration
  */
@@ -48,6 +50,15 @@
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -79,7 +90,7 @@
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 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
@@ -106,7 +117,7 @@
 /*
  * IPB Bus clocking configuration.
  */
-#undef CFG_IPBCLK_EQUALS_XLBCLK                /* define for 133MHz speed */
+#undef CFG_IPBCLK_EQUALS_XLBCLK                /* define for 133MHz speed */
 
 /*
  * Flash configuration, expect one 16 Megabyte Bank at most