diff options
| author |   Leon Anavi <leon.anavi@konsulko.com> | 2017-06-13 20:19:37 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-06-23 16:39:19 +0000 |
| commit | e46f5db0ed37fe912ed2f97e27280e8c681e547b (patch) | |
| tree | e690cfbf6e39c7ed443893d96c87b326615ee114 | |
| parent | 21169829e77c8ec93a3a3287e478eea9a2ce2129 (diff) | |
agl_raspberrypi*.inc: Set KERNEL_IMAGETYPE to Image
Set KERNEL_IMAGETYPE to Image to ensure correct
generation of kernel7.img and successful booting
of AGL on Raspberry Pi 3 and 2 with output from
the serial console.
v2 (jsmoeller): Also adapt
templates/machine/raspberrypi3/test/hwtest.short.environment
v3 (jsmoeller): disable CI hwtests as rpi firmware is used
Bug-AGL: SPEC-649
Bug-AGL: SPEC-650
Change-Id: If4335ffed7047fd2fbbf4bbd2dff54322cd0bf07
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9727
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
5 files changed, 8 insertions, 8 deletions
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc index 23e71b6b4..88565fd5a 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc @@ -9,7 +9,7 @@ CORE_IMAGE_EXTRA_INSTALL += "wayland weston" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" -KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE = "Image" KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" PREFERRED_VERSION_linux-raspberrypi = "4.4.%" PREFERRED_VERSION_mesa = "12.%" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index 23e71b6b4..88565fd5a 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -9,7 +9,7 @@ CORE_IMAGE_EXTRA_INSTALL += "wayland weston" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" -KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE = "Image" KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" PREFERRED_VERSION_linux-raspberrypi = "4.4.%" PREFERRED_VERSION_mesa = "12.%" diff --git a/templates/machine/raspberrypi3/test/hwtest.enable b/templates/machine/raspberrypi3/test/hwtest.enable index d00491fd7..573541ac9 100644 --- a/templates/machine/raspberrypi3/test/hwtest.enable +++ b/templates/machine/raspberrypi3/test/hwtest.enable @@ -1 +1 @@ -1 +0 diff --git a/templates/machine/raspberrypi3/test/hwtest.short.enable b/templates/machine/raspberrypi3/test/hwtest.short.enable index d00491fd7..573541ac9 100644 --- a/templates/machine/raspberrypi3/test/hwtest.short.enable +++ b/templates/machine/raspberrypi3/test/hwtest.short.enable @@ -1 +1 @@ -1 +0 diff --git a/templates/machine/raspberrypi3/test/hwtest.short.environment b/templates/machine/raspberrypi3/test/hwtest.short.environment index 68c236557..db4a5a044 100644 --- a/templates/machine/raspberrypi3/test/hwtest.short.environment +++ b/templates/machine/raspberrypi3/test/hwtest.short.environment @@ -1,10 +1,10 @@ DEVICE_TYPE=raspberrypi3-uboot DEVICE_NAME=raspberrypi3 -DEVICE_DTB=uImage-bcm2710-rpi-3-b.dtb -DEVICE_KERNEL=uImage -DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3.ext4.gz.u-boot +DEVICE_DTB=Image-bcm2710-rpi-3-b.dtb +DEVICE_KERNEL=Image +DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3.ext4.gz DEVICE_NBDROOT=agl-demo-platform-raspberrypi3.ext4.xz DEVICE_NBDROOT_COMPRESSION=xz DEVICE_BOOT_METHOD=u-boot -DEVICE_BOOT_TYPE=bootm +DEVICE_BOOT_TYPE=booti #DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL
\ No newline at end of file |