Patrick Wood
2014-01-09 05:49:28 UTC
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 <patrickhwood-***@public.gmane.org>
---
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 "\
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 <patrickhwood-***@public.gmane.org>
---
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 "\
--
1.7.9.5
1.7.9.5