Pat,

Thanks, Pushed this now.

Yeah it doesn't hurt having it available as an env at all. I don't think it matters greatly for having it in mainline, if everything is cleaned up, passing script.bin or dtb is up to the user, so it may as well fly.

Oliver

On 09-01-14 06:49, Patrick Wood wrote:
All the other files can be overridden by env settings, what's so
special about script.bin?

Use the "script" env variable instead of hard-coding script.bin
everywhere; still defaults to "script.bin", but can be overridden
from uEnv.txt or boot.scr.

Signed-off-by: Patrick Wood <patrickhw...@gmail.com>
---
  include/configs/sunxi-common.h |    7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 2c86a8e..a0c41ac 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -213,6 +213,7 @@
        "kernel=uImage\0" \
        "bootenv=uEnv.txt\0" \
        "bootscr=boot.scr\0" \
+       "script=script.bin\0" \
        "loadbootscr=" \
          "fatload $device $partition $scriptaddr ${bootscr}" \
          " || " \
@@ -231,19 +232,19 @@
          "if "\
            "bootpath=/boot/" \
            " && " \
-           "ext2load $device $partition 0x43000000 ${bootpath}script.bin" \
+           "ext2load $device $partition 0x43000000 ${bootpath}${script}" \
            " && " \
            "ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
          ";then true; elif " \
            "bootpath=/" \
            " && " \
-           "fatload $device $partition 0x43000000 script.bin" \
+           "fatload $device $partition 0x43000000 ${script}" \
            " && " \
            "fatload $device $partition 0x48000000 ${kernel}" \
          ";then true; elif " \
            "bootpath=/" \
            " && " \
-           "ext2load $device $partition 0x43000000 ${bootpath}script.bin" \
+           "ext2load $device $partition 0x43000000 ${bootpath}${script}" \
            " && " \
            "ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
          ";then true; else "\


--
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to