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

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

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index 65dc97e..81e7c1e 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007 DENX Software Engineering
+ * (C) Copyright 2007, 2008 DENX Software Engineering
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -377,6 +377,7 @@
 
 #define CONFIG_HOSTNAME                ads5121
 #define CONFIG_BOOTFILE                ads5121/uImage
+#define CONFIG_ROOTPATH                /opt/eldk/pcc_6xx
 
 #define CONFIG_LOADADDR                400000  /* default location for tftp and bootm */
 
@@ -386,16 +387,16 @@
 #define CONFIG_BAUDRATE                115200
 
 #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"
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "u-boot_addr_r=200000\0"                                        \
-       "kernel_addr_r=200000\0"                                        \
+       "kernel_addr_r=300000\0"                                        \
        "fdt_addr_r=400000\0"                                           \
        "ramdisk_addr_r=500000\0"                                       \
        "u-boot_addr=FFF00000\0"                                        \
-       "kernel_addr=FC000000\0"                                        \
+       "kernel_addr=FC040000\0"                                        \
        "fdt_addr=FC2C0000\0"                                           \
        "ramdisk_addr=FC300000\0"                                       \
        "ramdiskfile=ads5121/uRamdisk\0"                                \
@@ -412,7 +413,7 @@
        "addtty=setenv bootargs ${bootargs} "                           \
                "console=${consdev},${baudrate}\0"                      \
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm ${kernel_addr_r} - ${fdt_addr}\0"                \
+               "bootm ${kernel_addr} - ${fdt_addr}\0"                  \
        "flash_self=run ramargs addip addtty;"                          \
                "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"    \
        "net_nfs=tftp ${kernel_addr_r} ${bootfile};"                    \
@@ -421,10 +422,10 @@
                "bootm ${kernel_addr_r} - ${fdt_addr_r}\0"              \
        "net_self=tftp ${kernel_addr_r} ${bootfile};"                   \
                "tftp ${ramdisk_addr_r} ${ramdiskfile};"                \
-               "tftp ${fdt_addr} ${fdtfile};"                          \
+               "tftp ${fdt_addr_r} ${fdtfile};"                        \
                "run ramargs addip addtty;"                             \
-               "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}\0"\
-       "load=tftp ${u-boot_addr} ${u-boot}\0"                          \
+               "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0"\
+       "load=tftp ${u-boot_addr_r} ${u-boot}\0"                        \
        "update=protect off ${u-boot_addr} +${filesize};"               \
                "era ${u-boot_addr} +${filesize};"                      \
                "cp.b ${u-boot_addr_r} ${u-boot_addr} ${filesize}\0"    \