diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-02-11 12:02:05 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2021-02-25 14:26:26 +0000 |
commit | 10d21b802242509a780be46234f8311c1a14dd94 (patch) | |
tree | 9aee37d4e32257dc788fe152577302a64c506ce7 | |
parent | f5fe02c30cc82e3f47c36de76d7b73d2482018bf (diff) | |
download | meta-raspberrypi-10d21b802242509a780be46234f8311c1a14dd94.tar.gz |
sdcard_image-rpi.bbclass: increase default boot partition size from 40MiB to 48MiB
* 5.10 kernel got a bit bigger especially for aarch64:
5.10: 22M deploy/images/raspberrypi4-64/Image-raspberrypi4-64.bin
5.10: 7.0M deploy/images/raspberrypi4/uImage-raspberrypi4.bin
5.4: 16M deploy/images/raspberrypi4-64/Image-raspberrypi4-64.bin
5.4: 6.2M deploy/images/raspberrypi4/uImage-raspberrypi4.bin
* and the space in fat boot partition was already tight:
Filesystem Size Used Avail Use% Mounted on
/dev/mmcblk0p1 40M 38M 1.7M 96% /
* increase the size to compensate for it, otherwise
do_image_rpi_sdimg now fails with:
Creating filesystem with Boot partition 40960 KiB and RootFS 1822720 KiB
0+0 records in
0+0 records out
0 bytes copied, 0.000100992 s, 0.0 kB/s
Model: (file)
Disk foo.rootfs.rpi-sdimg: 1913MB
Sector size (logical/physical): 512B/512B
Partition Table: msdos
Disk Flags:
Number Start End Size Type File system Flags
1 4194kB 46.1MB 41.9MB primary boot, lba
2 46.1MB 1913MB 1866MB primary
mkfs.fat: warning - lowercase labels might not work properly with DOS or Windows
mkfs.fat 4.1 (2017-01-24)
Copying bootcode.bin
Copying cmdline.txt
Copying config.txt
Copying fixup.dat
Copying fixup4.dat
Copying fixup4cd.dat
Copying fixup4db.dat
Copying fixup4x.dat
Copying fixup_cd.dat
Copying fixup_db.dat
Copying fixup_x.dat
Copying rpi-bootfiles-20210205.stamp
Copying start.elf
Copying start4.elf
Copying start4cd.elf
Copying start4db.elf
Copying start4x.elf
Copying start_cd.elf
Copying start_db.elf
Copying start_x.elf
Copying bcm2711-rpi-4-b.dtb
Copying at86rf233.dtbo
Copying disable-bt.dtbo
Copying dwc2.dtbo
Copying gpio-ir.dtbo
Copying gpio-ir-tx.dtbo
Copying gpio-key.dtbo
Copying hifiberry-amp.dtbo
Copying hifiberry-dac.dtbo
Copying hifiberry-dacplus.dtbo
Copying hifiberry-digi.dtbo
Copying justboom-both.dtbo
Copying justboom-dac.dtbo
Copying justboom-digi.dtbo
Copying i2c-rtc.dtbo
Copying imx219.dtbo
Copying iqaudio-dac.dtbo
Copying iqaudio-dacplus.dtbo
Copying mcp2515-can0.dtbo
Copying mcp2515-can1.dtbo
Copying miniuart-bt.dtbo
Copying pitft22.dtbo
Copying pitft28-capacitive.dtbo
Copying pitft28-resistive.dtbo
Copying pitft35-resistive.dtbo
Copying pps-gpio.dtbo
Copying rpi-ft5406.dtbo
Copying rpi-poe.dtbo
Copying vc4-fkms-v3d.dtbo
Copying vc4-kms-v3d.dtbo
Copying w1-gpio.dtbo
Copying w1-gpio-pullup.dtbo
Copying kernel8.img
Copying boot.scr
Copying Image
Disk full
ERROR: mcopy cannot copy /OE/build/luneos-hardknott/webos-ports/tmp-glibc/deploy/images/raspberrypi4-64/Image into boot.img
WARNING: exit code 1 from a shell command.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | classes/sdcard_image-rpi.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 0ae98cd..e18a596 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -13,14 +13,14 @@ inherit image_types | |||
13 | # Default Free space = 1.3x | 13 | # Default Free space = 1.3x |
14 | # Use IMAGE_OVERHEAD_FACTOR to add more space | 14 | # Use IMAGE_OVERHEAD_FACTOR to add more space |
15 | # <---------> | 15 | # <---------> |
16 | # 4MiB 40MiB SDIMG_ROOTFS | 16 | # 4MiB 48MiB SDIMG_ROOTFS |
17 | # <-----------------------> <----------> <----------------------> | 17 | # <-----------------------> <----------> <----------------------> |
18 | # ------------------------ ------------ ------------------------ | 18 | # ------------------------ ------------ ------------------------ |
19 | # | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE | | 19 | # | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE | |
20 | # ------------------------ ------------ ------------------------ | 20 | # ------------------------ ------------ ------------------------ |
21 | # ^ ^ ^ ^ | 21 | # ^ ^ ^ ^ |
22 | # | | | | | 22 | # | | | | |
23 | # 0 4MiB 4MiB + 40MiB 4MiB + 40Mib + SDIMG_ROOTFS | 23 | # 0 4MiB 4MiB + 48MiB 4MiB + 48Mib + SDIMG_ROOTFS |
24 | 24 | ||
25 | # This image depends on the rootfs image | 25 | # This image depends on the rootfs image |
26 | IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" | 26 | IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" |
@@ -34,7 +34,7 @@ SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" | |||
34 | BOOTDD_VOLUME_ID ?= "${MACHINE}" | 34 | BOOTDD_VOLUME_ID ?= "${MACHINE}" |
35 | 35 | ||
36 | # Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) | 36 | # Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) |
37 | BOOT_SPACE ?= "40960" | 37 | BOOT_SPACE ?= "49152" |
38 | 38 | ||
39 | # Set alignment to 4MB [in KiB] | 39 | # Set alignment to 4MB [in KiB] |
40 | IMAGE_ROOTFS_ALIGNMENT = "4096" | 40 | IMAGE_ROOTFS_ALIGNMENT = "4096" |