diff options
| author |   Tom Rini <trini@konsulko.com> | 2017-08-02 17:27:25 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-08-04 17:24:27 +0000 |
| commit | 3ca6c578c302e5658ea78f6eed216188b50ed906 (patch) | |
| tree | 62932bd51bb8fcbdfb710d71877551af5ecc7682 /meta-agl-bsp/conf | |
| parent | 019c73818e94f79d75f2bc5893fd57a3d011e24a (diff) | |
raspberrypi: Fix U-Boot support
In order to use U-Boot on the raspberrypi3 we need to have the equivalent
of the following commit from upstream meta-raspberrypi:
commit 67e02164929a7d8cc187315aaaab60f6f3aaf422
Author: Paul Barker <paul@paulbarker.me.uk>
Date: Mon Feb 13 23:32:43 2017 +0000
u-boot: Fix boot on rpi3
With that done, we can re-enable U-Boot support for raspberrypi3. With
this done we can also now re-enable testing, so do so. For consistency we
can now switch raspberrypi2 over to U-Boot as well.
Change-Id: I9c96a66bf5644bf63f2566559ab7d9c4101b7a55
Bug-AGL: SPEC-409
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10491
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>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp/conf')
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_raspberrypi2.inc | 2 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc index 5de54be63..0b531b11d 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 = "Image" +KERNEL_IMAGETYPE = "uImage" 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 5de54be63..1dd5f2989 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -9,7 +9,10 @@ CORE_IMAGE_EXTRA_INSTALL += "wayland weston" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" -KERNEL_IMAGETYPE = "Image" +# The correct config for a Raspberry Pi 3 in 32bit mode +UBOOT_MACHINE = "rpi_3_32b_config" + +KERNEL_IMAGETYPE = "uImage" KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" PREFERRED_VERSION_linux-raspberrypi = "4.4.%" PREFERRED_VERSION_mesa = "12.%" |