summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@ensc.de>2017-09-08 19:33:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-25 14:14:16 +0100
commitedcf39820f94c84b29c95a0d7b16b8d36857e87b (patch)
tree4a1e4011ae09bf6dc22bb730c643da48dec2051e
parentf94f6e655fc16213b0980c6f462785dc745dc445 (diff)
downloadpoky-edcf39820f94c84b29c95a0d7b16b8d36857e87b.tar.gz
wic: allow multiple /boot partitions with different content
It can be useful to have multiple partitions with '--source bootimg-partition' but different content. E.g. for TI AM335x, one boot partition can contain an first stage bootloader ("MLO"), while the real bootloader and kernel plus devicetree are in another one. Patch allows to specify multiple IMAGE_BOOT_FILES with optional "_label-XXX" or "_uuid-XXX" overrides. E.g. with this patch, a .wks file with | part --source bootimg-partition ... --label=mlo --active | part --source bootimg-partition ... --label=boot0 | part --source bootimg-partition ... --label=boot1 and a recipe with | IMAGE_BOOT_FILES_label-mlo = "\ | MLO-${MACHINE}.img;MLO \ | " | | IMAGE_BOOT_FILES_label-boot0 = "\ | u-boot-${MACHINE}.img;u-boot.img \ | zImage \ | " | | IMAGE_BOOT_FILES_label-boot1 = "${IMAGE_BOOT_FILES_label-boot0}" | | WICVARS += " \ | IMAGE_BOOT_FILES_label-mlo \ | IMAGE_BOOT_FILES_label-boot0 \ | IMAGE_BOOT_FILES_label-boot1 \ | " is possible. It will create one partition with the MLO and two redundant ones with the uboot + kernel. (From OE-Core rev: 8c1dec627e9735260516fe8f0b2bfdb0ee70172b) Signed-off-by: Enrico Scholz <enrico.scholz@ensc.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py17
1 files changed, 13 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index ca074a39d8..67e5498d5e 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -54,7 +54,7 @@ class BootimgPartitionPlugin(SourcePlugin):
54 - sets up a vfat partition 54 - sets up a vfat partition
55 - copies all files listed in IMAGE_BOOT_FILES variable 55 - copies all files listed in IMAGE_BOOT_FILES variable
56 """ 56 """
57 hdddir = "%s/boot" % cr_workdir 57 hdddir = "%s/boot.%d" % (cr_workdir, part.lineno)
58 install_cmd = "install -d %s" % hdddir 58 install_cmd = "install -d %s" % hdddir
59 exec_cmd(install_cmd) 59 exec_cmd(install_cmd)
60 60
@@ -65,10 +65,19 @@ class BootimgPartitionPlugin(SourcePlugin):
65 65
66 logger.debug('Kernel dir: %s', bootimg_dir) 66 logger.debug('Kernel dir: %s', bootimg_dir)
67 67
68 boot_files = get_bitbake_var("IMAGE_BOOT_FILES") 68 boot_files = None
69 for (fmt, id) in (("_uuid-%s", part.uuid), ("_label-%s", part.label), (None, None)):
70 if fmt:
71 var = fmt % id
72 else:
73 var = ""
74
75 boot_files = get_bitbake_var("IMAGE_BOOT_FILES" + var)
76 if boot_files is not None:
77 break
69 78
70 if not boot_files: 79 if boot_files is None:
71 raise WicError('No boot files defined, IMAGE_BOOT_FILES unset') 80 raise WicError('No boot files defined, IMAGE_BOOT_FILES unset for entry #%d' % part.lineno)
72 81
73 logger.debug('Boot files: %s', boot_files) 82 logger.debug('Boot files: %s', boot_files)
74 83