diff options
author | Emmanuel Vadot <manu@FreeBSD.org> | 2021-02-25 15:34:28 +0000 |
---|---|---|
committer | Emmanuel Vadot <manu@FreeBSD.org> | 2021-02-25 15:34:28 +0000 |
commit | 3b6268bb9e4aea939c4ce7f37353174aa90e6751 (patch) | |
tree | 920df8e1e322acdf3913a658841e6aa6c3acf57b | |
parent | 369706a6f887f8ffe1037d78bc31565ec701d72b (diff) | |
download | src-3b6268bb9e4aea939c4ce7f37353174aa90e6751.tar.gz src-3b6268bb9e4aea939c4ce7f37353174aa90e6751.zip |
mkimg: We always want the last block of the last inserted partition
Even with an absolute offset we want to know the last block the partition
otherwise we endup with an image the size of the metadata.
This allow to create image with the ESP placed at a specific position which
is useful on arm/arm64 where u-boot have always a hard time to read the ESP
if it's not aligned on 512k.
mkimg -v -o sdcard -s gpt -p efi::54M:1M -p freebsd-ufs::1G
now works.
MFC after: 3 days
-rw-r--r-- | usr.bin/mkimg/mkimg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index d870f3a8f0c3..c4f0acbe3927 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -528,10 +528,8 @@ mkimg(void) (long long)blkoffset); } } - if (!abs_offset) { - block = scheme_metadata(SCHEME_META_PART_AFTER, - part->block + part->size); - } + block = scheme_metadata(SCHEME_META_PART_AFTER, + part->block + part->size); } mkimg_validate(); |