[PATCH] meta-arm-bsp: add dunfell compatibility to fvps and juno

[PATCH] meta-arm-bsp: add dunfell compatibility to fvps and juno

[Vineeth Raveendran]

Make following machines compatible with dunfell:
    - foundation-armv8
    - fvp-base
    - juno

Major changes include supporting kernel version 5.4 and U-BOOT version v2020

Change-Id: Ia59ac874de4e4c4ea02c7a4f976e39a9b6996f75
Issue-Id: SCM-833
Signed-off-by: Vineeth Raveendran <vineeth.raveendran@arm.com>
---
 meta-arm-bsp/conf/layer.conf                        |  3 +++
 meta-arm-bsp/conf/machine/fvp-common/fvp.inc        |  6 ++++--
 .../files/fvp-common/u-boot_vexpress_fvp.patch      | 13 +++++++++++++
 .../recipes-bsp/u-boot/u-boot_2020.%.bbappend       | 11 +++++++++++
 .../recipes-kernel/linux/linux-yocto_5.4.bbappend   |  3 +++
 5 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend

diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
index 1a54ddc..5257195 100644
--- a/meta-arm-bsp/conf/layer.conf
+++ b/meta-arm-bsp/conf/layer.conf
@@ -11,3 +11,6 @@ BBFILE_PRIORITY_meta-arm-bsp = "6"
 
 LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
 LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
+
+# Place holder for yocto version compatibility
+OVERRIDES_append = ":${LAYERSERIES_CORENAMES}"
diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
index 702a1d2..d1a59cc 100644
--- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
+++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
@@ -35,9 +35,11 @@ DISK_IMG_PARTITION3_CONTENT = ""
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "4.19%"
+PREFERRED_VERSION_linux-yocto ?= "5.4%"
+PREFERRED_VERSION_linux-yocto_zeus ?= "4.19%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
 # FVP u-boot configuration
-UBOOT_MACHINE = "vexpress_aemv8a_dram_defconfig"
+UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig"
+UBOOT_MACHINE_zeus = "vexpress_aemv8a_dram_defconfig"
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
new file mode 100644
index 0000000..bdca202
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
@@ -0,0 +1,13 @@
+diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
+index c9cec8322c..3a339be6a2 100644
+--- a/configs/vexpress_aemv8a_semi_defconfig
++++ b/configs/vexpress_aemv8a_semi_defconfig
+@@ -9,7 +9,7 @@ CONFIG_IDENT_STRING=" vexpress_aemv8a"
+ CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_BOOTDELAY=1
+ CONFIG_USE_BOOTARGS=y
+-CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9"
++CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9"
+ # CONFIG_USE_BOOTCOMMAND is not set
+ # CONFIG_DISPLAY_CPUINFO is not set
+ # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
new file mode 100644
index 0000000..d69943b
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
@@ -0,0 +1,11 @@
+# u-boot_2020 patch for fvp machinesboard
+
+#
+# Patch u-boot to change kernel command line
+#
+
+FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
+FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
+
+SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
+SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
new file mode 100644
index 0000000..ed6fbc3
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
@@ -0,0 +1,3 @@
+# Add support for Arm Platforms (boards or simulators)
+
+require linux-yocto-arm-platforms.inc
-- 
2.17.1

Re: [meta-arm] [PATCH] meta-arm-bsp: add dunfell compatibility to fvps and juno

[Diego Sueiro]

> -----Original Message-----
> From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> On Behalf Of Vineeth Raveendran via lists.yoctoproject.org
> Sent: 30 April 2020 09:17
> To: meta-arm@lists.yoctoproject.org
> Cc: nd <nd@arm.com>
> Subject: [meta-arm] [PATCH] meta-arm-bsp: add dunfell compatibility to fvps
> and juno
> 
> Make following machines compatible with dunfell:
>     - foundation-armv8
>     - fvp-base
>     - juno
> 
> Major changes include supporting kernel version 5.4 and U-BOOT version
> v2020
> 
> Change-Id: Ia59ac874de4e4c4ea02c7a4f976e39a9b6996f75
> Issue-Id: SCM-833
> Signed-off-by: Vineeth Raveendran <vineeth.raveendran@arm.com>

Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>

> ---
>  meta-arm-bsp/conf/layer.conf                        |  3 +++
>  meta-arm-bsp/conf/machine/fvp-common/fvp.inc        |  6 ++++--
>  .../files/fvp-common/u-boot_vexpress_fvp.patch      | 13 +++++++++++++
>  .../recipes-bsp/u-boot/u-boot_2020.%.bbappend       | 11 +++++++++++
>  .../recipes-kernel/linux/linux-yocto_5.4.bbappend   |  3 +++
>  5 files changed, 34 insertions(+), 2 deletions(-)  create mode 100644 meta-
> arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
>  create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-
> boot_2020.%.bbappend
>  create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-
> yocto_5.4.bbappend
> 
> diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
> index 1a54ddc..5257195 100644
> --- a/meta-arm-bsp/conf/layer.conf
> +++ b/meta-arm-bsp/conf/layer.conf
> @@ -11,3 +11,6 @@ BBFILE_PRIORITY_meta-arm-bsp = "6"
> 
>  LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
>  LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
> +
> +# Place holder for yocto version compatibility OVERRIDES_append =
> +":${LAYERSERIES_CORENAMES}"
> diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-
> bsp/conf/machine/fvp-common/fvp.inc
> index 702a1d2..d1a59cc 100644
> --- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> +++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> @@ -35,9 +35,11 @@ DISK_IMG_PARTITION3_CONTENT = ""
>  SERIAL_CONSOLES = "115200;ttyAMA0"
> 
>  PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> -PREFERRED_VERSION_linux-yocto ?= "4.19%"
> +PREFERRED_VERSION_linux-yocto ?= "5.4%"
> +PREFERRED_VERSION_linux-yocto_zeus ?= "4.19%"
> 
>  EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
> 
>  # FVP u-boot configuration
> -UBOOT_MACHINE = "vexpress_aemv8a_dram_defconfig"
> +UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig"
> +UBOOT_MACHINE_zeus = "vexpress_aemv8a_dram_defconfig"
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-
> boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-
> common/u-boot_vexpress_fvp.patch
> new file mode 100644
> index 0000000..bdca202
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-
> boot_vexpress_f
> +++ vp.patch
> @@ -0,0 +1,13 @@
> +diff --git a/configs/vexpress_aemv8a_semi_defconfig
> +b/configs/vexpress_aemv8a_semi_defconfig
> +index c9cec8322c..3a339be6a2 100644
> +--- a/configs/vexpress_aemv8a_semi_defconfig
> ++++ b/configs/vexpress_aemv8a_semi_defconfig
> +@@ -9,7 +9,7 @@ CONFIG_IDENT_STRING=" vexpress_aemv8a"
> + CONFIG_DISTRO_DEFAULTS=y
> + CONFIG_BOOTDELAY=1
> + CONFIG_USE_BOOTARGS=y
> +-CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug
> user_debug=31 loglevel=9"
> ++CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000
> debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw
> rootwait loglevel=9"
> + # CONFIG_USE_BOOTCOMMAND is not set
> + # CONFIG_DISPLAY_CPUINFO is not set
> + # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
> b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
> new file mode 100644
> index 0000000..d69943b
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
> @@ -0,0 +1,11 @@
> +# u-boot_2020 patch for fvp machinesboard
> +
> +#
> +# Patch u-boot to change kernel command line #
> +
> +FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
> +FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-
> common:"
> +
> +SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
> +SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch"
> diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
> b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
> new file mode 100644
> index 0000000..ed6fbc3
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
> @@ -0,0 +1,3 @@
> +# Add support for Arm Platforms (boards or simulators)
> +
> +require linux-yocto-arm-platforms.inc
> --
> 2.17.1

Re: [meta-arm] [PATCH] meta-arm-bsp: add dunfell compatibility to fvps and juno

[Bertrand Marquis]

> On 30 Apr 2020, at 09:17, Vineeth Raveendran via lists.yoctoproject.org <vineeth.raveendran=arm.com@lists.yoctoproject.org> wrote:
> 
> Make following machines compatible with dunfell:
>    - foundation-armv8
>    - fvp-base
>    - juno
> 
> Major changes include supporting kernel version 5.4 and U-BOOT version v2020
> 
> Change-Id: Ia59ac874de4e4c4ea02c7a4f976e39a9b6996f75
> Issue-Id: SCM-833
> Signed-off-by: Vineeth Raveendran <vineeth.raveendran@arm.com>

Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

> ---
> meta-arm-bsp/conf/layer.conf                        |  3 +++
> meta-arm-bsp/conf/machine/fvp-common/fvp.inc        |  6 ++++--
> .../files/fvp-common/u-boot_vexpress_fvp.patch      | 13 +++++++++++++
> .../recipes-bsp/u-boot/u-boot_2020.%.bbappend       | 11 +++++++++++
> .../recipes-kernel/linux/linux-yocto_5.4.bbappend   |  3 +++
> 5 files changed, 34 insertions(+), 2 deletions(-)
> create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
> create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
> create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
> 
> diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
> index 1a54ddc..5257195 100644
> --- a/meta-arm-bsp/conf/layer.conf
> +++ b/meta-arm-bsp/conf/layer.conf
> @@ -11,3 +11,6 @@ BBFILE_PRIORITY_meta-arm-bsp = "6"
> 
> LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
> LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
> +
> +# Place holder for yocto version compatibility
> +OVERRIDES_append = ":${LAYERSERIES_CORENAMES}"
> diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> index 702a1d2..d1a59cc 100644
> --- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> +++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> @@ -35,9 +35,11 @@ DISK_IMG_PARTITION3_CONTENT = ""
> SERIAL_CONSOLES = "115200;ttyAMA0"
> 
> PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> -PREFERRED_VERSION_linux-yocto ?= "4.19%"
> +PREFERRED_VERSION_linux-yocto ?= "5.4%"
> +PREFERRED_VERSION_linux-yocto_zeus ?= "4.19%"
> 
> EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
> 
> # FVP u-boot configuration
> -UBOOT_MACHINE = "vexpress_aemv8a_dram_defconfig"
> +UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig"
> +UBOOT_MACHINE_zeus = "vexpress_aemv8a_dram_defconfig"
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
> new file mode 100644
> index 0000000..bdca202
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
> @@ -0,0 +1,13 @@
> +diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
> +index c9cec8322c..3a339be6a2 100644
> +--- a/configs/vexpress_aemv8a_semi_defconfig
> ++++ b/configs/vexpress_aemv8a_semi_defconfig
> +@@ -9,7 +9,7 @@ CONFIG_IDENT_STRING=" vexpress_aemv8a"
> + CONFIG_DISTRO_DEFAULTS=y
> + CONFIG_BOOTDELAY=1
> + CONFIG_USE_BOOTARGS=y
> +-CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9"
> ++CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9"
> + # CONFIG_USE_BOOTCOMMAND is not set
> + # CONFIG_DISPLAY_CPUINFO is not set
> + # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
> new file mode 100644
> index 0000000..d69943b
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
> @@ -0,0 +1,11 @@
> +# u-boot_2020 patch for fvp machinesboard
> +
> +#
> +# Patch u-boot to change kernel command line
> +#
> +
> +FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
> +FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
> +
> +SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
> +SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch"
> diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
> new file mode 100644
> index 0000000..ed6fbc3
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
> @@ -0,0 +1,3 @@
> +# Add support for Arm Platforms (boards or simulators)
> +
> +require linux-yocto-arm-platforms.inc
> -- 
> 2.17.1
> 
> 

Re: [meta-arm] [PATCH] meta-arm-bsp: add dunfell compatibility to fvps and juno

[Richard Purdie]

On Thu, 2020-04-30 at 09:17 +0100, Vineeth Raveendran wrote:
> Make following machines compatible with dunfell:
>     - foundation-armv8
>     - fvp-base
>     - juno
> 
> Major changes include supporting kernel version 5.4 and U-BOOT version v2020
> 
> Change-Id: Ia59ac874de4e4c4ea02c7a4f976e39a9b6996f75
> Issue-Id: SCM-833
> Signed-off-by: Vineeth Raveendran <vineeth.raveendran@arm.com>
> ---
>  meta-arm-bsp/conf/layer.conf                        |  3 +++
>  meta-arm-bsp/conf/machine/fvp-common/fvp.inc        |  6 ++++--
>  .../files/fvp-common/u-boot_vexpress_fvp.patch      | 13 +++++++++++++
>  .../recipes-bsp/u-boot/u-boot_2020.%.bbappend       | 11 +++++++++++
>  .../recipes-kernel/linux/linux-yocto_5.4.bbappend   |  3 +++
>  5 files changed, 34 insertions(+), 2 deletions(-)
>  create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
>  create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
>  create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
> 
> diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
> index 1a54ddc..5257195 100644
> --- a/meta-arm-bsp/conf/layer.conf
> +++ b/meta-arm-bsp/conf/layer.conf
> @@ -11,3 +11,6 @@ BBFILE_PRIORITY_meta-arm-bsp = "6"
>  
>  LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
>  LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
> +
> +# Place holder for yocto version compatibility
> +OVERRIDES_append = ":${LAYERSERIES_CORENAMES}"

Generally we've advised different branches to make it clear to people
which layers are compatible with which releases. I appreciate its
"easier" to have one layer fits all to maintain, I'm less sure its
clear for users.

Whilst I can see why you want to do add to overrides like this, I'm not
sure its a great idea. This will affect every layer in the combined
stack, not just yours. OVERRIDES are fairly dangerous things and need
careful namespacing. Our release names are designed to be distinctive
but after bad experiences we generally recommend additional overrides
be carefully namespaced, e.g. "class-XXXX", "pn-XXXX" since we know
what weird issues these can cause.

Anyhow, there is a bug here since LAYERSERIES_CORENAMES can have
multiple values, the clue being the plural name, e.g. it did here for a
while:

http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/conf/layer.conf?id=8702b79a3b90a06524098e8b2a10b6e6d287166a

Cheers,

Richard

Re: [meta-arm] [PATCH] meta-arm-bsp: add dunfell compatibility to fvps and juno

[Bertrand Marquis]

Hi,

> On 30 Apr 2020, at 10:06, Richard Purdie via lists.yoctoproject.org <richard.purdie=linuxfoundation.org@lists.yoctoproject.org> wrote:
> 
> On Thu, 2020-04-30 at 09:17 +0100, Vineeth Raveendran wrote:
>> Make following machines compatible with dunfell:
>>    - foundation-armv8
>>    - fvp-base
>>    - juno
>> 
>> Major changes include supporting kernel version 5.4 and U-BOOT version v2020
>> 
>> Change-Id: Ia59ac874de4e4c4ea02c7a4f976e39a9b6996f75
>> Issue-Id: SCM-833
>> Signed-off-by: Vineeth Raveendran <vineeth.raveendran@arm.com>
>> ---
>> meta-arm-bsp/conf/layer.conf                        |  3 +++
>> meta-arm-bsp/conf/machine/fvp-common/fvp.inc        |  6 ++++--
>> .../files/fvp-common/u-boot_vexpress_fvp.patch      | 13 +++++++++++++
>> .../recipes-bsp/u-boot/u-boot_2020.%.bbappend       | 11 +++++++++++
>> .../recipes-kernel/linux/linux-yocto_5.4.bbappend   |  3 +++
>> 5 files changed, 34 insertions(+), 2 deletions(-)
>> create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
>> create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
>> create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
>> 
>> diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
>> index 1a54ddc..5257195 100644
>> --- a/meta-arm-bsp/conf/layer.conf
>> +++ b/meta-arm-bsp/conf/layer.conf
>> @@ -11,3 +11,6 @@ BBFILE_PRIORITY_meta-arm-bsp = "6"
>> 
>> LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
>> LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
>> +
>> +# Place holder for yocto version compatibility
>> +OVERRIDES_append = ":${LAYERSERIES_CORENAMES}"
> 
> Generally we've advised different branches to make it clear to people
> which layers are compatible with which releases. I appreciate its
> "easier" to have one layer fits all to maintain, I'm less sure its
> clear for users.

We have internal needs to keep zeus compatibility and as the amount of conflict is reduced we decided to keep dunfell branch compatible with Zeus.
From the external user point of view this will still be in dunfell branch and officially to be used with dunfell, we don’t plan to make any “publicity” of it.

Zeus compatibility will be remove from master once we will create the Dunfell branch (Jon Mason should give more info on this shortly).

> 
> Whilst I can see why you want to do add to overrides like this, I'm not
> sure its a great idea. This will affect every layer in the combined
> stack, not just yours. OVERRIDES are fairly dangerous things and need
> careful namespacing. Our release names are designed to be distinctive
> but after bad experiences we generally recommend additional overrides
> be carefully namespaced, e.g. "class-XXXX", "pn-XXXX" since we know
> what weird issues these can cause.

I agree with that and we will modify the patch to get rid of the override and use something like:
RDEPENDS_${PN} += "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'zeus', ‘zeus-solution', ‘dunfell-solution', d)}"

> 
> Anyhow, there is a bug here since LAYERSERIES_CORENAMES can have
> multiple values, the clue being the plural name, e.g. it did here for a
> while:
> 
> http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/conf/layer.conf?id=8702b79a3b90a06524098e8b2a10b6e6d287166a

Thanks for the pointer :-)
The bb.utils.contains solution should also solve this case that we did not see before.

Cheers,
Bertrand

> 
> Cheers,
> 
> Richard
> 
> 

Re: [meta-arm] [PATCH] meta-arm-bsp: add dunfell compatibility to fvps and juno

[Richard Purdie]

On Thu, 2020-04-30 at 14:22 +0000, Bertrand Marquis wrote:
> On 30 Apr 2020, at 10:06, Richard Purdie via lists.yoctoproject.org
> > <richard.purdie=linuxfoundation.org@lists.yoctoproject.org> wrote:
> > 
> > On Thu, 2020-04-30 at 09:17 +0100, Vineeth Raveendran wrote:
> > > LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
> > > LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
> > > +
> > > +# Place holder for yocto version compatibility
> > > +OVERRIDES_append = ":${LAYERSERIES_CORENAMES}"
> > 
> > Generally we've advised different branches to make it clear to
> > people
> > which layers are compatible with which releases. I appreciate its
> > "easier" to have one layer fits all to maintain, I'm less sure its
> > clear for users.
> 
> We have internal needs to keep zeus compatibility and as the amount
> of conflict is reduced we decided to keep dunfell branch compatible
> with Zeus.
> From the external user point of view this will still be in dunfell
> branch and officially to be used with dunfell, we don’t plan to make
> any “publicity” of it.
> 
> Zeus compatibility will be remove from master once we will create the
> Dunfell branch (Jon Mason should give more info on this shortly).
> 
> > Whilst I can see why you want to do add to overrides like this, I'm
> > not
> > sure its a great idea. This will affect every layer in the combined
> > stack, not just yours. OVERRIDES are fairly dangerous things and
> > need
> > careful namespacing. Our release names are designed to be
> > distinctive
> > but after bad experiences we generally recommend additional
> > overrides
> > be carefully namespaced, e.g. "class-XXXX", "pn-XXXX" since we know
> > what weird issues these can cause.
> 
> I agree with that and we will modify the patch to get rid of the
> override and use something like:
> RDEPENDS_${PN} += "${@bb.utils.contains('LAYERSERIES_CORENAMES',
> 'zeus', ‘zeus-solution', ‘dunfell-solution', d)}"

This looks better, I'd probably pick something specific to your layer
like "meta-arm-zeus" but the general idea and filtering is much better.

> > Anyhow, there is a bug here since LAYERSERIES_CORENAMES can have
> > multiple values, the clue being the plural name, e.g. it did here
> > for a
> > while:
> > 
> > http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/conf/layer.conf?id=8702b79a3b90a06524098e8b2a10b6e6d287166a
> 
> Thanks for the pointer :-)
> The bb.utils.contains solution should also solve this case that we
> did not see before.

Yes, looks much better!

Cheers,

Richard

Re: [PATCH] meta-arm-bsp: add dunfell compatibility to fvps and juno

[Vineeth Raveendran]

On Thu, Apr 30, 2020 at 01:10 PM, Richard Purdie wrote:

>
> On Thu, 2020-04-30 at 14:22 +0000, Bertrand Marquis wrote:
> > On 30 Apr 2020, at 10:06, Richard Purdie via lists.yoctoproject.org
> > > <richard.purdie=linuxfoundation.org@lists.yoctoproject.org> wrote:
> > > 
> > > On Thu, 2020-04-30 at 09:17 +0100, Vineeth Raveendran wrote:
> > > > LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
> > > > LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
> > > > +
> > > > +# Place holder for yocto version compatibility
> > > > +OVERRIDES_append = ":${LAYERSERIES_CORENAMES}"
> > > 
> > > Generally we've advised different branches to make it clear to
> > > people
> > > which layers are compatible with which releases. I appreciate its
> > > "easier" to have one layer fits all to maintain, I'm less sure its
> > > clear for users.
> > 
> > We have internal needs to keep zeus compatibility and as the amount
> > of conflict is reduced we decided to keep dunfell branch compatible
> > with Zeus.
> > From the external user point of view this will still be in dunfell
> > branch and officially to be used with dunfell, we don’t plan to make
> > any “publicity” of it.
> > 
> > Zeus compatibility will be remove from master once we will create the
> > Dunfell branch (Jon Mason should give more info on this shortly).
> > 
> > > Whilst I can see why you want to do add to overrides like this, I'm
> > > not
> > > sure its a great idea. This will affect every layer in the combined
> > > stack, not just yours. OVERRIDES are fairly dangerous things and
> > > need
> > > careful namespacing. Our release names are designed to be
> > > distinctive
> > > but after bad experiences we generally recommend additional
> > > overrides
> > > be carefully namespaced, e.g. "class-XXXX", "pn-XXXX" since we know
> > > what weird issues these can cause.
> > 
> > I agree with that and we will modify the patch to get rid of the
> > override and use something like:
> > RDEPENDS_${PN} += "${@bb.utils.contains('LAYERSERIES_CORENAMES',
> > 'zeus', ‘zeus-solution', ‘dunfell-solution', d)}"
> 
> This looks better, I'd probably pick something specific to your layer
> like "meta-arm-zeus" but the general idea and filtering is much better.
> 
> > > Anyhow, there is a bug here since LAYERSERIES_CORENAMES can have
> > > multiple values, the clue being the plural name, e.g. it did here
> > > for a
> > > while:
> > > 
> > >
> http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/conf/layer.conf?id=8702b79a3b90a06524098e8b2a10b6e6d287166a
> > 
> > Thanks for the pointer :-)
> > The bb.utils.contains solution should also solve this case that we
> > did not see before.
> 
> Yes, looks much better!
> 
> Cheers,
> 
> Richard
> 
>

Abandoning patch to rework on the same.

Thanks,

Vineeth