[meta-raspberrypi][morty][PATCH 0/8] Stable branch backports

[meta-raspberrypi][morty][PATCH 0/8] Stable branch backports

[Paul Barker]

* Upgrade linux-raspberrypi 4.9 recipe

* Add support for raspberrypi3-64 MACHINE

Boot tested on raspberrypi, raspberrypi3 and raspberrypi3-64 using the 4.9
series kernel.

These patches were tested on top of Andrei's latest series of backports. The
exact series tested can be found at:
    https://gitlab.com/oryx/meta-raspberrypi/commits/pbarker/morty-next-2017-04-18

Andrei Gherzan (1):
  linux-raspberrypi_4.9: Bump to 4.9.21

Herve Jourdain (1):
  Add raspberrypi3-64.conf

Khem Raj (5):
  linux-raspberrypi: Add defconfig for raspberrypi3-64
  raspberrypi3-64.conf: Use 4.9 as default kernel
  raspberrypi3-64.conf: Specifiy rpi3-64bit dtbs
  sdcard: Use kernel8.img for 64bit kernel image name
  rpi-config: Specify bcm2710-rpi-3-b dtb for 64bit rpi3

Paul Barker (1):
  raspberrypi3-64: Override rpi-default-versions.inc

 classes/sdcard_image-rpi.bbclass              |  1 +
 conf/machine/raspberrypi3-64.conf             | 41 +++++++++++++++++++++++++++
 recipes-bsp/bootfiles/rpi-config_git.bb       |  6 ++++
 recipes-kernel/linux/linux-raspberrypi.inc    |  1 +
 recipes-kernel/linux/linux-raspberrypi_4.9.bb |  4 +--
 5 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 conf/machine/raspberrypi3-64.conf

-- 
2.11.0

[meta-raspberrypi][morty][PATCH 1/8] linux-raspberrypi_4.9: Bump to 4.9.21

[Paul Barker]

From: Andrei Gherzan <andrei@gherzan.ro>

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 recipes-kernel/linux/linux-raspberrypi_4.9.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-raspberrypi_4.9.bb b/recipes-kernel/linux/linux-raspberrypi_4.9.bb
index 3aba67b..c0e8b83 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.9.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.9.bb
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-LINUX_VERSION ?= "4.9.13"
+LINUX_VERSION ?= "4.9.21"
 
-SRCREV = "28ea32b9afb5d813986c4ab940c26fe298d80ed2"
+SRCREV = "5e4ee836560d4c0371e109bf469e1ad808ae7a44"
 SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.9.y \
 "
 require linux-raspberrypi.inc
-- 
2.11.0

[meta-raspberrypi][morty][PATCH 2/8] linux-raspberrypi: Add defconfig for raspberrypi3-64

[Paul Barker]

From: Khem Raj <raj.khem@gmail.com>

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 98229d9..d196d8e 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.0

[meta-raspberrypi][morty][PATCH 3/8] Add raspberrypi3-64.conf

[Paul Barker]

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.0

[meta-raspberrypi][morty][PATCH 4/8] raspberrypi3-64.conf: Use 4.9 as default kernel

[Paul Barker]

From: Khem Raj <raj.khem@gmail.com>

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.0

[meta-raspberrypi][morty][PATCH 5/8] raspberrypi3-64.conf: Specifiy rpi3-64bit dtbs

[Paul Barker]

From: Khem Raj <raj.khem@gmail.com>

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.0

[meta-raspberrypi][morty][PATCH 6/8] raspberrypi3-64: Override rpi-default-versions.inc

[Paul Barker]

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 conf/machine/raspberrypi3-64.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
index e7d9af2..7e99da1 100644
--- a/conf/machine/raspberrypi3-64.conf
+++ b/conf/machine/raspberrypi3-64.conf
@@ -6,6 +6,9 @@ MACHINEOVERRIDES = "raspberrypi3:raspberrypi:${MACHINE}"
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
 
+# Set this early so it overrides rpi-default-versions.inc
+PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
+
 require conf/machine/include/arm/arch-armv8.inc
 include conf/machine/include/rpi-base.inc
 
@@ -36,5 +39,3 @@ SERIAL_CONSOLE = "115200 ttyS0"
 VC4_CMA_SIZE ?= "cma-256"
 
 UBOOT_MACHINE = "rpi_3_config"
-
-PREFERRED_VERSION_linux-raspberrypi ?= "4.9.%"
-- 
2.11.0

[meta-raspberrypi][morty][PATCH 7/8] sdcard: Use kernel8.img for 64bit kernel image name

[Paul Barker]

From: Khem Raj <raj.khem@gmail.com>

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.0

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

[Paul Barker]

From: Khem Raj <raj.khem@gmail.com>

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.0

Re: [meta-raspberrypi][morty][PATCH 0/8] Stable branch backports

[Andrei Gherzan]

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

On Tue, Apr 18, 2017 at 09:51:00PM +0100, Paul Barker wrote:
> * Upgrade linux-raspberrypi 4.9 recipe
>
> * Add support for raspberrypi3-64 MACHINE
>
> Boot tested on raspberrypi, raspberrypi3 and raspberrypi3-64 using the 4.9
> series kernel.
>
> These patches were tested on top of Andrei's latest series of backports. The
> exact series tested can be found at:
>     https://gitlab.com/oryx/meta-raspberrypi/commits/pbarker/morty-next-2017-04-18
>
> Andrei Gherzan (1):
>   linux-raspberrypi_4.9: Bump to 4.9.21
>
> Herve Jourdain (1):
>   Add raspberrypi3-64.conf
>
> Khem Raj (5):
>   linux-raspberrypi: Add defconfig for raspberrypi3-64
>   raspberrypi3-64.conf: Use 4.9 as default kernel
>   raspberrypi3-64.conf: Specifiy rpi3-64bit dtbs
>   sdcard: Use kernel8.img for 64bit kernel image name
>   rpi-config: Specify bcm2710-rpi-3-b dtb for 64bit rpi3
>
> Paul Barker (1):
>   raspberrypi3-64: Override rpi-default-versions.inc
>
>  classes/sdcard_image-rpi.bbclass              |  1 +
>  conf/machine/raspberrypi3-64.conf             | 41 +++++++++++++++++++++++++++
>  recipes-bsp/bootfiles/rpi-config_git.bb       |  6 ++++
>  recipes-kernel/linux/linux-raspberrypi.inc    |  1 +
>  recipes-kernel/linux/linux-raspberrypi_4.9.bb |  4 +--
>  5 files changed, 51 insertions(+), 2 deletions(-)
>  create mode 100644 conf/machine/raspberrypi3-64.conf
>
> --
> 2.11.0
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Paul, how is testing looking with these patches?

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

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

Re: [meta-raspberrypi][morty][PATCH 0/8] Stable branch backports

[Paul Barker]

On Wed, Apr 19, 2017 at 5:53 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> On Tue, Apr 18, 2017 at 09:51:00PM +0100, Paul Barker wrote:
>> * Upgrade linux-raspberrypi 4.9 recipe
>>
>> * Add support for raspberrypi3-64 MACHINE
>>
>> Boot tested on raspberrypi, raspberrypi3 and raspberrypi3-64 using the 4.9
>> series kernel.
>>
>> These patches were tested on top of Andrei's latest series of backports. The
>> exact series tested can be found at:
>>     https://gitlab.com/oryx/meta-raspberrypi/commits/pbarker/morty-next-2017-04-18
>>
>> Andrei Gherzan (1):
>>   linux-raspberrypi_4.9: Bump to 4.9.21
>>
>> Herve Jourdain (1):
>>   Add raspberrypi3-64.conf
>>
>> Khem Raj (5):
>>   linux-raspberrypi: Add defconfig for raspberrypi3-64
>>   raspberrypi3-64.conf: Use 4.9 as default kernel
>>   raspberrypi3-64.conf: Specifiy rpi3-64bit dtbs
>>   sdcard: Use kernel8.img for 64bit kernel image name
>>   rpi-config: Specify bcm2710-rpi-3-b dtb for 64bit rpi3
>>
>> Paul Barker (1):
>>   raspberrypi3-64: Override rpi-default-versions.inc
>>
>>  classes/sdcard_image-rpi.bbclass              |  1 +
>>  conf/machine/raspberrypi3-64.conf             | 41 +++++++++++++++++++++++++++
>>  recipes-bsp/bootfiles/rpi-config_git.bb       |  6 ++++
>>  recipes-kernel/linux/linux-raspberrypi.inc    |  1 +
>>  recipes-kernel/linux/linux-raspberrypi_4.9.bb |  4 +--
>>  5 files changed, 51 insertions(+), 2 deletions(-)
>>  create mode 100644 conf/machine/raspberrypi3-64.conf
>>
>> --
>> 2.11.0
>>
>> --
>> _______________________________________________
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>
> Paul, how is testing looking with these patches?
>

All boot tested, ran a few commands by hand at the console and
everything looks good. I don't have a very complex software stack on
morty at the minute though.

-- 
Paul Barker
Co-Founder & Principal Engineer
Togán Labs Ltd

Re: [meta-raspberrypi][morty][PATCH 0/8] Stable branch backports

[Andrei Gherzan]

On Wed, Apr 19, 2017 at 5:54 PM, Paul Barker <pbarker@toganlabs.com> wrote:
> On Wed, Apr 19, 2017 at 5:53 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
>> On Tue, Apr 18, 2017 at 09:51:00PM +0100, Paul Barker wrote:
>>> * Upgrade linux-raspberrypi 4.9 recipe
>>>
>>> * Add support for raspberrypi3-64 MACHINE
>>>
>>> Boot tested on raspberrypi, raspberrypi3 and raspberrypi3-64 using the 4.9
>>> series kernel.
>>>
>>> These patches were tested on top of Andrei's latest series of backports. The
>>> exact series tested can be found at:
>>>     https://gitlab.com/oryx/meta-raspberrypi/commits/pbarker/morty-next-2017-04-18
>>>
>>> Andrei Gherzan (1):
>>>   linux-raspberrypi_4.9: Bump to 4.9.21
>>>
>>> Herve Jourdain (1):
>>>   Add raspberrypi3-64.conf
>>>
>>> Khem Raj (5):
>>>   linux-raspberrypi: Add defconfig for raspberrypi3-64
>>>   raspberrypi3-64.conf: Use 4.9 as default kernel
>>>   raspberrypi3-64.conf: Specifiy rpi3-64bit dtbs
>>>   sdcard: Use kernel8.img for 64bit kernel image name
>>>   rpi-config: Specify bcm2710-rpi-3-b dtb for 64bit rpi3
>>>
>>> Paul Barker (1):
>>>   raspberrypi3-64: Override rpi-default-versions.inc
>>>
>>>  classes/sdcard_image-rpi.bbclass              |  1 +
>>>  conf/machine/raspberrypi3-64.conf             | 41 +++++++++++++++++++++++++++
>>>  recipes-bsp/bootfiles/rpi-config_git.bb       |  6 ++++
>>>  recipes-kernel/linux/linux-raspberrypi.inc    |  1 +
>>>  recipes-kernel/linux/linux-raspberrypi_4.9.bb |  4 +--
>>>  5 files changed, 51 insertions(+), 2 deletions(-)
>>>  create mode 100644 conf/machine/raspberrypi3-64.conf
>>>
>>> --
>>> 2.11.0
>>>
>>> --
>>> _______________________________________________
>>> yocto mailing list
>>> yocto@yoctoproject.org
>>> https://lists.yoctoproject.org/listinfo/yocto
>>
>> Paul, how is testing looking with these patches?
>>
>
> All boot tested, ran a few commands by hand at the console and
> everything looks good. I don't have a very complex software stack on
> morty at the minute though.

Sounds good Paul. Thanks.

Re: [meta-raspberrypi][morty][PATCH 0/8] Stable branch backports

[Andrei Gherzan]

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

On Tue, Apr 18, 2017 at 09:51:00PM +0100, Paul Barker wrote:
> * Upgrade linux-raspberrypi 4.9 recipe
>
> * Add support for raspberrypi3-64 MACHINE
>
> Boot tested on raspberrypi, raspberrypi3 and raspberrypi3-64 using the 4.9
> series kernel.
>
> These patches were tested on top of Andrei's latest series of backports. The
> exact series tested can be found at:
>     https://gitlab.com/oryx/meta-raspberrypi/commits/pbarker/morty-next-2017-04-18
>
> Andrei Gherzan (1):
>   linux-raspberrypi_4.9: Bump to 4.9.21
>
> Herve Jourdain (1):
>   Add raspberrypi3-64.conf
>
> Khem Raj (5):
>   linux-raspberrypi: Add defconfig for raspberrypi3-64
>   raspberrypi3-64.conf: Use 4.9 as default kernel
>   raspberrypi3-64.conf: Specifiy rpi3-64bit dtbs
>   sdcard: Use kernel8.img for 64bit kernel image name
>   rpi-config: Specify bcm2710-rpi-3-b dtb for 64bit rpi3
>
> Paul Barker (1):
>   raspberrypi3-64: Override rpi-default-versions.inc
>
>  classes/sdcard_image-rpi.bbclass              |  1 +
>  conf/machine/raspberrypi3-64.conf             | 41 +++++++++++++++++++++++++++
>  recipes-bsp/bootfiles/rpi-config_git.bb       |  6 ++++
>  recipes-kernel/linux/linux-raspberrypi.inc    |  1 +
>  recipes-kernel/linux/linux-raspberrypi_4.9.bb |  4 +--
>  5 files changed, 51 insertions(+), 2 deletions(-)
>  create mode 100644 conf/machine/raspberrypi3-64.conf
>
> --
> 2.11.0
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Merged entire patch set to morty. Thanks Paul.

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

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