Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove rc1 locks merge window open for rc2
[AGL/meta-agl.git]
/
meta-agl-bsp
/
conf
/
include
/
agl_raspberrypi3.inc
diff --git
a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index
2cd9ec2
..
54ccdd5
100644
(file)
--- a/
meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/
meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@
-5,20
+5,12
@@
ENABLE_CMA = "1"
CMA_LWM = "16"
CMA_HWM = "32"
CMA_LWM = "16"
CMA_HWM = "32"
-CORE_IMAGE_EXTRA_INSTALL += "wayland weston"
-
MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
-KERNEL_IMAGETYPE = "Image"
-KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb"
-PREFERRED_VERSION_linux-raspberrypi = "4.4.%"
-PREFERRED_VERSION_mesa = "12.%"
+# The correct config for a Raspberry Pi 3 in 32bit mode
+UBOOT_MACHINE = "rpi_3_32b_config"
-PREFERRED_PROVIDER_virtual/egl = "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 = "mesa"
-PREFERRED_PROVIDER_virtual/libgl = "mesa"
-PREFERRED_PROVIDER_virtual/mesa = "mesa"
-PREFERRED_PROVIDER_jpeg = "jpeg"
+KERNEL_IMAGETYPE = "uImage"
MACHINE_FEATURES += "vc4graphics"
MACHINE_FEATURES += "vc4graphics"
@@
-34,7
+26,7
@@
IMAGE_FEATURES_remove = "splash"
DISTRO_FEATURES_append = " sota"
# Add the custom rpi-sdimg output format
DISTRO_FEATURES_append = " sota"
# Add the custom rpi-sdimg output format
-AGL_EXTRA_IMAGE_FSTYPES
_append
= " rpi-sdimg.xz"
+AGL_EXTRA_IMAGE_FSTYPES = " rpi-sdimg.xz"
# Use the AGL default ext4.xz to generate the rpi-sdimg
SDIMG_ROOTFS_TYPE = "ext4.xz"
# Use the AGL default ext4.xz to generate the rpi-sdimg
SDIMG_ROOTFS_TYPE = "ext4.xz"