summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-11-26 14:07:58 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-11-26 19:21:29 +0100
commit6532332e76a96f5ceb4b654978a654148c2628fe (patch)
tree1be13f18e59ab16cf77bcf38c7073faea3b8e44e
parent2f022fafaf299b224d7a17f8b24d8edf08b86dae (diff)
downloadptxdist-6532332e76a96f5ceb4b654978a654148c2628fe.tar.gz
ptxdist-6532332e76a96f5ceb4b654978a654148c2628fe.tar.xz
host-genimage: version bump 14 -> 15
The new genimage is stricter, so add the necessary holes to the bootloader configs. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--config/images/barebox_partitions.config1
-rw-r--r--config/images/grub.config1
-rw-r--r--rules/host-genimage.make4
3 files changed, 4 insertions, 2 deletions
diff --git a/config/images/barebox_partitions.config b/config/images/barebox_partitions.config
index e60957e3b..a5c55e69e 100644
--- a/config/images/barebox_partitions.config
+++ b/config/images/barebox_partitions.config
@@ -1,5 +1,6 @@
partition barebox {
in-partition-table = false
image = "barebox-image"
+ holes = {"(440; 512)"}
size = 2M
}
diff --git a/config/images/grub.config b/config/images/grub.config
index fa33bf75d..50b8771e2 100644
--- a/config/images/grub.config
+++ b/config/images/grub.config
@@ -1,6 +1,7 @@
image grub-stage1 {
file {
name = "@GRUB_STAGE_DIR@/stage1"
+ holes = {"(440; 512)"}
}
}
image grub-stage2 {
diff --git a/rules/host-genimage.make b/rules/host-genimage.make
index 6e4468d24..08476be51 100644
--- a/rules/host-genimage.make
+++ b/rules/host-genimage.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_GENIMAGE) += host-genimage
#
# Paths and names
#
-HOST_GENIMAGE_VERSION := 14
-HOST_GENIMAGE_MD5 := 266b5692aba2e2b98db2ec9de7c09a59
+HOST_GENIMAGE_VERSION := 15
+HOST_GENIMAGE_MD5 := 3eb6c4992be7ba9cea1c737ab1c26980
HOST_GENIMAGE := genimage-$(HOST_GENIMAGE_VERSION)
HOST_GENIMAGE_SUFFIX := tar.xz
HOST_GENIMAGE_URL := http://www.pengutronix.de/software/genimage/download/$(HOST_GENIMAGE).$(HOST_GENIMAGE_SUFFIX)