48 lines
2.6 KiB
Diff
48 lines
2.6 KiB
Diff
From db994bffd3db0a6d02fa049eca0ff83720e22e73 Mon Sep 17 00:00:00 2001
|
|
From: Dennis Gilmore <dennis@ausil.us>
|
|
Date: Thu, 17 Oct 2013 19:12:52 -0500
|
|
Subject: [PATCH 15/16] WANDBOARD: adjust addrs to work with calculated values.
|
|
add scr_addr_r so the fall back to boot.scr has somewhere to be loaded have
|
|
pxe boot load a fdt have sysboot load a fdt
|
|
|
|
---
|
|
include/configs/wandboard.h | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
|
index ae16694..135835f 100644
|
|
--- a/include/configs/wandboard.h
|
|
+++ b/include/configs/wandboard.h
|
|
@@ -116,20 +116,21 @@
|
|
"fdt_high=0xffffffff\0" \
|
|
"initrd_high=0xffffffff\0" \
|
|
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
|
- "fdt_addr=0x11000000\0" \
|
|
- "pxefile_addr_r=0x13000000\0" \
|
|
- "kernel_addr_r=0x14000000\0" \
|
|
- "ramdisk_addr_r=0x32000000\0" \
|
|
- "fdt_addr_r=0x12000000\0" \
|
|
+ "fdt_addr=0x11100000\0" \
|
|
+ "fdt_addr_r=0x11200000\0" \
|
|
+ "pxefile_addr_r=0x11300000\0" \
|
|
+ "scr_addr_r=0x11400000\0" \
|
|
+ "kernel_addr_r=0x11500000\0" \
|
|
+ "ramdisk_addr_r=0x13500000\0" \
|
|
"boot_fdt=try\0" \
|
|
"bootcmd_setup=mmc rescan\0" \
|
|
- "bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
|
|
+ "bootcmd_pxe=setenv bootfile \"\" ;dhcp; tftp ${fdt_addr} /dtb/${fdt_file}; pxe get; pxe boot\0" \
|
|
"bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
|
|
"bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
|
|
"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
|
|
"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
|
|
"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
|
|
- "bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
|
|
+ "bootcmd_disk=load ${boot_ifc} ${bootdevice} ${fdt_addr} /boot/dtb/${fdt_file}; load ${boot_ifc} ${bootdevice} ${fdt_addr} /dtb/${fdt_file};run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
|
|
"bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
|
|
"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
|
|
"bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
|
|
--
|
|
1.8.3.1
|
|
|