diff options
Diffstat (limited to 'meta-agl/meta-agl-bsp/conf')
29 files changed, 158 insertions, 260 deletions
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 5dc81709..5c28bea2 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc @@ -1,7 +1,7 @@ # This config is for the Sancloud BBE, adapted from the config provider for the # standard Beaglebone -AGL_DEFAULT_IMAGE_FSTYPES = "tar.xz wic.xz wic.bmap" +#AGL_DEFAULT_IMAGE_FSTYPES += "tar.xz" CORE_IMAGE_EXTRA_INSTALL += "packagegroup-machine-base" 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 1917ff45..cfd189df 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc @@ -38,5 +38,3 @@ SECURITY_CFLAGS_pn-libatasmart = "" SECURITY_LDFLAGS_pn-libatasmart = "" WKS_FILE = "sdimage-bootpart-uuid.wks" - -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl/meta-agl-bsp/conf/include/agl_cubox-i.inc index b43ef47c..46464325 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_cubox-i.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_cubox-i.inc @@ -22,6 +22,3 @@ BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" # Set CMA size large enough to work with AGL UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M" - -# Generate WIC image also -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_cyclone5.inc b/meta-agl/meta-agl-bsp/conf/include/agl_cyclone5.inc index 1eaf0ae6..7ebd4090 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_cyclone5.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_cyclone5.inc @@ -3,9 +3,5 @@ OSTREE_BOOTLOADER ?= "u-boot" # DEFAULTTUNE for cortex-a9 DISTRO_FEATURES_append = " agl-medium-arm-compiler" - -# Add the custom rpi-sdimg output format -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz" - # Use the AGL default ext4.xz to generate the rpi-sdimg SDIMG_ROOTFS_TYPE = "ext4.xz" 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 2e7741a5..ccc8feb9 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 @@ -40,5 +40,3 @@ IMAGE_INSTALL_append = " \ do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" WKS_FILE = "sdimage-bootpart-uuid.wks" IMAGE_BOOT_FILES = "MLO u-boot.img uEnv.txt" - -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc b/meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc index f7a73723..2ac93adf 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb.inc +require conf/include/agl_rcar.inc SOC_FAMILY = "r8a77990" BOARD_NAME = "ebisu" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc b/meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc new file mode 100644 index 00000000..c1202635 --- /dev/null +++ b/meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc @@ -0,0 +1,10 @@ +require conf/include/agl_rcar-nogfx.inc +SOC_FAMILY = "r8a7795" +BOARD_NAME = "h3-salvator-x" + +DTB_SUFFIX = "r8a7795-salvator-xs" + +# Mask graphic Pkgs +BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" +# Mask MMP recipes +BBMASK += "kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc b/meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc index 74036111..d338a566 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc @@ -1,3 +1,9 @@ -# The H3-based (as opposed to the M3-based version) salvator-x needs a different -# MACHINE but otherwise uses the same config as the H3. -require conf/include/agl_h3ulcb.inc +require conf/include/agl_rcar.inc +SOC_FAMILY = "r8a7795" +BOARD_NAME = "h3-salvator-x" + +DTB_SUFFIX = "r8a7795-salvator-xs" + +IMAGE_INSTALL_append_rcar-gen3 = " \ + kernel-module-vspmif \ +" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc b/meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc index cee2acc3..25755d24 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb-nogfx.inc +require conf/include/agl_rcar-nogfx.inc SOC_FAMILY = "r8a7795" BOARD_NAME = "h3ulcb" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc index 00c2a70a..eb3836ab 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb.inc +require conf/include/agl_rcar.inc SOC_FAMILY = "r8a7795" BOARD_NAME = "h3ulcb" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_hsdk.inc b/meta-agl/meta-agl-bsp/conf/include/agl_hsdk.inc index 5967f237..075cea53 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_hsdk.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_hsdk.inc @@ -1,5 +1,4 @@ KERNEL_IMAGETYPE = "uImage" WKS_FILE = "sdimage-hsdk.wks" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz" IMAGE_BOOT_FILES = "uImage uboot.env" IMAGE_INSTALL_append = " kernel-modules" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc index b5691778..0d8c6f23 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc @@ -16,6 +16,4 @@ BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" # Set CMA size large enough to work with AGL UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M" -# Generate WIC image also -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" AGL_DEFAULT_INITRAMFS_FSTYPES := "" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc b/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc new file mode 100644 index 00000000..50567583 --- /dev/null +++ b/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc @@ -0,0 +1,19 @@ +DISTRO_FEATURES_append = " agl-medium-arm-compiler" + +# Force use of the community supported LTS kernel instead of the +# default linux-imx +IMX_DEFAULT_KERNEL_imx8mqevk = "linux-fslc-imx" + +# For EVKB wifi support +MACHINE_FEATURES_append = " bcm4356" + +# Disable meta-freescale package architecure mangling, as it causes +# issues with AGL's explicit setting of DEFAULTTUNE. +INHERIT_remove = "fsl-dynamic-packagearch" +MACHINE_SOCARCH = "${TUNE_PKGARCH}" + +# Disable the meta-freescale weston-init bbappend as it conflicts +# with AGL's. +BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" + +AGL_DEFAULT_INITRAMFS_FSTYPES := "" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc b/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc new file mode 100644 index 00000000..8227f5c0 --- /dev/null +++ b/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc @@ -0,0 +1 @@ +include agl_imx8mqevk-common.inc diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc b/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc new file mode 100644 index 00000000..88c06336 --- /dev/null +++ b/meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc @@ -0,0 +1,23 @@ +include agl_imx8mqevk-common.inc + +# NOTE: currently not using IMX_DEFAULT_BSP = "mainline", as it +# requires more changes than this approach of disabling +# Vivante. + +# Add our own over-ride for use in a few recipes where there is +# conflicting Vivante vs etnaviv configuration. +MACHINEOVERRIDES .= ":etnaviv" + +# Knock out Vivante overrides +MACHINEOVERRIDES_EXTENDER_mx8mq_forcevariable = "" +PREFERRED_VERSION_weston_mx8 = "8.0.0" +PREFERRED_VERSION_wayland-protocols_mx8 = "1.20" +PREFERRED_VERSION_libdrm_mx8 = "2.4.100" + +CORE_IMAGE_EXTRA_INSTALL += "libdrm-etnaviv" + +PREFERRED_VERSION_gstreamer1.0_mx8 = "1.16.2" +PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 = "1.16.2" +PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 = "1.16.2" +PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 = "1.16.2" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly_mx8 = "1.16.2" 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 deleted file mode 100644 index 68398371..00000000 --- a/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ /dev/null @@ -1,32 +0,0 @@ -# Enable Libvaapi for HW accelerated video support -# -IMAGE_INSTALL_append = " \ - libva \ - intel-vaapi-driver \ - gstreamer1.0-vaapi" - -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 -# kernel command line, including to change the screen resolution. -WKS_FILE = "systemd-intel-corei7-64-bootdisk.wks" - -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_m3-salvator-x-nogfx.inc b/meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc new file mode 100644 index 00000000..7f124806 --- /dev/null +++ b/meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc @@ -0,0 +1,10 @@ +require conf/include/agl_rcar-nogfx.inc +SOC_FAMILY = "r8a7796" +BOARD_NAME = "m3-salvator-x" + +DTB_SUFFIX = "r8a7796-salvator-xs" + +# Mask graphic Pkgs +BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" +# Mask MMP recipes +BBMASK += "kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc b/meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc new file mode 100644 index 00000000..5dcb5373 --- /dev/null +++ b/meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc @@ -0,0 +1,9 @@ +require conf/include/agl_rcar.inc +SOC_FAMILY = "r8a7796" +BOARD_NAME = "m3-salvator-x" + +DTB_SUFFIX = "r8a7796-salvator-xs" + +IMAGE_INSTALL_append_rcar-gen3 = " \ + kernel-module-vspmif \ +" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index a5789c32..5092c4bc 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb-nogfx.inc +require conf/include/agl_rcar-nogfx.inc SOC_FAMILY = "r8a7796" BOARD_NAME = "m3ulcb" @@ -8,3 +8,7 @@ DTB_SUFFIX = "r8a7796-m3ulcb" BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK += "kernel-module-uvcs-drv|omx-user-module" + +DISTRO_FEATURES_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" +IMAGE_INSTALL_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}" + diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc index 7a1d6add..b845e8c3 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -1,5 +1,8 @@ -require conf/include/agl_ulcb.inc +require conf/include/agl_rcar.inc SOC_FAMILY = "r8a7796" BOARD_NAME = "m3ulcb" DTB_SUFFIX = "r8a7796-m3ulcb" + +DISTRO_FEATURES_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" +IMAGE_INSTALL_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}"
\ No newline at end of file diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl/meta-agl-bsp/conf/include/agl_nitrogen6x.inc index 5864354b..77eb9734 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_nitrogen6x.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_nitrogen6x.inc @@ -16,7 +16,5 @@ BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" # Set CMA size large enough to work with AGL UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M" -# Generate WIC image also #WKS_FILE = "imx-uboot.wks" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" AGL_DEFAULT_INITRAMFS_FSTYPES := "" 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 11295c7e..3915a5e4 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 @@ -20,8 +20,21 @@ QB_KERNEL_CMDLINE_APPEND_append = " quiet" # Build updatable image. Only takes effect when sota.bbclass is inherited DISTRO_FEATURES_append = " sota" +# Add firmware required by Up^2 board and default Intel mPCIe wifi card +# sold by upshop.org +MACHINE_EXTRA_RRECOMMENDS_append = " \ + linux-firmware-i915 \ + linux-firmware-rtl8168 \ + linux-firmware-ibt-hw-37-8 \ + linux-firmware-iwlwifi-7265d \ + wireless-regdb-static \ +" + # Image support -AGL_EXTRA_IMAGE_FSTYPES = "ext4 wic.vmdk wic.xz wic.bmap" +# NOTE: wic.{xz,bmap} are here since qemu targets override +# AGL_DEFAULT_IMAGE_FSTYPES to not include them, but for Intel +# we actually do want them for use on physical hardware. +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'wic.vmdk.xz', 'wic.vmdk', d)}" IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom" # Root device 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 94dc5ace..a4989b79 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -1,32 +1,20 @@ # Maximum memory allowed to be assigned -GPU_MEM = "128" +GPU_MEM = "256" -ENABLE_CMA = "1" # Add CMA to the kernel arguments for SOTA OSTREE_KERNEL_ARGS_sota_append = " cma=256M" -CMA_LWM = "16" -CMA_HWM = "32" -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" +#MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" -# The correct config for a Raspberry Pi 3 in 32bit mode -UBOOT_MACHINE = "rpi_3_32b_config" +# use u-boot always +RPI_USE_U_BOOT = "1" -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%" +#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" MACHINE_FEATURES += "vc4graphics" -# Switch to firmware KMS to support the official DSI touchscreen display -VC4DTBO = "vc4-fkms-v3d" - # For libomxil #LICENSE_FLAGS_WHITELIST = "commercial" @@ -37,17 +25,3 @@ IMAGE_FEATURES_remove = "splash" # Build updatable image. Only takes effect when sota.bbclass is inherited DISTRO_FEATURES_append = " sota" - -# Create WIC images to write to SD cards. -WKS_FILE = "sdimage-raspberrypi.wks" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" -IMAGE_BOOT_FILES = "bcm2835-bootfiles/* \ - ${@make_dtb_boot_files(d)} \ - ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', \ - '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ - '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ - " -do_image_wic[depends] += " \ - bcm2835-bootfiles:do_deploy \ - ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot:do_deploy', '',d)} \ - " diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc b/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc new file mode 100644 index 00000000..ae302aae --- /dev/null +++ b/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc @@ -0,0 +1,28 @@ +# Maximum memory allowed to be assigned +GPU_MEM = "256" + +# Add CMA to the kernel arguments for SOTA +OSTREE_KERNEL_ARGS_sota_append = " cma=256M" + +# use u-boot always +RPI_USE_U_BOOT = "1" + +# For libomxil +#LICENSE_FLAGS_WHITELIST = "commercial" + +IMAGE_INSTALL_append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb " + +# Psplash causes crash on first boot on RPi +IMAGE_FEATURES_remove = "splash" + +# Build updatable image. Only takes effect when sota.bbclass is inherited +DISTRO_FEATURES_append = " sota" + +# Add xen build, if the xen feature activated +DISTRO_FEATURES_append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" + +# add xen-tools to build +IMAGE_INSTALL_append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', 'xen-tools xen-mkimage-rpi4', '', d)}" + +# Add xen-raspberry binary to boot files +IMAGE_BOOT_FILES_append = " ${@bb.utils.contains('AGL_XEN_WANTED','1', 'xen-${MACHINE}', '',d)}" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc b/meta-agl/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc index 8d97996f..a7fabfac 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc @@ -1,10 +1,9 @@ DISTRO_FEATURES_append = " sota" OSTREE_KERNEL = "Image" -IMAGE_BOOT_FILES_sota = "renesas-ota-bootfiles/* Image-${DTB_SUFFIX}.dtb" +IMAGE_BOOT_FILES_sota = "renesas-ota-bootfiles/* ${DTB_SUFFIX}.dtb" OSTREE_BOOTLOADER ?= "u-boot" WKS_FILE = "singlepart-noloader.wks" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" RENESAS_DATADIR = "/usr" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_ulcb.inc b/meta-agl/meta-agl-bsp/conf/include/agl_rcar.inc index d71a6941..dd64ae77 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_ulcb.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_rcar.inc @@ -1,11 +1,8 @@ -require conf/include/agl_ulcb-nogfx.inc +require conf/include/agl_rcar-nogfx.inc # Enable AGL virtualization features MACHINE_FEATURES_append = " agl-egvirt" -# for Wayland/Weston weston-laucher -DISTRO_FEATURES_append = " pam" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -20,6 +17,7 @@ PREFERRED_PROVIDER_libgbm = "libgbm" PREFERRED_RPROVIDER_libgbm-dev = "libgbm" PREFERRED_RPROVIDER_libomxil = "omx-user-module" +PREFERRED_PROVIDER_virtual/libomxil = "omx-user-module" # Add for gstreamer plugins ugly LICENSE_FLAGS_WHITELIST = "commercial" @@ -31,6 +29,17 @@ DISTRO_FEATURES_append = " use_eva_pkg" #DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib" DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw" +# Mask out meta-renesas-rcar-gen3's tweaks to weston-init, as they do +# not seem necessary for anything in AGL, and the addition of +# dbus.service and multi-user.target dependencies to the weston systemd +# unit that is done is problematic with respect to potentially blocking +# weston if any user units like application framework "platform" +# services fail. They also likely affect boot up speed with respect to +# getting weston started. There is no clear rationale expressed in the +# meta-renesas-rcar-gen3 commit history for the extra dependencies, and +# testing shows no issues on H3ULCB when not having them. +BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend" + IMAGE_INSTALL_append_rcar-gen3 = " \ kernel-devicetree \ kernel-module-pvrsrvkm \ diff --git a/meta-agl/meta-agl-bsp/conf/layer.conf b/meta-agl/meta-agl-bsp/conf/layer.conf index 35bf8112..2a999ddd 100644 --- a/meta-agl/meta-agl-bsp/conf/layer.conf +++ b/meta-agl/meta-agl-bsp/conf/layer.conf @@ -23,4 +23,4 @@ BBFILE_COLLECTIONS += "aglbsp" BBFILE_PATTERN_aglbsp = "^${LAYERDIR}/" BBFILE_PRIORITY_aglbsp = "60" -LAYERSERIES_COMPAT_aglbsp = "thud" +LAYERSERIES_COMPAT_aglbsp = "dunfell" diff --git a/meta-agl/meta-agl-bsp/conf/machine/include/rpi4-base.inc b/meta-agl/meta-agl-bsp/conf/machine/include/rpi4-base.inc deleted file mode 100644 index a19d0f88..00000000 --- a/meta-agl/meta-agl-bsp/conf/machine/include/rpi4-base.inc +++ /dev/null @@ -1,125 +0,0 @@ -include conf/machine/include/rpi-default-settings.inc -include conf/machine/include/rpi-default-versions.inc -include conf/machine/include/rpi-default-providers.inc - -SOC_FAMILY = "rpi" -include conf/machine/include/soc-family.inc - -IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" -WKS_FILE ?= "sdimage-raspberrypi.wks" - -XSERVER = " \ - xserver-xorg \ - ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xserver-xorg-extension-glx", "", d)} \ - ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \ - " - -RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ - overlays/at86rf233.dtbo \ - overlays/dwc2.dtbo \ - overlays/gpio-key.dtbo \ - overlays/hifiberry-amp.dtbo \ - overlays/hifiberry-dac.dtbo \ - overlays/hifiberry-dacplus.dtbo \ - overlays/hifiberry-digi.dtbo \ - overlays/i2c-rtc.dtbo \ - overlays/iqaudio-dac.dtbo \ - overlays/iqaudio-dacplus.dtbo \ - overlays/mcp2515-can0.dtbo \ - overlays/pi3-disable-bt.dtbo \ - overlays/pi3-miniuart-bt.dtbo \ - overlays/pitft22.dtbo \ - overlays/pitft28-resistive.dtbo \ - overlays/pitft35-resistive.dtbo \ - overlays/pps-gpio.dtbo \ - overlays/rpi-ft5406.dtbo \ - overlays/rpi-poe.dtbo \ - overlays/vc4-kms-v3d.dtbo \ - overlays/vc4-fkms-v3d.dtbo \ - overlays/w1-gpio-pullup.dtbo \ - overlays/w1-gpio.dtbo \ - " - -RPI_KERNEL_DEVICETREE ?= " \ - bcm2708-rpi-zero-w.dtb \ - bcm2708-rpi-b.dtb \ - bcm2708-rpi-b-plus.dtb \ - bcm2709-rpi-2-b.dtb \ - bcm2710-rpi-3-b.dtb \ - bcm2710-rpi-3-b-plus.dtb \ - bcm2711-rpi-4-b.dtb \ - bcm2708-rpi-cm.dtb \ - bcm2710-rpi-cm3.dtb \ - " - -KERNEL_DEVICETREE ?= " \ - ${RPI_KERNEL_DEVICETREE} \ - ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ - " - -# Different dtb and dtbo files are needed for Raspberry Pi 4 -# (64-bit) if feature agl-sota is enabled. -KERNEL_DEVICETREE_raspberrypi4_sota = " broadcom/bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo" - -# By default: -# -# * When u-boot is disabled use the "Image" format which can be directly loaded -# by the rpi firmware. -# -# * When u-boot is enabled use the "uImage" format and the "bootm" command -# within u-boot to load the kernel. -KERNEL_BOOTCMD ??= "bootm" -KERNEL_IMAGETYPE_UBOOT ??= "uImage" -KERNEL_IMAGETYPE_DIRECT ??= "zImage" -KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ - '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}" - -MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio ${@bb.utils.contains('DISABLE_VC4GRAPHICS', '1', '', 'vc4graphics', d)}" - -# Raspberry Pi has no hardware clock -MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" - -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi" - -# Set Raspberrypi splash image -SPLASH = "psplash-raspberrypi" - -def make_dtb_boot_files(d): - # Generate IMAGE_BOOT_FILES entries for device tree files listed in - # KERNEL_DEVICETREE. - alldtbs = d.getVar('KERNEL_DEVICETREE') - imgtyp = d.getVar('KERNEL_IMAGETYPE') - - def transform(dtb): - base = os.path.basename(dtb) - if dtb.endswith('dtb'): - # eg: whatever/bcm2708-rpi-b.dtb has: - # DEPLOYDIR file: bcm2708-rpi-b.dtb - # destination: bcm2708-rpi-b.dtb - return base - elif dtb.endswith('dtbo'): - # overlay dtb: - # eg: overlays/hifiberry-amp.dtbo has: - # DEPLOYDIR file: hifiberry-amp.dtbo - # destination: overlays/hifiberry-amp.dtbo - return '{};{}'.format(base, dtb) - - return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) - - -IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ - ${@make_dtb_boot_files(d)} \ - ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ - '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ - '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ - " -do_image_wic[depends] += " \ - bcm2835-bootfiles:do_deploy \ - ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ - " - -do_image_wic[recrdeps] = "do_build" - -# The kernel image is installed into the FAT32 boot partition and does not need -# to also be installed into the rootfs. -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" diff --git a/meta-agl/meta-agl-bsp/conf/machine/raspberrypi4.conf b/meta-agl/meta-agl-bsp/conf/machine/raspberrypi4.conf deleted file mode 100644 index a09d881d..00000000 --- a/meta-agl/meta-agl-bsp/conf/machine/raspberrypi4.conf +++ /dev/null @@ -1,37 +0,0 @@ -#@TYPE: Machine -#@NAME: RaspberryPi 4 Development Board (64bit) -#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode - -MACHINEOVERRIDES = "raspberrypi4:${MACHINE}" - -MACHINE_EXTRA_RRECOMMENDS += "\ - linux-firmware-rpidistro-bcm43455 \ - bluez-firmware-rpidistro-bcm4345c0-hcd \ - pi-bluetooth \ -" - -require conf/machine/include/arm/arch-arm64.inc -include conf/machine/include/rpi4-base.inc - -RPI_KERNEL_DEVICETREE = " \ - broadcom/bcm2711-rpi-4-b.dtb \ -" - -SDIMG_KERNELIMAGE ?= "kernel8.img" -SERIAL_CONSOLES ?= "115200;ttyS0" - -MACHINE_FEATURES_append = " vc4graphics" -UBOOT_MACHINE = "rpi_4_config" - -VC4DTBO ?= "vc4-fkms-v3d" - -# When u-boot is enabled we need to use the "Image" format and the "booti" -# command to load the kernel -KERNEL_IMAGETYPE_UBOOT ?= "Image" -# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet -KERNEL_IMAGETYPE_DIRECT ?= "Image" -KERNEL_BOOTCMD ?= "booti" - -RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" - -ARMSTUB ?= "armstub8-gic.bin" |