diff options
Diffstat (limited to 'meta-unit-distro')
7 files changed, 30 insertions, 1 deletions
diff --git a/meta-unit-distro/conf/distro/include/graphics.inc b/meta-unit-distro/conf/distro/include/graphics.inc index f141001..bb97933 100644 --- a/meta-unit-distro/conf/distro/include/graphics.inc +++ b/meta-unit-distro/conf/distro/include/graphics.inc @@ -4,3 +4,5 @@ DISTRO_FEATURES:remove = "x11" DISTRO_FEATURES:append = " wayland" DISTRO_FEATURES:append = " pam" DISTRO_FEATURES:append = " opengl" + +PREFERRED_PROVIDER_virtual/psplash ?= "plymouth" diff --git a/meta-unit-distro/conf/distro/include/initramfs.inc b/meta-unit-distro/conf/distro/include/initramfs.inc new file mode 100644 index 0000000..f16195c --- /dev/null +++ b/meta-unit-distro/conf/distro/include/initramfs.inc @@ -0,0 +1,2 @@ +INITRAMFS_IMAGE_BUNDLE = "1" +INITRAMFS_IMAGE = "core-image-unit-initramfs" diff --git a/meta-unit-distro/conf/distro/include/rpi-extra-image-boot-files-initramfs.conf b/meta-unit-distro/conf/distro/include/rpi-extra-image-boot-files-initramfs.conf new file mode 100644 index 0000000..0715f4b --- /dev/null +++ b/meta-unit-distro/conf/distro/include/rpi-extra-image-boot-files-initramfs.conf @@ -0,0 +1,12 @@ +# Similar to what is found in meta-raspberrypi/conf/machine/include/rpi-base.inc, +# but will use kernel image with bundled initramfs if appropriate variables set +RPI_EXTRA_IMAGE_BOOT_FILES = " \ + ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ + '%s;Image u-boot.bin;%s boot.scr' % \ + (('${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin' if (d.getVar('INITRAMFS_IMAGE') and d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1') else '${KERNEL_IMAGETYPE}'), \ + '${SDIMG_KERNELIMAGE}'), \ + '%s;%s' % \ + (('${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin' if (d.getVar('INITRAMFS_IMAGE') and d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1') else '${KERNEL_IMAGETYPE}'), \ + '${SDIMG_KERNELIMAGE}'), \ + d)} \ +" diff --git a/meta-unit-distro/conf/distro/include/rpi-graphics.conf b/meta-unit-distro/conf/distro/include/rpi-graphics.conf new file mode 100644 index 0000000..5c3dbe2 --- /dev/null +++ b/meta-unit-distro/conf/distro/include/rpi-graphics.conf @@ -0,0 +1,9 @@ +# Use full (not fake) KMS with raspberrypi3 +VC4DTBO:raspberrypi3-64 = "vc4-kms-v3d" + +# Since using full KMS with raspberrypi3, need special overlay +# for the official DSI 7" touchscreen that is KMS compatible +RPI_EXTRA_CONFIG:append:raspberrypi3-64 = "\ndtoverlay=vc4-kms-dsi-7inch" + +# Reserve some extra GPU memory +RPI_EXTRA_CONFIG:append:raspberrypi3-64 = "\ngpu_mem=128" diff --git a/meta-unit-distro/conf/distro/include/rpi.inc b/meta-unit-distro/conf/distro/include/rpi.inc new file mode 100644 index 0000000..9495241 --- /dev/null +++ b/meta-unit-distro/conf/distro/include/rpi.inc @@ -0,0 +1,2 @@ +require conf/distro/include/rpi-extra-image-boot-files-initramfs.conf +require conf/distro/include/rpi-graphics.conf diff --git a/meta-unit-distro/conf/distro/unit-poky.conf b/meta-unit-distro/conf/distro/unit-poky.conf index ac4f8a0..1dfa6e0 100644 --- a/meta-unit-distro/conf/distro/unit-poky.conf +++ b/meta-unit-distro/conf/distro/unit-poky.conf @@ -3,6 +3,8 @@ require conf/distro/include/systemd.inc require conf/distro/include/containers.inc require conf/distro/include/graphics.inc require conf/distro/include/wic.inc +require conf/distro/include/initramfs.inc +require conf/distro/include/rpi.inc DISTRO = "unit-poky" DISTRO_NAME = "Unit Poky" diff --git a/meta-unit-distro/conf/layer.conf b/meta-unit-distro/conf/layer.conf index 84a5773..6019555 100644 --- a/meta-unit-distro/conf/layer.conf +++ b/meta-unit-distro/conf/layer.conf @@ -4,7 +4,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "unit-distro" BBFILE_PATTERN_unit-distro := "^${LAYERDIR}/" -BBFILE_PRIORITY_unit-distro = "9" +BBFILE_PRIORITY_unit-distro = "10" LAYERDEPENDS_unit-distro = "core yocto virtualization-layer" |