diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2018-05-24 13:38:58 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2018-05-24 10:46:38 +0000 |
| commit | 3d93d26a72d506c314fcb7dd4a60a031ae57f989 (patch) | |
| tree | 0b55b19b13c55612ac3c3407c800d269d6ece0f3 /96boards-b2260 | |
| parent | 7c562b2720d5b77b3180a4308ca9270a28370558 (diff) | |
96boards-b2260: make uboot image of kernel
To workaround issue with lava uimage generation
Change-Id: Id559a3814d7a9cd361cf010c6a441b964f826762
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to '96boards-b2260')
| -rw-r--r-- | 96boards-b2260/builders.sh | 5 | ||||
| -rw-r--r-- | 96boards-b2260/lava-job-definitions/b2260/template.yaml | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/96boards-b2260/builders.sh b/96boards-b2260/builders.sh index b9ebc461..38debb2f 100644 --- a/96boards-b2260/builders.sh +++ b/96boards-b2260/builders.sh @@ -16,7 +16,7 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then sleep 15 sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true fi -pkg_list="fai-server fai-setup-storage qemu-utils procps pigz kpartx " +pkg_list="fai-server fai-setup-storage qemu-utils procps pigz kpartx u-boot-tools" if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then echo "INFO: apt install error - try again in a moment" sleep 15 @@ -77,7 +77,7 @@ for rootfs in ${ROOTFS}; do cp /mnt/boot/vmlinuz-${kvers} out/vmlinuz cp /mnt/boot/initrd.img-${kvers} out/initrd cp /mnt/usr/lib/linux-image-$kvers/stih410-b2260.dtb out/ - sudo tar caf out/rootfs-${image_name}.tar /mnt + sudo tar caf out/rootfs-${image_name}.tar /mnt sudo chroot /mnt dpkg -l > out/${image_name}.packages sudo umount -f /mnt fi @@ -85,6 +85,7 @@ for rootfs in ${ROOTFS}; do done sudo kpartx -dv /tmp/work.raw cp /tmp/work.raw out/${image_name}.sd + mkimage -A arm -O linux -T kernel -C none -a 0x40080000 -e 40080000 -d out/vmlinuz out/uImage # Compress image(s) pigz -9 out/rootfs-${image_name}.tar out/${image_name}.sd diff --git a/96boards-b2260/lava-job-definitions/b2260/template.yaml b/96boards-b2260/lava-job-definitions/b2260/template.yaml index 715dc16b..0e711469 100644 --- a/96boards-b2260/lava-job-definitions/b2260/template.yaml +++ b/96boards-b2260/lava-job-definitions/b2260/template.yaml @@ -19,12 +19,8 @@ actions: to: tftp os: debian kernel: - url: 'https://snapshots.linaro.org/96boards/b2260/linaro/debian/${BUILD_NUMBER}/vmlinuz' - type: zimage - ramdisk: - url: 'https://snapshots.linaro.org/96boards/b2260/linaro/debian/${BUILD_NUMBER}/initrd' - compression: gz - add-header: u-boot + url: 'https://snapshots.linaro.org/96boards/b2260/linaro/debian/${BUILD_NUMBER}/uImage' + type: uimage dtb: url: 'https://snapshots.linaro.org/96boards/b2260/linaro/debian/${BUILD_NUMBER}/stih410-b2260.dtb' nfsrootfs: |