From 4204309872da5cb401cbb2729d9e2d4869a87f42 Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Thu, 22 Oct 2020 14:58:56 +0900 Subject: agl-basesystem 0.1 --- meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc | 7 ++----- meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc | 7 ++----- meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc | 7 ++----- .../meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 16 +++++++++++++++- meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc | 4 ++-- meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 11 +++++++++++ 6 files changed, 34 insertions(+), 18 deletions(-) (limited to 'meta-agl/meta-agl-bsp/conf/include') diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc b/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc index 4f4dc986..5dc81709 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc @@ -8,7 +8,7 @@ CORE_IMAGE_EXTRA_INSTALL += "packagegroup-machine-base" #------------------------------------------------- ## Graphics section ## #------------------------------------------------- -PACKAGES_GFX = "omapdrm-pvr" +PACKAGES_GFX = "ti-sgx-ddk-km" IMAGE_INSTALL_append = " ${PACKAGES_GFX}" @@ -22,11 +22,8 @@ DEPENDS_remove = "virtual/libgl" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/mesa = "mesa-gl" -PREFERRED_PROVIDER_libgbm = "libgbm" - -#Preferred versions -PREFERRED_VERSION_libgbm = "10.0.0" #------------------------------------------------- ## Multimedia section ## diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc index 988b3d53..1917ff45 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc @@ -3,7 +3,7 @@ #------------------------------------------------- ## Graphics section ## #------------------------------------------------- -PACKAGES_GFX = "omapdrm-pvr" +PACKAGES_GFX = "ti-sgx-ddk-km" IMAGE_INSTALL_append = " ${PACKAGES_GFX}" @@ -17,11 +17,8 @@ DEPENDS_remove = "virtual/libgl" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/mesa = "mesa-gl" -PREFERRED_PROVIDER_libgbm = "libgbm" - -#Preferred versions -PREFERRED_VERSION_libgbm = "10.0.0" #------------------------------------------------- ## Multimedia section ## diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc index 54524a81..2e7741a5 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc @@ -2,7 +2,7 @@ #------------------------------------------------- ## Graphics section ## #------------------------------------------------- -PACKAGES_GFX_${MACHINE} = "omapdrm-pvr" +PACKAGES_GFX_${MACHINE} = "ti-sgx-ddk-km" # Enable Gfx Pkgs MACHINE_FEATURES_append = " sgx" @@ -14,11 +14,8 @@ DEPENDS_remove = "virtual/libgl" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/mesa = "mesa-gl" -PREFERRED_PROVIDER_libgbm = "libgbm" - -#Preferred versions -PREFERRED_VERSION_libgbm = "10.0.0" #------------------------------------------------- ## Multimedia section ## diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc index 39ed6688..68398371 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc @@ -5,7 +5,7 @@ IMAGE_INSTALL_append = " \ intel-vaapi-driver \ gstreamer1.0-vaapi" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum ext4 wic.vmdk" INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" # Modify this file under meta-agl-bsp/meta-intel/wic to change the @@ -16,3 +16,17 @@ PREFERRED_VERSION_linux-intel ?= "4.19%" PREFERRED_VERSION_linux-intel-rt ?= "4.19%" SERIAL_CONSOLES_remove = "115200;ttyS2" + +# +# To avoid corrupt boot screen by systemd message, you can use serial +# console separated from VGA console or disable all boot messages by +# kernel command line. +# +# Configuration for serial console +QB_KERNEL_CMDLINE_APPEND_append = " console=ttyS0,115200n8" +# +# All boot message will be off +QB_KERNEL_CMDLINE_APPEND_append = " quiet" +# +# Force the virtio video device as 'vmware' doesn't always work +QB_OPT_APPEND_append = " -vga virtio" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc index a72f7b0f..11295c7e 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -21,7 +21,7 @@ QB_KERNEL_CMDLINE_APPEND_append = " quiet" DISTRO_FEATURES_append = " sota" # Image support -AGL_EXTRA_IMAGE_FSTYPES = "ext4 wic.vmdk" +AGL_EXTRA_IMAGE_FSTYPES = "ext4 wic.vmdk wic.xz wic.bmap" IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom" # Root device @@ -31,4 +31,4 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" QB_OPT_APPEND_append = " -vga virtio" # Use our own wks file -WKS_FILE="directdisk.wks.in" +WKS_FILE="systemd-intel-corei7-64-bootdisk.wks" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index cc307485..94dc5ace 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -14,8 +14,19 @@ UBOOT_MACHINE = "rpi_3_32b_config" KERNEL_IMAGETYPE = "uImage" +PREFERRED_VERSION_linux-raspberrypi = "4.19%" +RPI_KERNEL_DEVICETREE_remove_raspberrypi3 = "bcm2708-rpi-0-w.dtb" +RPI_KERNEL_DEVICETREE_OVERLAYS_remove_raspberrypi3 = "overlays/lirc-rpi.dtbo" +RPI_KERNEL_DEVICETREE_OVERLAYS_append_raspberrypi3 = " overlays/vc4-fkms-v3d.dtbo" + +# Set appropriate version of Mesa for Raspberry Pi 3 and 4 +PREFERRED_VERSION_mesa = "19.1%" + MACHINE_FEATURES += "vc4graphics" +# Switch to firmware KMS to support the official DSI touchscreen display +VC4DTBO = "vc4-fkms-v3d" + # For libomxil #LICENSE_FLAGS_WHITELIST = "commercial" -- cgit 1.2.3-korg