[PATCH 1/6] arm-bsp: Introduce support for rdn1edge platform

[PATCH 1/6] arm-bsp: Introduce support for rdn1edge platform

[Thomas Abraham]

From: Vivek Gautam <vivek.gautam@arm.com>

RD-N1-Edge is a Arm infrastructure reference platform. Add the
machine configuration in meta-arm-bsp layer for this platform.

Change-Id: I5846a0b9cd85531e61812d34aa7af85dd5dbfa89
Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
---
 meta-arm-bsp/conf/machine/rdn1edge.conf | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 meta-arm-bsp/conf/machine/rdn1edge.conf

diff --git a/meta-arm-bsp/conf/machine/rdn1edge.conf b/meta-arm-bsp/conf/machine/rdn1edge.conf
new file mode 100644
index 0000000..088e09d
--- /dev/null
+++ b/meta-arm-bsp/conf/machine/rdn1edge.conf
@@ -0,0 +1,7 @@
+# Configuration for Arm RD-N1-Edge reference platform
+
+#@TYPE: Machine
+#@NAME: RD-N1-Edge
+#@DESCRIPTION: Machine configuration for RD-N1-Edge
+
+require conf/machine/include/tune-neoversen1.inc
-- 
2.17.1

[PATCH 2/6] arm-bsp/scp-firmware: Build SCP/MCP for rdn1edge

[Thomas Abraham]

From: Vivek Gautam <vivek.gautam@arm.com>

Add bbappend recipe to build SCP and MCP firmware for the rdn1edge
platform. In addition to this, add machine conf to add image
dependency for SCP-firmware components.

Change-Id: I2b64216d18ce4c28d7a720fffd638ca3be06d8d1
Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
---
 meta-arm-bsp/conf/machine/rdn1edge.conf          |  3 +++
 .../scp-firmware/scp-firmware-rdn1edge.inc       | 16 ++++++++++++++++
 .../scp-firmware/scp-firmware_%.bbappend         |  1 +
 3 files changed, 20 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdn1edge.inc

diff --git a/meta-arm-bsp/conf/machine/rdn1edge.conf b/meta-arm-bsp/conf/machine/rdn1edge.conf
index 088e09d..47d1d05 100644
--- a/meta-arm-bsp/conf/machine/rdn1edge.conf
+++ b/meta-arm-bsp/conf/machine/rdn1edge.conf
@@ -5,3 +5,6 @@
 #@DESCRIPTION: Machine configuration for RD-N1-Edge
 
 require conf/machine/include/tune-neoversen1.inc
+
+#include SCP/MCP firmware
+EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdn1edge.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdn1edge.inc
new file mode 100644
index 0000000..aba8409
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdn1edge.inc
@@ -0,0 +1,16 @@
+# RD-N1-Edge specific SCP configurations and build instructions
+
+#it’s a tested tag post-2.6.0
+SRCREV    = "3e99f94ad195ab902a50d0368c80810ec10f0e42"
+SCP_PLATFORM  = "rdn1e1"
+
+COMPATIBLE_MACHINE_rdn1edge = "rdn1edge"
+
+do_install() {
+    install -d ${D}/firmware
+    install -D "${B}/product/${SCP_PLATFORM}/scp_romfw/${SCP_BUILD_STR}/bin/scp_romfw.bin" "${D}/firmware/"
+    install -D "${B}/product/${SCP_PLATFORM}/scp_ramfw/${SCP_BUILD_STR}/bin/scp_ramfw.bin" "${D}/firmware/"
+    install -D "${B}/product/${SCP_PLATFORM}/mcp_romfw/${SCP_BUILD_STR}/bin/mcp_romfw.bin" "${D}/firmware/"
+}
+
+PV = "2.6.0+git${SRCPV}"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend
index 8a68704..9e1b20d 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend
@@ -6,6 +6,7 @@ MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
 MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"
 MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc"
 MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc"
+MACHINE_SCP_REQUIRE_rdn1edge = "scp-firmware-rdn1edge.inc"
 MACHINE_SCP_REQUIRE_corstone700 = "scp-firmware-corstone700.inc"
 
 require ${MACHINE_SCP_REQUIRE}
-- 
2.17.1

[PATCH 3/6] arm-bsp/fip-image: Build TFA/UEFI for rdn1edge

[Thomas Abraham]

From: Vivek Gautam <vivek.gautam@arm.com>

Add bbappend recipe to build TF-A and UEFI firmware for rdn1edge
platform. In addition to this, add machine conf to add image
dependency for TF-A components.

Change-Id: I494b9a580cf15f9f789750ea4c73802ff93a5b94
Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
---
 meta-arm-bsp/conf/machine/rdn1edge.conf          |  6 ++++++
 .../trusted-firmware-a-rdn1edge.inc              | 16 ++++++++++++++++
 .../trusted-firmware-a_2.3.bbappend              |  1 +
 .../recipes-bsp/uefi/edk2-firmware-rdn1edge.inc  | 10 ++++++++++
 .../recipes-bsp/uefi/edk2-firmware_git.bbappend  |  1 +
 5 files changed, 34 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn1edge.inc
 create mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn1edge.inc

diff --git a/meta-arm-bsp/conf/machine/rdn1edge.conf b/meta-arm-bsp/conf/machine/rdn1edge.conf
index 47d1d05..cdc879c 100644
--- a/meta-arm-bsp/conf/machine/rdn1edge.conf
+++ b/meta-arm-bsp/conf/machine/rdn1edge.conf
@@ -8,3 +8,9 @@ require conf/machine/include/tune-neoversen1.inc
 
 #include SCP/MCP firmware
 EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
+
+#Trusted firmware v2.3 version
+PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
+
+EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn1edge.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn1edge.inc
new file mode 100644
index 0000000..af3e198
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn1edge.inc
@@ -0,0 +1,16 @@
+# RD-N1-Edge specific TFA support
+
+COMPATIBLE_MACHINE = "rdn1edge"
+TFA_PLATFORM       = "rdn1edge"
+TFA_BUILD_TARGET   = "all fip"
+TFA_INSTALL_TARGET = "bl1 fip"
+TFA_DEBUG          = "1"
+TFA_MBEDTLS        = "1"
+TFA_UBOOT          = "0"
+
+# RD-N1-Edge needs the UEFI as bl33
+DEPENDS += "virtual/uefi-firmware"
+
+EXTRA_OEMAKE += "BL33=${RECIPE_SYSROOT}/firmware/uefi.bin"
+EXTRA_OEMAKE += "TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_rsa \
+                     ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
index 0e6fb1e..adb1570 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
@@ -8,5 +8,6 @@ MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
 MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
 MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
 MACHINE_TFA_REQUIRE_corstone700 = "trusted-firmware-a-corstone700.inc"
+MACHINE_TFA_REQUIRE_rdn1edge = "trusted-firmware-a-rdn1edge.inc"
 
 require ${MACHINE_TFA_REQUIRE}
diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn1edge.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn1edge.inc
new file mode 100644
index 0000000..f4fe72d
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn1edge.inc
@@ -0,0 +1,10 @@
+# RD-N1-Edge edk2 support
+
+# RD-N1-Edge specific EDK2 configurations
+EDK2_BUILD_RELEASE = "0"
+EDK2_PLATFORM      = "RdN1Edge"
+EDK2_PLATFORM_DSC  = "Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc"
+EDK2_BIN_NAME      = "BL33_AP_UEFI.fd"
+EDK2_ARCH          = "AARCH64"
+
+COMPATIBLE_MACHINE = "rdn1edge"
diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_git.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_git.bbappend
index 8cfd6c5..bd1f391 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_git.bbappend
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_git.bbappend
@@ -6,6 +6,7 @@ MACHINE_EDK2_REQUIRE ?= ""
 
 MACHINE_EDK2_REQUIRE_n1sdp = "edk2-firmware-n1sdp.inc"
 MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc"
+MACHINE_EDK2_REQUIRE_rdn1edge = "edk2-firmware-rdn1edge.inc"
 MACHINE_EDK2_REQUIRE_fvp-base = "edk2-firmware-fvp-base.inc"
 
 require ${MACHINE_EDK2_REQUIRE}
-- 
2.17.1

[PATCH 4/6] arm-bsp/linux: Build Linux stable 5.7 for rdn1edge

[Thomas Abraham]

From: Vivek Gautam <vivek.gautam@arm.com>

Update linux-arm inc to add build support for rdn1edge. In addition
to this, add machine conf to add image dependency for Linux
components.

Change-Id: If98fae10b69193ba635bc65b386b136f171d6826
Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
---
 meta-arm-bsp/conf/machine/rdn1edge.conf                   | 6 ++++++
 meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/meta-arm-bsp/conf/machine/rdn1edge.conf b/meta-arm-bsp/conf/machine/rdn1edge.conf
index cdc879c..d86c9f7 100644
--- a/meta-arm-bsp/conf/machine/rdn1edge.conf
+++ b/meta-arm-bsp/conf/machine/rdn1edge.conf
@@ -14,3 +14,9 @@ PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
+
+#Linux Stable Kernel
+KERNEL_IMAGETYPE ?= "Image"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
+PREFERRED_VERSION_linux-stable ?= "5.7%"
+SERIAL_CONSOLES = "115200;ttyAMA0"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index 62b1dec..42d5604 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -14,6 +14,7 @@ SRC_URI_append_fvp-base = " ${SRC_URI_KMETA}"
 SRC_URI_append_fvp-base-arm32 = " ${SRC_URI_KMETA}"
 SRC_URI_append_juno = " ${SRC_URI_KMETA}"
 SRC_URI_append_sgi575 = " ${SRC_URI_KMETA}"
+SRC_URI_append_rdn1edge = " ${SRC_URI_KMETA}"
 SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}"
 SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
 
@@ -70,6 +71,13 @@ KMACHINE_sgi575 = "sgi575"
 KBUILD_DEFCONFIG_sgi575 = "defconfig"
 KCONFIG_MODE_sgi575 = "--alldefconfig"
 
+#
+# RD-N1-Edge KMACHINE
+#
+COMPATIBLE_MACHINE_rdn1edge = "rdn1edge"
+KBUILD_DEFCONFIG_rdn1edge = "defconfig"
+KCONFIG_MODE_rdn1edge = "--alldefconfig"
+
 #
 # Total Compute KMACHINE
 #
-- 
2.17.1

[PATCH 5/6] arm-bsp/grub: Add grub-efi support for rdn1edge

[Thomas Abraham]

From: Vivek Gautam <vivek.gautam@arm.com>

Add grub-efi as dependency to use it as OS loader after the UEFI stage.

Change-Id: I026bac25b2fdeb366add487c85636ddafb80189b
Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
---
 meta-arm-bsp/conf/machine/rdn1edge.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-arm-bsp/conf/machine/rdn1edge.conf b/meta-arm-bsp/conf/machine/rdn1edge.conf
index d86c9f7..0c78654 100644
--- a/meta-arm-bsp/conf/machine/rdn1edge.conf
+++ b/meta-arm-bsp/conf/machine/rdn1edge.conf
@@ -20,3 +20,7 @@ KERNEL_IMAGETYPE ?= "Image"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
 PREFERRED_VERSION_linux-stable ?= "5.7%"
 SERIAL_CONSOLES = "115200;ttyAMA0"
+
+#grub-efi
+EFI_PROVIDER ?= "grub-efi"
+MACHINE_FEATURES += "efi"
-- 
2.17.1

[PATCH 6/6] arm-bsp/wic: Add WIC support for rdn1edge

[Thomas Abraham]

From: Vivek Gautam <vivek.gautam@arm.com>

Use the default "mkefidisk.wks" OE kickstart file to build the disk
image for rdn1edge platform.

Change-Id: I3b887c35a322265bae09456b9aade53e4d02b8f8
Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
---
 meta-arm-bsp/conf/machine/rdn1edge.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-arm-bsp/conf/machine/rdn1edge.conf b/meta-arm-bsp/conf/machine/rdn1edge.conf
index 0c78654..5c7f45f 100644
--- a/meta-arm-bsp/conf/machine/rdn1edge.conf
+++ b/meta-arm-bsp/conf/machine/rdn1edge.conf
@@ -24,3 +24,8 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 #grub-efi
 EFI_PROVIDER ?= "grub-efi"
 MACHINE_FEATURES += "efi"
+
+#Disk Image
+IMAGE_FSTYPES += "wic"
+WKS_FILE ?= "mkefidisk.wks"
+WKS_FILE_DEPENDS_append = " ${EXTRA_IMAGEDEPENDS}"
-- 
2.17.1

Re: [meta-arm] [PATCH 4/6] arm-bsp/linux: Build Linux stable 5.7 for rdn1edge

[Jon Mason]

On Fri, Nov 20, 2020 at 09:58:42AM +0530, Thomas Abraham wrote:
> From: Vivek Gautam <vivek.gautam@arm.com>
> 
> Update linux-arm inc to add build support for rdn1edge. In addition
> to this, add machine conf to add image dependency for Linux
> components.
> 
> Change-Id: If98fae10b69193ba635bc65b386b136f171d6826
> Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>

We recently removed all of the meta-kernel kernels and the dependency
on meta-kernel from meta-arm-bsp.  See
https://lists.yoctoproject.org/g/meta-arm/message/1367

So, this patch fails to compile due to the missing dependency.  Given
that linux-yocto is currently at v5.8, wouldn't this be a better
choice (and would not necerssitate adding the meta-kernel dependnecy)?
If not, I would recommend a LTS kernel (v5.4).

Also, meta-kernel has dropped support for 5.7 in their master branch.
So this will fail to compile with meta-arm master and meta-kernel
master (which is how we and the yocto project autobuilder are testing
this), even if we added the meta-kernel dependency back.

So, please rework this and resubmit the series.

Thanks,
Jon


> ---
>  meta-arm-bsp/conf/machine/rdn1edge.conf                   | 6 ++++++
>  meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 8 ++++++++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/meta-arm-bsp/conf/machine/rdn1edge.conf b/meta-arm-bsp/conf/machine/rdn1edge.conf
> index cdc879c..d86c9f7 100644
> --- a/meta-arm-bsp/conf/machine/rdn1edge.conf
> +++ b/meta-arm-bsp/conf/machine/rdn1edge.conf
> @@ -14,3 +14,9 @@ PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
>  PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
>  
>  EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
> +
> +#Linux Stable Kernel
> +KERNEL_IMAGETYPE ?= "Image"
> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
> +PREFERRED_VERSION_linux-stable ?= "5.7%"
> +SERIAL_CONSOLES = "115200;ttyAMA0"
> diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
> index 62b1dec..42d5604 100644
> --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
> +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
> @@ -14,6 +14,7 @@ SRC_URI_append_fvp-base = " ${SRC_URI_KMETA}"
>  SRC_URI_append_fvp-base-arm32 = " ${SRC_URI_KMETA}"
>  SRC_URI_append_juno = " ${SRC_URI_KMETA}"
>  SRC_URI_append_sgi575 = " ${SRC_URI_KMETA}"
> +SRC_URI_append_rdn1edge = " ${SRC_URI_KMETA}"
>  SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}"
>  SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
>  
> @@ -70,6 +71,13 @@ KMACHINE_sgi575 = "sgi575"
>  KBUILD_DEFCONFIG_sgi575 = "defconfig"
>  KCONFIG_MODE_sgi575 = "--alldefconfig"
>  
> +#
> +# RD-N1-Edge KMACHINE
> +#
> +COMPATIBLE_MACHINE_rdn1edge = "rdn1edge"
> +KBUILD_DEFCONFIG_rdn1edge = "defconfig"
> +KCONFIG_MODE_rdn1edge = "--alldefconfig"
> +
>  #
>  # Total Compute KMACHINE
>  #
> -- 
> 2.17.1
> 

> 
> 
>