Skip to content

Commit 8063568

Browse files
committed
Include u-boot in update.
This is needed as the CONFIG_SYS_BOOTM_LEN setting in u-boot has been changed from 8M to 16M. Without this change, the new kernel image will not boot after an update as after updating the meta-layers, it exceeds the 8M limit.
1 parent 0fdff46 commit 8063568

File tree

10 files changed

+102
-4
lines changed

10 files changed

+102
-4
lines changed

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-base-update/chirpstack-gateway-os-base-update.bb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ SRC_URI = "\
99
file://sw-description \
1010
"
1111

12-
IMAGE_DEPENDS = "chirpstack-gateway-os-base"
13-
SWUPDATE_IMAGES = "chirpstack-gateway-os-base"
12+
IMAGE_DEPENDS = "chirpstack-gateway-os-base u-boot"
13+
SWUPDATE_IMAGES = "chirpstack-gateway-os-base u-boot"
1414
SWUPDATE_IMAGES_FSTYPES[chirpstack-gateway-os-base] = ".ext4.gz"
15+
SWUPDATE_IMAGES_FSTYPES[u-boot] = ".bin"

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-base-update/files/raspberrypi/sw-description

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ software =
1414
device = "/dev/mmcblk0p2";
1515
}
1616
);
17+
files: (
18+
{
19+
filename = "u-boot-raspberrypi.bin";
20+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
21+
}
22+
);
1723
uboot: (
1824
{
1925
name = "part_active";
@@ -39,6 +45,12 @@ software =
3945
device = "/dev/mmcblk0p3";
4046
}
4147
);
48+
files: (
49+
{
50+
filename = "u-boot-raspberrypi.bin";
51+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
52+
}
53+
);
4254
uboot: (
4355
{
4456
name = "part_active";

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-base-update/files/raspberrypi0-wifi/sw-description

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ software =
1414
device = "/dev/mmcblk0p2";
1515
}
1616
);
17+
files: (
18+
{
19+
filename = "u-boot-raspberrypi0-wifi.bin";
20+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
21+
}
22+
);
1723
uboot: (
1824
{
1925
name = "part_active";
@@ -39,6 +45,12 @@ software =
3945
device = "/dev/mmcblk0p3";
4046
}
4147
);
48+
files: (
49+
{
50+
filename = "u-boot-raspberrypi0-wifi.bin";
51+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
52+
}
53+
);
4254
uboot: (
4355
{
4456
name = "part_active";

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-base-update/files/raspberrypi3/sw-description

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ software =
1414
device = "/dev/mmcblk0p2";
1515
}
1616
);
17+
files: (
18+
{
19+
filename = "u-boot-raspberrypi3.bin";
20+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
21+
}
22+
);
1723
uboot: (
1824
{
1925
name = "part_active";
@@ -39,6 +45,12 @@ software =
3945
device = "/dev/mmcblk0p3";
4046
}
4147
);
48+
files: (
49+
{
50+
filename = "u-boot-raspberrypi3.bin";
51+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
52+
}
53+
);
4254
uboot: (
4355
{
4456
name = "part_active";

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-base-update/files/raspberrypi4/sw-description

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ software =
1414
device = "/dev/mmcblk0p2";
1515
}
1616
);
17+
files: (
18+
{
19+
filename = "u-boot-raspberrypi4.bin";
20+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
21+
}
22+
);
1723
uboot: (
1824
{
1925
name = "part_active";
@@ -39,6 +45,12 @@ software =
3945
device = "/dev/mmcblk0p3";
4046
}
4147
);
48+
files: (
49+
{
50+
filename = "u-boot-raspberrypi4.bin";
51+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
52+
}
53+
);
4254
uboot: (
4355
{
4456
name = "part_active";

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-full-update/chirpstack-gateway-os-full-update.bb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ SRC_URI = "\
99
file://sw-description \
1010
"
1111

12-
IMAGE_DEPENDS = "chirpstack-gateway-os-full"
13-
SWUPDATE_IMAGES = "chirpstack-gateway-os-full"
12+
IMAGE_DEPENDS = "chirpstack-gateway-os-full u-boot"
13+
SWUPDATE_IMAGES = "chirpstack-gateway-os-full u-boot"
1414
SWUPDATE_IMAGES_FSTYPES[chirpstack-gateway-os-full] = ".ext4.gz"
15+
SWUPDATE_IMAGES_FSTYPES[u-boot] = ".bin"

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-full-update/files/raspberrypi/sw-description

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ software =
1414
device = "/dev/mmcblk0p2";
1515
}
1616
);
17+
files: (
18+
{
19+
filename = "u-boot-raspberrypi.bin";
20+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
21+
}
22+
);
1723
uboot: (
1824
{
1925
name = "part_active";
@@ -39,6 +45,12 @@ software =
3945
device = "/dev/mmcblk0p3";
4046
}
4147
);
48+
files: (
49+
{
50+
filename = "u-boot-raspberrypi.bin";
51+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
52+
}
53+
);
4254
uboot: (
4355
{
4456
name = "part_active";

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-full-update/files/raspberrypi0-wifi/sw-description

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ software =
1414
device = "/dev/mmcblk0p2";
1515
}
1616
);
17+
files: (
18+
{
19+
filename = "u-boot-raspberrypi0-wifi.bin";
20+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
21+
}
22+
);
1723
uboot: (
1824
{
1925
name = "part_active";
@@ -39,6 +45,12 @@ software =
3945
device = "/dev/mmcblk0p3";
4046
}
4147
);
48+
files: (
49+
{
50+
filename = "u-boot-raspberrypi0-wifi.bin";
51+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
52+
}
53+
);
4254
uboot: (
4355
{
4456
name = "part_active";

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-full-update/files/raspberrypi3/sw-description

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ software =
1414
device = "/dev/mmcblk0p2";
1515
}
1616
);
17+
files: (
18+
{
19+
filename = "u-boot-raspberrypi3.bin";
20+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
21+
}
22+
);
1723
uboot: (
1824
{
1925
name = "part_active";
@@ -39,6 +45,12 @@ software =
3945
device = "/dev/mmcblk0p3";
4046
}
4147
);
48+
files: (
49+
{
50+
filename = "u-boot-raspberrypi3.bin";
51+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
52+
}
53+
);
4254
uboot: (
4355
{
4456
name = "part_active";

layers/targets/meta-raspberrypi/recipes-core/chirpstack-gateway-os-full-update/files/raspberrypi4/sw-description

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ software =
1414
device = "/dev/mmcblk0p2";
1515
}
1616
);
17+
files: (
18+
{
19+
filename = "u-boot-raspberrypi4.bin";
20+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
21+
}
22+
);
1723
uboot: (
1824
{
1925
name = "part_active";
@@ -39,6 +45,12 @@ software =
3945
device = "/dev/mmcblk0p3";
4046
}
4147
);
48+
files: (
49+
{
50+
filename = "u-boot-raspberrypi4.bin";
51+
path = "/boot/@@SDIMG_KERNELIMAGE@@";
52+
}
53+
);
4254
uboot: (
4355
{
4456
name = "part_active";

0 commit comments

Comments
 (0)