clearfog: USB autoboot on eMMC bring-up
Let's use U-Boot's distro boot configuration for auto-executing the boot
script. This requires a proper name of the file and also a partition
that is marked as bootable.
This only helps on a system that is already jumpered to booting from
UART and where the MMC memory is unpartitioned. If we're recovering from
a broken eMMC flash, this won't really help.
This setup is also not enough to auto-boot from a factory-installed
Marvell-specific U-Boot. Even with the flash disk plugged in, it fails
with a "Bad Linux ARM zImage magic!". We will therefore have to keep
booting from UART for now...
Change-Id: I25caf68e33c47ab326b6c87d3080660575d7ff10
diff --git a/board/czechlight/clearfog/genimage.cfg b/board/czechlight/clearfog/genimage.cfg
index 01866bb..548f538 100644
--- a/board/czechlight/clearfog/genimage.cfg
+++ b/board/czechlight/clearfog/genimage.cfg
@@ -39,8 +39,8 @@
image usb-flash.vfat {
vfat {
+ file "boot.scr" { image = "usb-boot.scr" }
files = {
- "usb-boot.scr",
"zImage",
"czechlight-clearfog.dtb",
"rootfs.cpio.uboot"
@@ -55,6 +55,7 @@
partition boot {
partition-type = 0xc
+ bootable = true
image = "usb-flash.vfat"
}
}
diff --git a/board/czechlight/clearfog/patches/u-boot/boot.patch b/board/czechlight/clearfog/patches/u-boot/boot.patch
index 44c1c3e..3e3b1ba 100644
--- a/board/czechlight/clearfog/patches/u-boot/boot.patch
+++ b/board/czechlight/clearfog/patches/u-boot/boot.patch
@@ -88,7 +88,7 @@
+CONFIG_WDT=y
+CONFIG_WDT_ORION=y
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
-index bf87bac300..75926b00ed 100644
+index bf87bac300..c78dcce1a1 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -32,6 +32,11 @@
@@ -129,7 +129,7 @@
- "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" \
- BOOTENV
-+ "usbboot=usb start; fatload usb 0:1 ${script_addr_r} usb-boot.scr; source ${script_addr_r}\0" \
++ "usbboot=usb start; fatload usb 0:1 ${script_addr_r} boot.scr; source ${script_addr_r}\0" \
+ "bootcmd=test -n \"${BOOT_A_LEFT}\" || setenv BOOT_A_LEFT 3;" \
+ "test -n \"${BOOT_B_LEFT}\" || setenv BOOT_B_LEFT 3;" \
+ "test -n \"${BOOT_ORDER}\" || setenv BOOT_ORDER \"A B\";" \