[meta-raspberrypi][PATCH V2 01/11] Add raspberrypi3-64.conf

[meta-raspberrypi][PATCH V2 01/11] Add raspberrypi3-64.conf

[Khem Raj]

From: Herve Jourdain <herve.jourdain@neuf.fr>

Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/machine/raspberrypi3-64.conf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 conf/machine/raspberrypi3-64.conf

diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
new file mode 100644
index 0000000..5598e50
--- /dev/null
+++ b/conf/machine/raspberrypi3-64.conf
@@ -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

[meta-raspberrypi][PATCH V2 02/11] rpi-default-providers: Let mesa provide libgbm

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/machine/include/rpi-default-providers.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc
index 078e9d6..5b2658b 100644
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -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"
-- 
2.11.1

[meta-raspberrypi][PATCH V2 03/11] raspberrypi3-64.conf: Use 4.9 as default kernel

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/machine/raspberrypi3-64.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
index 5598e50..cdcd726 100644
--- a/conf/machine/raspberrypi3-64.conf
+++ b/conf/machine/raspberrypi3-64.conf
@@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 VC4_CMA_SIZE ?= "cma-256"
 
 UBOOT_MACHINE = "rpi_3_config"
+
+PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
-- 
2.11.1

Re: [meta-raspberrypi][PATCH V2 03/11] raspberrypi3-64.conf: Use 4.9 as default kernel

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 982 bytes --]

On Sat, Feb 11, 2017 at 09:26:47PM -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  conf/machine/raspberrypi3-64.conf | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
> index 5598e50..cdcd726 100644
> --- a/conf/machine/raspberrypi3-64.conf
> +++ b/conf/machine/raspberrypi3-64.conf
> @@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
>  VC4_CMA_SIZE ?= "cma-256"
>
>  UBOOT_MACHINE = "rpi_3_config"
> +
> +PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"

This doesn't really work as rpi-default-versions.inc already sets the
version and this will not overwrite. Maybe have this before including
rpi-base.inc?

> --
> 2.11.1
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 849 bytes --]

Re: [meta-raspberrypi][PATCH V2 03/11] raspberrypi3-64.conf: Use 4.9 as default kernel

[Khem Raj]

On Wed, Feb 15, 2017 at 6:09 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> On Sat, Feb 11, 2017 at 09:26:47PM -0800, Khem Raj wrote:
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  conf/machine/raspberrypi3-64.conf | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
>> index 5598e50..cdcd726 100644
>> --- a/conf/machine/raspberrypi3-64.conf
>> +++ b/conf/machine/raspberrypi3-64.conf
>> @@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
>>  VC4_CMA_SIZE ?= "cma-256"
>>
>>  UBOOT_MACHINE = "rpi_3_config"
>> +
>> +PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
>
> This doesn't really work as rpi-default-versions.inc already sets the
> version and this will not overwrite. Maybe have this before including
> rpi-base.inc?

actually I realized that I set the PREFERRED_VERSION_linux-raspberrypi
in my local.conf and that overrides all. I will send a followup for
this.

>
>> --
>> 2.11.1
>>
>> --
>> _______________________________________________
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>
> --
> Andrei Gherzan
> gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan

Re: [meta-raspberrypi][PATCH V2 03/11] raspberrypi3-64.conf: Use 4.9 as default kernel

[Khem Raj]

On Wed, Feb 15, 2017 at 6:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Wed, Feb 15, 2017 at 6:09 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
>> On Sat, Feb 11, 2017 at 09:26:47PM -0800, Khem Raj wrote:
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> ---
>>>  conf/machine/raspberrypi3-64.conf | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
>>> index 5598e50..cdcd726 100644
>>> --- a/conf/machine/raspberrypi3-64.conf
>>> +++ b/conf/machine/raspberrypi3-64.conf
>>> @@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
>>>  VC4_CMA_SIZE ?= "cma-256"
>>>
>>>  UBOOT_MACHINE = "rpi_3_config"
>>> +
>>> +PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
>>
>> This doesn't really work as rpi-default-versions.inc already sets the
>> version and this will not overwrite. Maybe have this before including
>> rpi-base.inc?
>
> actually I realized that I set the PREFERRED_VERSION_linux-raspberrypi
> in my local.conf and that overrides all. I will send a followup for
> this.
>

just sent a series of 3 patches which should take care of this problem
please apply it on top of this series.

Re: [meta-raspberrypi][PATCH V2 03/11] raspberrypi3-64.conf: Use 4.9 as default kernel

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]

On Wed, Feb 15, 2017 at 06:47:17PM -0800, Khem Raj wrote:
> On Wed, Feb 15, 2017 at 6:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > On Wed, Feb 15, 2017 at 6:09 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> >> On Sat, Feb 11, 2017 at 09:26:47PM -0800, Khem Raj wrote:
> >>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ---
> >>>  conf/machine/raspberrypi3-64.conf | 2 ++
> >>>  1 file changed, 2 insertions(+)
> >>>
> >>> diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
> >>> index 5598e50..cdcd726 100644
> >>> --- a/conf/machine/raspberrypi3-64.conf
> >>> +++ b/conf/machine/raspberrypi3-64.conf
> >>> @@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
> >>>  VC4_CMA_SIZE ?= "cma-256"
> >>>
> >>>  UBOOT_MACHINE = "rpi_3_config"
> >>> +
> >>> +PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
> >>
> >> This doesn't really work as rpi-default-versions.inc already sets the
> >> version and this will not overwrite. Maybe have this before including
> >> rpi-base.inc?
> >
> > actually I realized that I set the PREFERRED_VERSION_linux-raspberrypi
> > in my local.conf and that overrides all. I will send a followup for
> > this.
> >
>
> just sent a series of 3 patches which should take care of this problem
> please apply it on top of this series.

As well omxplayer compilation fails on this machine:

| ERROR: oe_runmake failed
| aarch64-poky-linux-gcc is unable to create an executable file.
| C compiler test failed.

Can you take a look on this?

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 849 bytes --]

Re: [meta-raspberrypi][PATCH V2 03/11] raspberrypi3-64.conf: Use 4.9 as default kernel

[Khem Raj]

On Wed, Feb 15, 2017 at 10:01 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> On Wed, Feb 15, 2017 at 06:47:17PM -0800, Khem Raj wrote:
>> On Wed, Feb 15, 2017 at 6:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> > On Wed, Feb 15, 2017 at 6:09 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
>> >> On Sat, Feb 11, 2017 at 09:26:47PM -0800, Khem Raj wrote:
>> >>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> >>> ---
>> >>>  conf/machine/raspberrypi3-64.conf | 2 ++
>> >>>  1 file changed, 2 insertions(+)
>> >>>
>> >>> diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
>> >>> index 5598e50..cdcd726 100644
>> >>> --- a/conf/machine/raspberrypi3-64.conf
>> >>> +++ b/conf/machine/raspberrypi3-64.conf
>> >>> @@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
>> >>>  VC4_CMA_SIZE ?= "cma-256"
>> >>>
>> >>>  UBOOT_MACHINE = "rpi_3_config"
>> >>> +
>> >>> +PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
>> >>
>> >> This doesn't really work as rpi-default-versions.inc already sets the
>> >> version and this will not overwrite. Maybe have this before including
>> >> rpi-base.inc?
>> >
>> > actually I realized that I set the PREFERRED_VERSION_linux-raspberrypi
>> > in my local.conf and that overrides all. I will send a followup for
>> > this.
>> >
>>
>> just sent a series of 3 patches which should take care of this problem
>> please apply it on top of this series.
>
> As well omxplayer compilation fails on this machine:
>
> | ERROR: oe_runmake failed
> | aarch64-poky-linux-gcc is unable to create an executable file.
> | C compiler test failed.
>
> Can you take a look on this?

sure, as I said so far I have booted rpi-hwup-image and
core-image-weston builds and boots into console, no graphics yet. so
not all packages may yet build but we have a start.

Re: [meta-raspberrypi][PATCH V2 03/11] raspberrypi3-64.conf: Use 4.9 as default kernel

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 2093 bytes --]

On Thu, Feb 16, 2017 at 06:52:23AM -0800, Khem Raj wrote:
> On Wed, Feb 15, 2017 at 10:01 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> > On Wed, Feb 15, 2017 at 06:47:17PM -0800, Khem Raj wrote:
> >> On Wed, Feb 15, 2017 at 6:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> >> > On Wed, Feb 15, 2017 at 6:09 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> >> >> On Sat, Feb 11, 2017 at 09:26:47PM -0800, Khem Raj wrote:
> >> >>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> >>> ---
> >> >>>  conf/machine/raspberrypi3-64.conf | 2 ++
> >> >>>  1 file changed, 2 insertions(+)
> >> >>>
> >> >>> diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
> >> >>> index 5598e50..cdcd726 100644
> >> >>> --- a/conf/machine/raspberrypi3-64.conf
> >> >>> +++ b/conf/machine/raspberrypi3-64.conf
> >> >>> @@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
> >> >>>  VC4_CMA_SIZE ?= "cma-256"
> >> >>>
> >> >>>  UBOOT_MACHINE = "rpi_3_config"
> >> >>> +
> >> >>> +PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
> >> >>
> >> >> This doesn't really work as rpi-default-versions.inc already sets the
> >> >> version and this will not overwrite. Maybe have this before including
> >> >> rpi-base.inc?
> >> >
> >> > actually I realized that I set the PREFERRED_VERSION_linux-raspberrypi
> >> > in my local.conf and that overrides all. I will send a followup for
> >> > this.
> >> >
> >>
> >> just sent a series of 3 patches which should take care of this problem
> >> please apply it on top of this series.
> >
> > As well omxplayer compilation fails on this machine:
> >
> > | ERROR: oe_runmake failed
> > | aarch64-poky-linux-gcc is unable to create an executable file.
> > | C compiler test failed.
> >
> > Can you take a look on this?
>
> sure, as I said so far I have booted rpi-hwup-image and
> core-image-weston builds and boots into console, no graphics yet. so
> not all packages may yet build but we have a start.

Uh OK. I haven't caught this detail.

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 849 bytes --]

Re: [meta-raspberrypi][PATCH V2 03/11] raspberrypi3-64.conf: Use 4.9 as default kernel

[Khem Raj]

On 2/16/17 11:54 AM, Andrei Gherzan wrote:
> On Thu, Feb 16, 2017 at 06:52:23AM -0800, Khem Raj wrote:
>> On Wed, Feb 15, 2017 at 10:01 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
>>> On Wed, Feb 15, 2017 at 06:47:17PM -0800, Khem Raj wrote:
>>>> On Wed, Feb 15, 2017 at 6:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>>>> On Wed, Feb 15, 2017 at 6:09 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
>>>>>> On Sat, Feb 11, 2017 at 09:26:47PM -0800, Khem Raj wrote:
>>>>>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>>>>>> ---
>>>>>>>  conf/machine/raspberrypi3-64.conf | 2 ++
>>>>>>>  1 file changed, 2 insertions(+)
>>>>>>>
>>>>>>> diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
>>>>>>> index 5598e50..cdcd726 100644
>>>>>>> --- a/conf/machine/raspberrypi3-64.conf
>>>>>>> +++ b/conf/machine/raspberrypi3-64.conf
>>>>>>> @@ -13,3 +13,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
>>>>>>>  VC4_CMA_SIZE ?= "cma-256"
>>>>>>>
>>>>>>>  UBOOT_MACHINE = "rpi_3_config"
>>>>>>> +
>>>>>>> +PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
>>>>>>
>>>>>> This doesn't really work as rpi-default-versions.inc already sets the
>>>>>> version and this will not overwrite. Maybe have this before including
>>>>>> rpi-base.inc?
>>>>>
>>>>> actually I realized that I set the PREFERRED_VERSION_linux-raspberrypi
>>>>> in my local.conf and that overrides all. I will send a followup for
>>>>> this.
>>>>>
>>>>
>>>> just sent a series of 3 patches which should take care of this problem
>>>> please apply it on top of this series.
>>>
>>> As well omxplayer compilation fails on this machine:
>>>
>>> | ERROR: oe_runmake failed
>>> | aarch64-poky-linux-gcc is unable to create an executable file.
>>> | C compiler test failed.
>>>
>>> Can you take a look on this?
>>
>> sure, as I said so far I have booted rpi-hwup-image and
>> core-image-weston builds and boots into console, no graphics yet. so
>> not all packages may yet build but we have a start.
> 
> Uh OK. I haven't caught this detail.

Looking further omxplayer has tight deps into openmax/mmal APIs from
firmware package which is not working on aarch64 yet. For now I think
we can skip it for aarch64

> 
> --
> Andrei Gherzan
> gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan
> 

[meta-raspberrypi][PATCH V2 04/11] linux-raspberrypi_dev.bb: Add recipe for tracking development tip

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-kernel/linux/linux-raspberrypi_dev.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_dev.bb

diff --git a/recipes-kernel/linux/linux-raspberrypi_dev.bb b/recipes-kernel/linux/linux-raspberrypi_dev.bb
new file mode 100644
index 0000000..9440d80
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_dev.bb
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
+LINUX_VERSION ?= "4.9.0-rc7"
+
+SRCREV = "10da0c942de1830b48dfbfb5d68ec00af7ca7c43"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.9.y \
+"
+require linux-raspberrypi.inc
-- 
2.11.1

[meta-raspberrypi][PATCH V2 05/11] linux-raspberrypi_4.9.bb: Upgrade to 4.9.9

[Khem Raj]

Fix dtbo builds for arm64

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-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

diff --git a/recipes-kernel/linux/linux-raspberrypi-4.9/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch b/recipes-kernel/linux/linux-raspberrypi-4.9/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch
new file mode 100644
index 0000000..e8bc52e
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-4.9/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch
@@ -0,0 +1,29 @@
+From 922ce1fd0eb810b713f6ffa9a7ab97c11b6e38cf Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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
+
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.9.bb b/recipes-kernel/linux/linux-raspberrypi_4.9.bb
index cffea1a..d414100 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.9.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.9.bb
@@ -1,8 +1,9 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-LINUX_VERSION ?= "4.9.4"
+LINUX_VERSION ?= "4.9.9"
 
-SRCREV = "8b0be887f834e7eccf0de3edf630003880779a5f"
+SRCREV = "bc589fd786cec5bda91c32c683f1c3aeca9c0560"
 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
-- 
2.11.1

[meta-raspberrypi][PATCH V2 06/11] userland: Upgrade to latest and implement triple buffering for wayland

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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

diff --git a/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch b/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch
new file mode 100644
index 0000000..8703296
--- /dev/null
+++ b/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch
@@ -0,0 +1,85 @@
+From 81f421b051c726bbe180ee5f7d93cf13a3935904 Mon Sep 17 00:00:00 2001
+From: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com>
+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 <jeff_wannamaker@cable.comcast.com>
+---
+ 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
+
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index a37249c..5344dc3 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -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"
 
-- 
2.11.1

[meta-raspberrypi][PATCH V2 07/11] firmware: Update to 20161215 release

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-bsp/common/firmware.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/common/firmware.inc b/recipes-bsp/common/firmware.inc
index 1961b48..8aea628 100644
--- a/recipes-bsp/common/firmware.inc
+++ b/recipes-bsp/common/firmware.inc
@@ -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}"
 
-- 
2.11.1

[meta-raspberrypi][PATCH V2 08/11] linux-raspberrypi: Add defconfig for raspberrypi3-64

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-kernel/linux/linux-raspberrypi.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 19ebefb..cf61cce 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -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"
-- 
2.11.1

[meta-raspberrypi][PATCH V2 09/11] raspberrypi3-64.conf: Specifiy rpi3-64bit dtbs

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/machine/raspberrypi3-64.conf | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
index cdcd726..e7d9af2 100644
--- a/conf/machine/raspberrypi3-64.conf
+++ b/conf/machine/raspberrypi3-64.conf
@@ -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"
 
-- 
2.11.1

[meta-raspberrypi][PATCH V2 10/11] sdcard: Use kernel8.img for 64bit kernel image name

[Khem Raj]

This helps the firmware to identify the kernel as 64bit
image

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 classes/sdcard_image-rpi.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 116d5e8..79ab53a 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -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}"
-- 
2.11.1

[meta-raspberrypi][PATCH V2 11/11] rpi-config: Specify bcm2710-rpi-3-b dtb for 64bit rpi3

[Khem Raj]

Let config.txt explicitly specify it

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index f610718..20ec343 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -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"
 
-- 
2.11.1