Add raspberrypi3-64.conf
PATCH v4 1/14 Add raspberrypi3-64.conf
From: Herve Jourdain <[email protected]>
--- conf/machine/raspberrypi3-64.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 conf/machine/raspberrypi3-64.conf
conf/machine/raspberrypi3-64.conf new file +15 -0
@@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: RaspberryPi 3 Development Board +#@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode + +MACHINEOVERRIDES = "raspberrypi3:raspberrypi:${MACHINE}" + +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" + +require conf/machine/include/arm/arch-armv8.inc +include conf/machine/include/rpi-base.inc + +SERIAL_CONSOLE = "115200 ttyS0" +VC4_CMA_SIZE ?= "cma-256" + +UBOOT_MACHINE = "rpi_3_config"
Signature · 1 line
2.11.1
PATCH v4 2/14 rpi-default-providers: Let mesa provide libgbm
--- conf/machine/include/rpi-default-providers.inc | 1 + 1 file changed, 1 insertion(+)
conf/machine/include/rpi-default-providers.inc +1 -0
@@ -6,4 +6,5 @@ PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4 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_libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_jpeg ?= "jpeg"
Signature · 1 line
2.11.1
PATCH v4 3/14 raspberrypi3-64.conf: Use 4.9 as default kernel
In reply to Khem Raj--- conf/machine/raspberrypi3-64.conf | 2 ++ 1 file changed, 2 insertions(+)
conf/machine/raspberrypi3-64.conf +2 -0
@@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0" VC4_CMA_SIZE ?= "cma-256" UBOOT_MACHINE = "rpi_3_config" + +PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
Signature · 1 line
2.11.1
PATCH v4 4/14 linux-raspberrypi_dev.bb: Add recipe for tracking development tip
In reply to Khem Raj--- recipes-kernel/linux/linux-raspberrypi_dev.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes-kernel/linux/linux-raspberrypi_dev.bb
recipes-kernel/linux/linux-raspberrypi_dev.bb new file +8 -0
@@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" + +LINUX_VERSION ?= "4.10.0-rc8" + +SRCREV = "9aa91f43583fdb07306f962e6ee6797fba1cc62d" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.10.y \ +" +require linux-raspberrypi.inc
Signature · 1 line
2.11.1
PATCH v4 5/14 linux-raspberrypi_4.9.bb: Upgrade to 4.9.10
In reply to Khem RajFix dtbo builds for arm64
--- ...-Add-rules-for-.dtbo-files-for-dts-overla.patch | 29 ++++++++++++++++++++++ recipes-kernel/linux/linux-raspberrypi_4.9.bb | 5 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.9/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch
recipes-kernel/linux/linux-raspberrypi-4.9/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 922ce1fd0eb810b713f6ffa9a7ab97c11b6e38cf Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 Feb 2017 17:57:08 -0800 +Subject: [PATCH] build/arm64: Add rules for .dtbo files for dts overlays + +We now create overlays as .dtbo files. + +Signed-off-by: Khem Raj <[email protected]> +--- + arch/arm64/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile +index 3635b8662724..822fefeb1cd0 100644 +--- a/arch/arm64/Makefile ++++ b/arch/arm64/Makefile +@@ -113,6 +113,9 @@ zinstall install: + %.dtb: scripts + $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ + ++%.dtbo: | scripts ++ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ ++ + PHONY += dtbs dtbs_install + + dtbs: prepare scripts +-- +2.11.1 +
recipes-kernel/linux/linux-raspberrypi_4.9.bb +3 -2
@@ -1,8 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -LINUX_VERSION ?= "4.9.4" +LINUX_VERSION ?= "4.9.10" -SRCREV = "8b0be887f834e7eccf0de3edf630003880779a5f" +SRCREV = "095c4480e1f623bdc8a221a171ef13b2223706b1" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.9.y \ + file://0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch \ " require linux-raspberrypi.inc
Signature · 1 line
2.11.1
PATCH v4 6/14 userland: Upgrade to latest and implement triple buffering for wayland
In reply to Khem Raj--- ...13-Implement-triple-buffering-for-wayland.patch | 85 ++++++++++++++++++++++ recipes-graphics/userland/userland_git.bb | 3 +- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch
recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch new file +85 -0
@@ -0,0 +1,85 @@ +From 81f421b051c726bbe180ee5f7d93cf13a3935904 Mon Sep 17 00:00:00 2001 +From: Jeff Wannamaker <[email protected]> +Date: Thu, 19 Jan 2017 18:56:07 +0000 +Subject: [PATCH 13/13] Implement triple buffering for wayland + +Change from double to triple buffering for wayland. This enables higher frame rates without tearing artifacts by allowing both the glFinish and the buffer release interlock to operate without pushing the frame period to two vertical intervals + +Signed-off-by: Jeff Wannamaker <[email protected]> +--- + interface/khronos/egl/egl_client.c | 3 ++- + interface/khronos/egl/egl_client_surface.c | 8 ++++++++ + interface/khronos/egl/egl_client_surface.h | 11 +++++++++++ + 3 files changed, 21 insertions(+), 1 deletion(-) + +diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c +index 13a110c..0380274 100644 +--- a/interface/khronos/egl/egl_client.c ++++ b/interface/khronos/egl/egl_client.c +@@ -2323,7 +2323,8 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf) + + buffer_temp = surface->front_wl_buffer; + surface->front_wl_buffer = surface->back_wl_buffer; +- surface->back_wl_buffer = buffer_temp; ++ surface->back_wl_buffer = surface->middle_wl_buffer; ++ surface->middle_wl_buffer = buffer_temp; + + configid = egl_config_to_id(surface->config); + color = egl_config_get_color_format(configid); +diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c +index 9a9582c..10b3b04 100644 +--- a/interface/khronos/egl/egl_client_surface.c ++++ b/interface/khronos/egl/egl_client_surface.c +@@ -402,12 +402,14 @@ EGL_SURFACE_T *egl_surface_create( + if (type == WINDOW && wl_display) { + surface->wl_egl_window = (struct wl_egl_window*)win; + surface->front_wl_buffer = NULL; ++ surface->middle_wl_buffer = NULL; + surface->back_wl_buffer = allocate_wl_buffer( + surface->wl_egl_window, color); + resource = surface->back_wl_buffer->resource; + } else { + surface->wl_egl_window = NULL; + surface->front_wl_buffer = NULL; ++ surface->middle_wl_buffer = NULL; + surface->back_wl_buffer = NULL; + resource = DISPMANX_NO_HANDLE; + } +@@ -696,6 +698,12 @@ void egl_surface_free(EGL_SURFACE_T *surface) + surface->back_wl_buffer = 0; + } + ++ if (surface->middle_wl_buffer) { ++ wl_buffer_destroy(surface->middle_wl_buffer->wl_buffer); ++ free(surface->middle_wl_buffer); ++ surface->middle_wl_buffer = 0; ++ } ++ + if (surface->front_wl_buffer) { + wl_buffer_destroy(surface->front_wl_buffer->wl_buffer); + free(surface->front_wl_buffer); +diff --git a/interface/khronos/egl/egl_client_surface.h b/interface/khronos/egl/egl_client_surface.h +index e328b77..58a3184 100644 +--- a/interface/khronos/egl/egl_client_surface.h ++++ b/interface/khronos/egl/egl_client_surface.h +@@ -313,6 +313,17 @@ typedef struct { + struct wl_dispmanx_client_buffer *front_wl_buffer; + + /* ++ middle_wl_buffer ++ ++ Validity: ++ type == WINDOW ++ ++ Invariant: ++ client-side information about the wl_buffer in the middle ++ */ ++ struct wl_dispmanx_client_buffer *middle_wl_buffer; ++ ++ /* + back_wl_buffer + + Validity: +-- +2.7.1 +
recipes-graphics/userland/userland_git.bb +2 -1
@@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "raspberrypi" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "bb15afe33b313fe045d52277a78653d288e04f67" +SRCREV = "338428cf852c658e39987c06b845cb6332394109" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
@@ -32,6 +32,7 @@ SRC_URI = "\ file://0010-Fix-for-framerate-with-nested-composition.patch \ file://0011-build-shared-library-for-vchostif.patch \ file://0012-implement-buffer-wrapping-interface-for-dispmanx.patch \ + file://0013-Implement-triple-buffering-for-wayland.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.11.1
PATCH v4 7/14 firmware: Update to 20161215 release
In reply to Khem Raj--- recipes-bsp/common/firmware.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-bsp/common/firmware.inc +3 -3
@@ -1,10 +1,10 @@ -RPIFW_DATE ?= "20161125" +RPIFW_DATE ?= "20161215" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/1.${RPIFW_DATE}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-1.${RPIFW_DATE}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[md5sum] = "a9281d2869e2d7673a83d41bacfa66c2" -SRC_URI[sha256sum] = "744e050630621c70991c91e0ee8663dc2f579e743583ca762b13b00bc75859bc" +SRC_URI[md5sum] = "ddd7645988360d7ef267b48c32293ad7" +SRC_URI[sha256sum] = "bda18f2affb50053940fd88c3f3bec5af9a4b4ced753d01107a2b106cfb02d13" PV = "${RPIFW_DATE}"
Signature · 1 line
2.11.1
PATCH v4 8/14 linux-raspberrypi: Add defconfig for raspberrypi3-64
In reply to Khem Raj--- recipes-kernel/linux/linux-raspberrypi.inc | 1 + 1 file changed, 1 insertion(+)
recipes-kernel/linux/linux-raspberrypi.inc +1 -0
@@ -18,6 +18,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}" # NOTE: For now we pull in the default config from the RPi kernel GIT tree. KERNEL_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig" KERNEL_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig" +KERNEL_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" # CMDLINE for raspberrypi CMDLINE = "dwc_otg.lpm_enable=0 console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
Signature · 1 line
2.11.1
PATCH v4 9/14 raspberrypi3-64.conf: Specifiy rpi3-64bit dtbs
In reply to Khem Raj--- conf/machine/raspberrypi3-64.conf | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
conf/machine/raspberrypi3-64.conf +23 -0
@@ -9,6 +9,29 @@ MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" require conf/machine/include/arm/arch-armv8.inc include conf/machine/include/rpi-base.inc +KERNEL_DEVICETREE = " \ + broadcom/bcm2710-rpi-3-b.dtb \ + broadcom/bcm2837-rpi-3-b.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 \ + " + SERIAL_CONSOLE = "115200 ttyS0" VC4_CMA_SIZE ?= "cma-256"
Signature · 1 line
2.11.1
PATCH v4 10/14 sdcard: Use kernel8.img for 64bit kernel image name
In reply to Khem RajThis helps the firmware to identify the kernel as 64bit image
--- classes/sdcard_image-rpi.bbclass | 1 + 1 file changed, 1 insertion(+)
classes/sdcard_image-rpi.bbclass +1 -0
@@ -35,6 +35,7 @@ KERNEL_INITRAMFS ?= "" # Kernel image name SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img" SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img" +SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" # Boot partition volume id BOOTDD_VOLUME_ID ?= "${MACHINE}"
Signature · 1 line
2.11.1
PATCH v4 11/14 rpi-config: Specify bcm2710-rpi-3-b dtb for 64bit rpi3
In reply to Khem RajLet config.txt explicitly specify it
--- recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++ 1 file changed, 6 insertions(+)
recipes-bsp/bootfiles/rpi-config_git.bb +6 -0
@@ -112,6 +112,12 @@ do_deploy() { fi } +do_deploy_append_raspberrypi3-64() { + # Device Tree support + echo "# Load correct Device Tree for Aarch64" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt + echo "device_tree=bcm2710-rpi-3-b.dtb" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt +} + addtask deploy before do_package after do_install do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
Signature · 1 line
2.11.1
PATCH v4 12/14 rpi-default-versions.inc: Use fallback weak assignment
In reply to Khem RajThis lets machines use ?= to choose their preferred kernel e.g. 64bit rpi3 needs 4.9 minimum but default right now is 4.4
At the same time it keeps the option for user to override any of these settings via config metadata e.g. local.conf
--- conf/machine/include/rpi-default-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
conf/machine/include/rpi-default-versions.inc +1 -1
@@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ?= "4.4.%" +PREFERRED_VERSION_linux-raspberrypi ??= "4.4.%"
Signature · 1 line
2.11.1
PATCH v4 13/14 raspberrypi3-64.conf: Add vc4graphics to MACHINE_FEATURES
In reply to Khem RajUserland wont work in 64bit mode
--- conf/machine/raspberrypi3-64.conf | 1 + 1 file changed, 1 insertion(+)
conf/machine/raspberrypi3-64.conf +1 -0
@@ -36,5 +36,6 @@ SERIAL_CONSOLE = "115200 ttyS0" VC4_CMA_SIZE ?= "cma-256" UBOOT_MACHINE = "rpi_3_config" +MACHINE_FEATURES_append = " vc4graphics" PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
Signature · 1 line
2.11.1
PATCH v4 14/14 linux-raspberrypi_dev: Fix build on rpi3 64bit
In reply to Khem Raj--- recipes-kernel/linux/linux-raspberrypi_dev.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-kernel/linux/linux-raspberrypi_dev.bb +2 -1
@@ -1,8 +1,9 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.9:" LINUX_VERSION ?= "4.10.0-rc8" SRCREV = "9aa91f43583fdb07306f962e6ee6797fba1cc62d" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.10.y \ + file://0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch \ " require linux-raspberrypi.inc
Signature · 1 line
2.11.1
Quoted 33 lines · Khem Raj
From: Herve Jourdain <[email protected]>
Signed-off-by Herve Jourdain <[email protected]>Signed-off-by Khem Raj <[email protected]>--- conf/machine/raspberrypi3-64.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 conf/machine/raspberrypi3-64.confconf/machine/raspberrypi3-64.conf new file +15
-1@@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: RaspberryPi 3 Development Board +#@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode + +MACHINEOVERRIDES = "raspberrypi3:raspberrypi:${MACHINE}" + +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" + +require conf/machine/include/arm/arch-armv8.inc +include conf/machine/include/rpi-base.inc + +SERIAL_CONSOLE = "115200 ttyS0" +VC4_CMA_SIZE ?= "cma-256" + +UBOOT_MACHINE = "rpi_3_config" --2.11.1
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
The entire patch set was merged to master. Thanks.
--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan
Quoted 34 lines · Andrei Gherzan
Quoted 33 lines · Khem Raj
From: Herve Jourdain <[email protected]>
Signed-off-by Herve Jourdain <[email protected]>Signed-off-by Khem Raj <[email protected]>--- conf/machine/raspberrypi3-64.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 conf/machine/raspberrypi3-64.confconf/machine/raspberrypi3-64.conf new file +15
-1@@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: RaspberryPi 3 Development Board +#@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode + +MACHINEOVERRIDES = "raspberrypi3:raspberrypi:${MACHINE}" + +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" + +require conf/machine/include/arm/arch-armv8.inc +include conf/machine/include/rpi-base.inc + +SERIAL_CONSOLE = "115200 ttyS0" +VC4_CMA_SIZE ?= "cma-256" + +UBOOT_MACHINE = "rpi_3_config" --2.11.1
Quoted 7 lines
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yoctoThe entire patch set was merged to master. Thanks.
Cheers!