From 5334d458c46533c51bc6879b1026181f9ac453ae Mon Sep 17 00:00:00 2001 From: Ronan Date: Fri, 20 Jan 2017 16:57:00 +0100 Subject: Move feature code into the meta recipes * Having a minimlal local.conf serving the only purpose of user customization is the "Yocto" way of doing things * After a source synchronization (repo sync), feature code must be update without regenerate local.conf Change-Id: I0bb0861f4c07a8b57cb59a03f6ffe9d2d693cbbe Signed-off-by: Ronan --- templates/machine/raspberrypi2/50_local.conf.inc | 49 +----------------------- 1 file changed, 2 insertions(+), 47 deletions(-) (limited to 'templates/machine/raspberrypi2') diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc index 6c74f8203..5d314eeb4 100644 --- a/templates/machine/raspberrypi2/50_local.conf.inc +++ b/templates/machine/raspberrypi2/50_local.conf.inc @@ -1,48 +1,3 @@ MACHINE = "raspberrypi2" - -#GPU_MEM = "512" -# Increase GPU_MEM for AGL apps (navi/poi) -GPU_MEM = "640" - -ENABLE_CMA = "1" -CMA_LWM = "16" -CMA_HWM = "32" - -CORE_IMAGE_EXTRA_INSTALL += "wayland weston" - -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" - -KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" -KERNEL_IMAGETYPE_sota = "uImage" -PREFERRED_VERSION_linux-raspberrypi = "4.4.%" -PREFERRED_VERSION_mesa = "12.%" - -PREFERRED_PROVIDER_virtual/egl = "mesa" -PREFERRED_PROVIDER_virtual/libgles2 = "mesa" -PREFERRED_PROVIDER_virtual/libgl = "mesa" -PREFERRED_PROVIDER_virtual/mesa = "mesa" -PREFERRED_PROVIDER_jpeg = "jpeg" - -MACHINE_FEATURES += "vc4graphics" - -### Image classes, fstypes and (S)OTA - -# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota -IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'image_types_uboot sdcard_image-rpi-ota', 'sdcard_image-rpi-gdp', d)}" - -# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota -#IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}" -### both rpi-sdimg and rpi-sdimg-ota broken -IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz" - -KERNEL_IMAGETYPE_sota = "uImage" -PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" -UBOOT_MACHINE_sota = "rpi_2_defconfig" - -# For libomxil -#LICENSE_FLAGS_WHITELIST = "commercial" - -IMAGE_INSTALL_append = " kernel-modules linux-firmware " - -# Psplash causes crash on first boot on RPi -IMAGE_FEATURES_remove = "splash" +#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +require conf/include/agl_raspberrypi2.inc -- cgit 1.2.3-korg