diff options
Diffstat (limited to 'import-layers/meta-raspberrypi/conf/machine')
9 files changed, 48 insertions, 28 deletions
diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc b/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc index 56ca83e1e..e069e7039 100644 --- a/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -9,34 +9,35 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" XSERVER = " \ xserver-xorg \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-video-fbdev \ + ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xserver-xorg-extension-glx", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \ " -# Really supported starting from linux-raspberrypi 3.18.y only KERNEL_DEVICETREE ?= " \ bcm2708-rpi-b.dtb \ bcm2708-rpi-b-plus.dtb \ bcm2709-rpi-2-b.dtb \ bcm2710-rpi-3-b.dtb \ + bcm2708-rpi-cm.dtb \ + bcm2710-rpi-cm3.dtb \ \ - overlays/hifiberry-amp-overlay.dtb \ - overlays/hifiberry-dac-overlay.dtb \ - overlays/hifiberry-dacplus-overlay.dtb \ - overlays/hifiberry-digi-overlay.dtb \ - overlays/i2c-rtc-overlay.dtb \ - overlays/iqaudio-dac-overlay.dtb \ - overlays/iqaudio-dacplus-overlay.dtb \ - overlays/lirc-rpi-overlay.dtb \ - overlays/pitft22-overlay.dtb \ - overlays/pitft28-resistive-overlay.dtb \ - overlays/pps-gpio-overlay.dtb \ - overlays/rpi-ft5406-overlay.dtb \ - overlays/w1-gpio-overlay.dtb \ - overlays/w1-gpio-pullup-overlay.dtb \ - overlays/pi3-miniuart-bt-overlay.dtb \ + 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/lirc-rpi.dtbo \ + overlays/pitft22.dtbo \ + overlays/pitft28-resistive.dtbo \ + overlays/pps-gpio.dtbo \ + overlays/rpi-ft5406.dtbo \ + overlays/w1-gpio.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/pi3-disable-bt.dtbo \ + overlays/pi3-miniuart-bt.dtbo \ + overlays/vc4-kms-v3d.dtbo \ " KERNEL_IMAGETYPE ?= "Image" @@ -51,3 +52,7 @@ MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" SPLASH = "psplash-raspberrypi" IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* ${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}" + +# The kernel image is installed into the FAT32 boot partition and does not need +# to also be installed into the rootfs. +RDEPENDS_kernel-base = "" diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc index 359870d83..078e9d673 100644 --- a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc +++ b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc @@ -2,8 +2,8 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/egl ?= "userland" -PREFERRED_PROVIDER_virtual/libgles2 ?= "userland" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl" -PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl" +PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" +PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" +PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" +PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_jpeg ?= "jpeg" diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc index c879ddea9..e65a4ae9e 100644 --- a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc +++ b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ?= "4.1.%" +PREFERRED_VERSION_linux-raspberrypi ?= "4.4.%" diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm.conf new file mode 100644 index 000000000..2da7d50b7 --- /dev/null +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm.conf @@ -0,0 +1,6 @@ +#@TYPE: Machine +#@NAME: RaspberryPi Compute Module (CM1) +#@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1) + +MACHINEOVERRIDES = "raspberrypi:${MACHINE}" +include conf/machine/raspberrypi.conf diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf new file mode 100644 index 000000000..153d5d5bb --- /dev/null +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf @@ -0,0 +1,6 @@ +#@TYPE: Machine +#@NAME: RaspberryPi Compute Module 3 (CM3) +#@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3) + +MACHINEOVERRIDES = "raspberrypi2:${MACHINE}" +include conf/machine/raspberrypi2.conf diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf index 72beeb881..ad3b06126 100644 --- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf @@ -10,3 +10,4 @@ include conf/machine/include/rpi-base.inc SERIAL_CONSOLE = "115200 ttyAMA0" UBOOT_MACHINE = "rpi_config" +VC4_CMA_SIZE_raspberrypi ?= "cma-64" diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi0.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi0.conf index ccf9ae7b9..7c2b81193 100644 --- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi0.conf +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi0.conf @@ -6,3 +6,4 @@ MACHINEOVERRIDES = "raspberrypi:${MACHINE}" include conf/machine/raspberrypi.conf SERIAL_CONSOLE = "115200 ttyAMA0" +VC4_CMA_SIZE ?= "cma-128" diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi2.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi2.conf index d50ef700d..9b4c02a19 100644 --- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi2.conf +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi2.conf @@ -10,3 +10,4 @@ include conf/machine/include/rpi-base.inc SERIAL_CONSOLE = "115200 ttyAMA0" UBOOT_MACHINE = "rpi_2_config" +VC4_CMA_SIZE ?= "cma-256" diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf index cb6056eb8..1ac592811 100644 --- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf @@ -3,9 +3,9 @@ #@DESCRIPTION: Machine configuration for the RaspberryPi 3 MACHINEOVERRIDES = "raspberrypi2:${MACHINE}" - -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-brcm43430" - include conf/machine/raspberrypi2.conf +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" + SERIAL_CONSOLE = "115200 ttyS0" +VC4_CMA_SIZE ?= "cma-256" |
