bbb: use RAUC eMMC layout
This, unfortunately, means that the system will no longer boot from the
SD card:
- U-Boot is set to store its env in the p1 VFAT partition
- rootfs' /boot is something else (kernel, etc) than what gets mounted
on system's /boot
- rootfs' /boot/boot.scr contains device numbers which refer to the eMMC
block device, not to the SD card
I think it might be possible to add some workarounds, such as exporting
the number of an "active MMC device" to an U-Boot variable or something,
but hey, let's give up. The only thing that I need is *some* method of
flashing content to the device, and any distro is good enough for that.
Kill services which are no longer useful, such as Avahi (originally used
for MDNS), and the tty-over-USB which only holds up the build.
Also sync the config with clearfog.
Change-Id: Ia966448a05ed5ce52747f5e7169136232f5502c2
diff --git a/board/czechlight/beaglebone/genimage.cfg b/board/czechlight/beaglebone/genimage.cfg
index 8f92ca1..bcbd27f 100644
--- a/board/czechlight/beaglebone/genimage.cfg
+++ b/board/czechlight/beaglebone/genimage.cfg
@@ -1,85 +1,45 @@
-image boot-sd.vfat {
+image boot-emmc.vfat {
vfat {
files = {
"MLO",
- "u-boot.img"
- }
- file boot.scr {
- image = "sd.scr"
- }
- file uEnv.txt {
- image = "sd-uEnv.txt"
+ "u-boot.img",
+ "rauc.scr"
}
}
size = 8M
}
-image sdcard.img {
+image emmc.img {
hdimage {
}
partition u-boot {
partition-type = 0xC
bootable = "true"
- image = "boot-sd.vfat"
+ image = "boot-emmc.vfat"
}
- partition rootfs {
+ partition rootfs-A {
partition-type = 0x83
image = "rootfs.ext4"
+ size = 1024M
}
- partition cfg {
+ 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
}
}
-
-# 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
-# }
-#}