diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-09-19 10:02:20 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-09-19 10:02:20 -0500 |
| commit | 504b5cd0e2e7b58c6265fb684a850a158c85e1b2 (patch) | |
| tree | 2125bf738ec1ea6ea87c807ee045832fecf27fe6 /include/configs/MPC8540ADS.h | |
| parent | afbdc649f8751e4f4f1a6f527edfe139773f2c15 (diff) | |
| parent | 8272dc2f58f2473d8995fcc9b916440cfba080f0 (diff) | |
| download | blackbird-obmc-uboot-504b5cd0e2e7b58c6265fb684a850a158c85e1b2.tar.gz blackbird-obmc-uboot-504b5cd0e2e7b58c6265fb684a850a158c85e1b2.zip | |
Merge branch 'mpc85xx'
Conflicts:
drivers/tsec.c
Diffstat (limited to 'include/configs/MPC8540ADS.h')
| -rw-r--r-- | include/configs/MPC8540ADS.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 8e4d2c95a4..31ffbaf15b 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -517,8 +517,10 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ - "ramdiskaddr=400000\0" \ - "ramdiskfile=your.ramdisk.u-boot\0" + "ramdiskaddr=600000\0" \ + "ramdiskfile=your.ramdisk.u-boot\0" \ + "fdtaddr=400000\0" \ + "fdtfile=your.fdt.dtb\0" #define CONFIG_NFSBOOTCOMMAND \ "setenv bootargs root=/dev/nfs rw " \ @@ -526,13 +528,15 @@ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \ "console=$consoledev,$baudrate $othbootargs;" \ "tftp $loadaddr $bootfile;" \ - "bootm $loadaddr" + "tftp $fdtaddr $fdtfile;" \ + "bootm $loadaddr - $fdtaddr" #define CONFIG_RAMBOOTCOMMAND \ "setenv bootargs root=/dev/ram rw " \ "console=$consoledev,$baudrate $othbootargs;" \ "tftp $ramdiskaddr $ramdiskfile;" \ "tftp $loadaddr $bootfile;" \ + "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr" #define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND |
