Merge with /home/tur/git/u-boot#motionpro

[u-boot] / include / configs / alpr.h

diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index 60da820283318b95bba6ab8432512ec9da0fd146..67f62d3dfbe4ad2979b34f3a9266c548faa43d1b 100644 (file)
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2006
+ * (C) Copyright 2006-2007
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -135,7 +135,7 @@
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \"run kernelx\" to boot the system;"                 \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -144,7 +144,7 @@
        "netdev=eth3\0"                                                 \
        "hostname=alpr\0"                                               \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=${serverip}:${rootpath}\0"                     \
+               "nfsroot=${serverip}:${rootpath} ${init}\0"             \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
        "addip=setenv bootargs ${bootargs} "                            \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
@@ -166,8 +166,24 @@
                "cp.b 100000 fffc0000 40000;"                           \
                "setenv filesize;saveenv\0"                             \
        "upd=run load;run update\0"                                     \
+       "ethprime=ppc_4xx_eth3\0"                                       \
+       "ethact=ppc_4xx_eth3\0"                                         \
+       "autoload=no\0"                                                 \
+       "ipconfig=dhcp;setenv serverip 11.0.0.152\0"                    \
+       "load_fpga=fpga load 0 ffe00000 10dd9a\0"                       \
+       "mtdargs=setenv bootargs root=/dev/mtdblock6 rw "               \
+               "rootfstype=jffs2 init=/sbin/init\0"                    \
+       "kernel1_mtd=nand read 200000 0 200000;run mtdargs addip addtty"\
+               ";bootm 200000\0"                                       \
+       "kernel2_mtd=nand read 200000 200000 200000;run mtdargs addip " \
+               "addtty;bootm 200000\0"                                 \
+       "kernel1=setenv actkernel 'kernel1';run load_fpga "             \
+               "kernel1_mtd\0"                                         \
+       "kernel2=setenv actkernel 'kernel2';run load_fpga "             \
+               "kernel2_mtd\0"                                         \
        ""
-#define CONFIG_BOOTCOMMAND     "run flash_self"
+
+#define CONFIG_BOOTCOMMAND     "run kernel2"
 
 #define CONFIG_BOOTDELAY       2       /* autoboot after 5 seconds     */
 
@@ -187,7 +203,7 @@
 #define CONFIG_HAS_ETH2
 #define CONFIG_HAS_ETH3
 #define CONFIG_PHY_RESET       1       /* reset phy upon startup       */
-#define CONFIG_88E1111_CLK_DELAY 1     /* set CLK delay on ALPR        */
+#define CONFIG_M88E1111_PHY    1       /* needed for PHY specific setup*/
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
 #define CFG_RX_ETH_BUFFER      32      /* Number of ethernet rx buffers & descriptors */
 
@@ -229,6 +245,7 @@
 #define CFG_MAXARGS    16              /* max number of command args   */
 #define CFG_BARGSIZE   CFG_CBSIZE      /* Boot Argument Buffer Size    */
 
+#define CFG_ALT_MEMTEST                1       /* Enable more extensive memtest*/
 #define CFG_MEMTEST_START      0x0400000       /* memtest works on     */
 #define CFG_MEMTEST_END                0x0C00000       /* 4 ... 12 MB in DRAM  */
 
@@ -291,6 +308,8 @@
 /*-----------------------------------------------------------------------
  * Definitions for GPIO setup
  *-----------------------------------------------------------------------*/
+#define CFG_GPIO_SHUTDOWN      (0x80000000 >> 6)
+#define CFG_GPIO_SSD_EMPTY     (0x80000000 >> 9)
 #define CFG_GPIO_EREADY                (0x80000000 >> 26)
 #define CFG_GPIO_REV0          (0x80000000 >> 14)
 #define CFG_GPIO_REV1          (0x80000000 >> 15)