Refresh the BeagleBone Black image
Barebox won't build (it complains about <linux/list.h> not found and I
cannot easily solve that), so let's go back to U-Boot.
The 2019.01 U-Boot release is buggy in its recognizing of partition
tables (`fatls` complains, for example), and the whole thing reverts to
a "legacy boot", so let's use the latest release, the 2019.07.
I'm also giving up on the g_cdc module because the board that I'm using
has a microUSB header for the debug console.
- FIXME: Properly distinguish between an SD-card boot and an eMMC boot
(right now it is hardcoded to boot from the SD card)
- FIXME: test Rauc updates once eMMC works
- FIXME: activate watchdog from U-Boot
Change-Id: I013f145cf2fe24e41ea0dafd225e3feb1854712c
diff --git a/board/czechlight/beaglebone/genimage.cfg b/board/czechlight/beaglebone/genimage.cfg
index a1cb8c9..dc9f7c1 100644
--- a/board/czechlight/beaglebone/genimage.cfg
+++ b/board/czechlight/beaglebone/genimage.cfg
@@ -1,33 +1,82 @@
-image boot.vfat {
+image boot-sd.vfat {
vfat {
- file MLO {
- image = "barebox-am33xx-beaglebone-mlo.img"
- }
- file barebox.bin {
- image = "barebox-am33xx-beaglebone.img"
- }
files = {
- "barebox.env",
- "czechlight-bbb.dtb",
- "zImage"
+ "MLO",
+ "u-boot.img"
+ }
+ file boot.scr {
+ image = "sd.scr"
}
}
- size = 32M
+ size = 8M
}
image sdcard.img {
hdimage {
}
- partition boot {
+ partition u-boot {
partition-type = 0xC
- in-partition-table = "yes"
bootable = "true"
- image = "boot.vfat"
+ image = "boot-sd.vfat"
}
partition rootfs {
partition-type = 0x83
image = "rootfs.ext4"
}
+
+ partition cfg {
+ partition-type = 0x83
+ image = "cfg.ext4"
+ }
}
+
+# this is largely untested...
+#image boot-emmc.vfat {
+# vfat {
+# files = {
+# "MLO",
+# "u-boot.img"
+# }
+# file boot.scr {
+# image = "rauc.scr"
+# }
+# }
+# size = 8M
+#}
+#
+#image emmc.img {
+# hdimage {
+# }
+#
+# partition u-boot {
+# partition-type = 0xC
+# bootable = "true"
+# image = "boot-emmc.vfat"
+# }
+#
+# partition rootfs-A {
+# partition-type = 0x83
+# image = "rootfs.ext4"
+# size = 1024M
+# }
+#
+# partition cfg-A {
+# partition-type = 0x83
+# image = "cfg.ext4"
+# size = 512M
+# }
+#
+# partition rootfs-B {
+# partition-type = 0x83
+# image = "rootfs.ext4"
+# size = 1024M
+# }
+#
+# partition cfg-B {
+# partition-type = 0x83
+# image = "cfg.ext4"
+# size = 512M
+# }
+#}