arm-bsp/scp-firmware: Build SCP/MCP for sgi575
PATCH 1/7 arm-bsp/scp-firmware: Build SCP/MCP for sgi575
- Add bbappend recipe to build SCP and MCP firmware for SGI575.
- Add machine conf to add image dependency for SCP-firmware components
--- meta-arm-bsp/conf/machine/sgi575.conf | 11 +++++++++++ .../scp-firmware/scp-firmware-sgi575.inc | 19 +++++++++++++++++++ .../scp-firmware/scp-firmware_%.bbappend | 1 + 3 files changed, 31 insertions(+) create mode 100644 meta-arm-bsp/conf/machine/sgi575.conf create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc
meta-arm-bsp/conf/machine/sgi575.conf new file +11 -0
@@ -0,0 +1,11 @@ +# Configuration for Arm SGI575 development board + +#@TYPE: Machine +#@NAME: SGI575 +#@DESCRIPTION: Machine configuration for SGI575 + +TUNE_FEATURES = "aarch64" + +require conf/machine/include/arm/arch-armv8a.inc + +EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc new file +19 -0
@@ -0,0 +1,19 @@ +# SGI575 specific SCP configurations and build instructions + +#it’s a tested tag post-2.6.0 +SRCREV = "7a025658d8318e95dbab4259a8ff7834ae6d8061" +SCP_PLATFORM = "sgi575" +SCP_LOG_LEVEL = "INFO" + +COMPATIBLE_MACHINE_sgi575 = "sgi575" + +do_install() { + install -d ${D}/firmware + install -D "${B}/product/${SCP_PLATFORM}/scp_romfw/release/bin/scp_romfw.bin" "${D}/firmware/" + install -D "${B}/product/${SCP_PLATFORM}/scp_ramfw/release/bin/scp_ramfw.bin" "${D}/firmware/" + install -D "${B}/product/${SCP_PLATFORM}/mcp_romfw/release/bin/mcp_romfw.bin" "${D}/firmware/" +} + + +PV = "2.6.0+git${SRCPV}" +
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend +1 -0
@@ -4,5 +4,6 @@ MACHINE_SCP_REQUIRE ?= "" MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc" MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc" +MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc" require ${MACHINE_SCP_REQUIRE}
Signature · 1 line
2.28.0
PATCH 2/7 arm-bsp/fip-image: Build TFA/UEFI for sgi575
- Add bbappend recipe to build ARM-TF and UEFI firmware for SGI575.
- Add machine conf to add image dependency for ARM-TF components.
--- meta-arm-bsp/conf/machine/sgi575.conf | 7 +++++++ .../trusted-firmware-a-sgi575.inc | 18 ++++++++++++++++++ .../trusted-firmware-a_2.2.bbappend | 1 + .../recipes-bsp/uefi/edk2-firmware-sgi575.inc | 18 ++++++++++++++++++ .../uefi/edk2-firmware_git.bbappend | 1 + 5 files changed, 45 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc create mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc
meta-arm-bsp/conf/machine/sgi575.conf +7 -0
@@ -9,3 +9,10 @@ TUNE_FEATURES = "aarch64" require conf/machine/include/arm/arch-armv8a.inc EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" + +# Trusted firmware v2.2 version +PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" +PREFERRED_VERSION_trusted-firmware-a ?= "2.2%" + +EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc new file +18 -0
@@ -0,0 +1,18 @@ +# SGI575 specific TFA support + +SRC_URI_append = " ${SRC_URI_MBEDTLS}" + +COMPATIBLE_MACHINE = "sgi575" +TFA_PLATFORM = "sgi575" +TFA_BUILD_TARGET = "all fip" +TFA_INSTALL_TARGET = "bl1 fip" +TFA_DEBUG = "1" +TFA_MBEDTLS = "1" +TFA_UBOOT = "0" + +# Sgi575 needs the UEFI as bl33 +DEPENDS += "virtual/uefi-firmware" + +EXTRA_OEMAKE += "BL33=${RECIPE_SYSROOT}/firmware/uefi.bin" +EXTRA_OEMAKE += "MBEDTLS_DIR=mbedtls TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_rsa \ + ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend +1 -0
@@ -2,5 +2,6 @@ MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc" +MACHINE_TFA_REQUIRE_sgi575 = "trusted-firmware-a-sgi575.inc" require ${MACHINE_TFA_REQUIRE}
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc new file +18 -0
@@ -0,0 +1,18 @@ +SRC_URI = "\ + gitsm://github.com/tianocore/edk2.git;name=edk2;destsuffix=${S}/edk2;nobranch=1 \ + git://github.com/tianocore/edk2-platforms.git;name=edk2-platforms;destsuffix=${S}/edk2/edk2-platforms;nobranch=1 \ +" +# TAGS and commit ID +SRCREV_edk2 = "50528537b2fb0ebdf32c719a0525635c93b905c2" +SRCREV_edk2-platforms = "b972f17b329a85e6aa4d69f240d459839ba8b47c" + +# SGI575 specific EDK2 configurations +EDK2_BUILD_RELEASE = "0" +EDK2_PLATFORM = "Sgi575" +EDK2_PLATFORM_DSC = "SgiPkg/Sgi575/Sgi575.dsc" +EDK2_BIN_NAME = "BL33_AP_UEFI.fd" +EDK2_ARCH = "AARCH64" + +COMPATIBLE_MACHINE = "sgi575" + +PV ?= "202005+git${SRCPV}"
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_git.bbappend +1 -0
@@ -3,5 +3,6 @@ MACHINE_EDK2_REQUIRE ?= "" MACHINE_EDK2_REQUIRE_n1sdp = "edk2-firmware-n1sdp.inc" +MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc" require ${MACHINE_EDK2_REQUIRE}
Signature · 1 line
2.28.0
PATCH 3/7 arm-bsp/linux: Build Linux stable 5.7 for sgi575
In reply to [email protected] - Update linux-arm inc for including sgi575
- Add machine conf to add image dependency for Linux components
--- meta-arm-bsp/conf/machine/sgi575.conf | 5 +++++ .../recipes-kernel/linux/linux-arm-platforms.inc | 9 +++++++++ 2 files changed, 14 insertions(+)
meta-arm-bsp/conf/machine/sgi575.conf +5 -0
@@ -16,3 +16,8 @@ PREFERRED_VERSION_trusted-firmware-a ?= "2.2%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +# Use kernel provided by linaro +KERNEL_IMAGETYPE ?= "Image" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable" +PREFERRED_VERSION_linux-stable ?= "5.7%" +SERIAL_CONSOLES = "115200;ttyAMA0"
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +9 -0
@@ -13,6 +13,7 @@ SRC_URI_append_foundation-armv8 = " ${SRC_URI_KMETA}" 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_gem5-arm64 = " ${SRC_URI_KMETA}" SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
@@ -48,6 +49,14 @@ SRC_URI_append_fvp-base-arm32 = " file://fvp-base-arm32-dts.patch" COMPATIBLE_MACHINE_juno = "juno" KMACHINE_juno = "juno" +# +# SGI575 KMACHINE +# +COMPATIBLE_MACHINE_sgi575 = "sgi575" +KMACHINE_sgi575 = "sgi575" +KBUILD_DEFCONFIG_sgi575 = "defconfig" +KCONFIG_MODE_sgi575 = "--alldefconfig" + # # Total Compute KMACHINE #
Signature · 1 line
2.28.0
PATCH 4/7 arm-bsp/grub: Add grub-efi support for SGI575
In reply to [email protected]grub-mkimage is used make a bootable image of GRUB, grub-efi dependency in added to conf file.
--- meta-arm-bsp/conf/machine/sgi575.conf | 4 ++++ 1 file changed, 4 insertions(+)
meta-arm-bsp/conf/machine/sgi575.conf +4 -0
@@ -21,3 +21,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"
Signature · 1 line
2.28.0
PATCH 5/7 arm-bsp/sgi575: Add RAM filesystem support
In reply to [email protected]Add cpio.gz to IMAGE_FSTYPES for compressed RAM filesystem support
--- meta-arm-bsp/conf/machine/sgi575.conf | 2 ++ 1 file changed, 2 insertions(+)
meta-arm-bsp/conf/machine/sgi575.conf +2 -0
@@ -25,3 +25,5 @@ SERIAL_CONSOLES = "115200;ttyAMA0" #grub-efi EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES += "efi" + +IMAGE_FSTYPES += "cpio.gz"
Signature · 1 line
2.28.0
PATCH 6/7 arm-bsp/wic: Introduce WIC support for sgi575
In reply to [email protected] - Add custom wks script for SGI575.
- Add grub.cfg for SGI575
- Add documentation for sgi575
--- meta-arm-bsp/conf/machine/sgi575.conf | 5 ++++- meta-arm-bsp/wic/sgi575-efidisk.wks | 11 +++++++++++ meta-arm-bsp/wic/sgi575-grub.cfg | 9 +++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 meta-arm-bsp/wic/sgi575-efidisk.wks create mode 100644 meta-arm-bsp/wic/sgi575-grub.cfg
meta-arm-bsp/conf/machine/sgi575.conf +4 -1
@@ -26,4 +26,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES += "efi" -IMAGE_FSTYPES += "cpio.gz" +IMAGE_FSTYPES += "cpio.gz wic" + +WKS_FILE ?= "sgi575-efidisk.wks" +WKS_FILE_DEPENDS_append = " ${EXTRA_IMAGEDEPENDS}"
meta-arm-bsp/wic/sgi575-efidisk.wks new file +11 -0
@@ -0,0 +1,11 @@ +# short-description: Create an EFI disk image +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. Uses a custom grub.cfg file to configure the boot. + +part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024 + +part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 1024 --uuid=9c53a91b-e182-4ff1-aeac-6ee2c432ae94 + +part swap --ondisk sda --size 44 --label swap1 --fstype=swap + +bootloader --ptable gpt --configfile="sgi575-grub.cfg" --timeout=5
meta-arm-bsp/wic/sgi575-grub.cfg new file +9 -0
@@ -0,0 +1,9 @@ +set debug="loader,mm" +set term="vt100" +set default="0" +set timeout="1" + +menuentry 'Arm reference image boot on sgi575' { + linux /Image acpi=force console=ttyAMA0,115200 ip=dhcp root=PARTUUID=9c53a91b-e182-4ff1-aeac-6ee2c432ae94 rootwait verbose debug +} +
Signature · 1 line
2.28.0
PATCH 7/7 arm/trusted-firmware-a: add branch name for mbedtls
In reply to [email protected]It appears that the mbedtls team have moved the SHA which meta-arm was using from master branch. It is still present in mbedtls-2.16 branch so this is now used.
--- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb +1 -1
@@ -21,7 +21,7 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89 # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 # -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls" +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.16" # mbed TLS v2.16.2 SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb"
Signature · 1 line
2.28.0
Hi Prabin,
This branch needs rebasing, can you do that please?
error: patch failed:
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend:4
Ross
Quoted 73 lines · Prabin CA
- Add bbappend recipe to build SCP and MCP firmware for SGI575.
- Add machine conf to add image dependency for SCP-firmware componentsChange-Id Ic888ee11178979e5ec068f85a5e0d7f2cabb7f5eSigned-off-by Prabin CA <[email protected]>--- meta-arm-bsp/conf/machine/sgi575.conf | 11 +++++++++++ .../scp-firmware/scp-firmware-sgi575.inc | 19 +++++++++++++++++++ .../scp-firmware/scp-firmware_%.bbappend | 1 + 3 files changed, 31 insertions(+) create mode 100644 meta-arm-bsp/conf/machine/sgi575.conf create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.incmeta-arm-bsp/conf/machine/sgi575.conf new file +11
-0@@ -0,0 +1,11 @@ +# Configuration for Arm SGI575 development board + +#@TYPE: Machine +#@NAME: SGI575 +#@DESCRIPTION: Machine configuration for SGI575 + +TUNE_FEATURES = "aarch64" + +require conf/machine/include/arm/arch-armv8a.inc + +EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc new file +19
-0@@ -0,0 +1,19 @@ +# SGI575 specific SCP configurations and build instructions + +#it’s a tested tag post-2.6.0 +SRCREV = "7a025658d8318e95dbab4259a8ff7834ae6d8061" +SCP_PLATFORM = "sgi575" +SCP_LOG_LEVEL = "INFO" + +COMPATIBLE_MACHINE_sgi575 = "sgi575" + +do_install() { + install -d ${D}/firmware + install -D "${B}/product/${SCP_PLATFORM}/scp_romfw/release/bin/scp_romfw.bin" "${D}/firmware/" + install -D "${B}/product/${SCP_PLATFORM}/scp_ramfw/release/bin/scp_ramfw.bin" "${D}/firmware/" + install -D "${B}/product/${SCP_PLATFORM}/mcp_romfw/release/bin/mcp_romfw.bin" "${D}/firmware/" +} + + +PV = "2.6.0+git${SRCPV}" +meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend +1
-1@@ -4,5 +4,6 @@ MACHINE_SCP_REQUIRE ?= "" MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc" MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc" +MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc" require ${MACHINE_SCP_REQUIRE} --2.28.0
All merged to master, thanks.
Ross
Quoted 84 lines · Ross Burton
Hi Prabin,
This branch needs rebasing, can you do that please?
error: patch failed:
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend:4Ross
Quoted 73 lines · Prabin CA
- Add bbappend recipe to build SCP and MCP firmware for SGI575.
- Add machine conf to add image dependency for SCP-firmware componentsChange-Id Ic888ee11178979e5ec068f85a5e0d7f2cabb7f5eSigned-off-by Prabin CA <[email protected]>--- meta-arm-bsp/conf/machine/sgi575.conf | 11 +++++++++++ .../scp-firmware/scp-firmware-sgi575.inc | 19 +++++++++++++++++++ .../scp-firmware/scp-firmware_%.bbappend | 1 + 3 files changed, 31 insertions(+) create mode 100644 meta-arm-bsp/conf/machine/sgi575.conf create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.incmeta-arm-bsp/conf/machine/sgi575.conf new file +11
-0@@ -0,0 +1,11 @@ +# Configuration for Arm SGI575 development board + +#@TYPE: Machine +#@NAME: SGI575 +#@DESCRIPTION: Machine configuration for SGI575 + +TUNE_FEATURES = "aarch64" + +require conf/machine/include/arm/arch-armv8a.inc + +EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc new file +19
-0@@ -0,0 +1,19 @@ +# SGI575 specific SCP configurations and build instructions + +#it’s a tested tag post-2.6.0 +SRCREV = "7a025658d8318e95dbab4259a8ff7834ae6d8061" +SCP_PLATFORM = "sgi575" +SCP_LOG_LEVEL = "INFO" + +COMPATIBLE_MACHINE_sgi575 = "sgi575" + +do_install() { + install -d ${D}/firmware + install -D "${B}/product/${SCP_PLATFORM}/scp_romfw/release/bin/scp_romfw.bin" "${D}/firmware/" + install -D "${B}/product/${SCP_PLATFORM}/scp_ramfw/release/bin/scp_ramfw.bin" "${D}/firmware/" + install -D "${B}/product/${SCP_PLATFORM}/mcp_romfw/release/bin/mcp_romfw.bin" "${D}/firmware/" +} + + +PV = "2.6.0+git${SRCPV}" +meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend +1
-1@@ -4,5 +4,6 @@ MACHINE_SCP_REQUIRE ?= "" MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc" MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc" +MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc" require ${MACHINE_SCP_REQUIRE} --2.28.0