PKGBUILDs/alarm/uboot-sunxi/alarm.patch

74 lines
2.6 KiB
Diff
Raw Normal View History

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index a0c41ac..e9a94f6 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -157,7 +157,7 @@
2013-07-31 03:56:28 +00:00
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_MONITOR_LEN (512 << 10) /* 512 KiB */
-#define CONFIG_IDENT_STRING " Allwinner Technology"
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
#define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
@@ -215,38 +215,28 @@
2013-07-31 03:56:28 +00:00
"bootscr=boot.scr\0" \
"script=script.bin\0" \
2013-07-31 03:56:28 +00:00
"loadbootscr=" \
- "fatload $device $partition $scriptaddr ${bootscr}" \
- " || " \
2013-07-31 03:56:28 +00:00
- "ext2load $device $partition $scriptaddr boot/${bootscr}" \
+ "load $device $partition $scriptaddr boot/${bootscr}" \
" ||" \
2013-07-31 03:56:28 +00:00
- "ext2load $device $partition $scriptaddr ${bootscr}" \
+ "load $device $partition $scriptaddr ${bootscr}" \
"\0" \
"loadbootenv=" \
- "fatload $device $partition $scriptaddr ${bootenv}" \
- " || " \
- "ext2load $device $partition $scriptaddr boot/${bootenv}" \
2013-07-31 03:56:28 +00:00
+ "load $device $partition $scriptaddr boot/${bootenv}" \
" || " \
- "ext2load $device $partition $scriptaddr ${bootenv}" \
+ "load $device $partition $scriptaddr ${bootenv}" \
"\0" \
"loadkernel=" \
"if "\
"bootpath=/boot/" \
" && " \
- "ext2load $device $partition 0x43000000 ${bootpath}${script}" \
2013-07-31 03:56:28 +00:00
- " && " \
- "ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
- ";then true; elif " \
- "bootpath=/" \
- " && " \
- "fatload $device $partition 0x43000000 ${script}" \
+ "load $device $partition 0x43000000 ${bootpath}${script}" \
" && " \
2013-07-31 03:56:28 +00:00
- "fatload $device $partition 0x48000000 ${kernel}" \
+ "load $device $partition 0x48000000 ${bootpath}${kernel}" \
";then true; elif " \
"bootpath=/" \
" && " \
- "ext2load $device $partition 0x43000000 ${bootpath}${script}" \
+ "load $device $partition 0x43000000 ${bootpath}${script}" \
2013-07-31 03:56:28 +00:00
" && " \
- "ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
+ "load $device $partition 0x48000000 ${bootpath}${kernel}" \
2013-07-31 03:56:28 +00:00
";then true; else "\
"false" \
";fi" \
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 5d18a4b..11e655c 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -45,7 +45,7 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_BOOTDELAY 2
+#define CONFIG_BOOTDELAY 1
#define CONFIG_SYS_LONGHELP
#define CONFIG_MENU
#define CONFIG_DOS_PARTITION