Skip to contentSkip to conversation

Bump BSP versions for Marvell A8K boards

PATCH New Sergey Matyukevich 2 participants 8 messages Sep 21, 2019

lore
Share & tools
lore
#0 lore raw

cover Bump BSP versions for Marvell A8K boards

Hi Thomas, Baruch, and all,

These patches update mainline BSP components for Marvell A8K boards. Vendor packages such as binaries-marvell and mv-ddr-marvell are updated as well. Note that updated binaries-marvell package provides common firmware supporting both A7K and A8K. So no need to specify platform for binaries-marvell anymore.

Images for MacchiatoBin defconfigs have been tested on hardware. As for clearfog_gt_8k board, I don't have access to hardware, so only build test has been completed.

Regards,
Sergey

Sergey Matyukevich (5):
binaries-marvell: bump version and use common firmware boot/mv-ddr-marvell: bump version to armada-18.12 configs/solidrun_clearfog_gt_8k: bump versions of BSP components configs/solidrun_macchiatobin_mainline: bump versions of BSP components configs/solidrun_macchiatobin_marvell: drop platform for Marvell binaries

 boot/binaries-marvell/Config.in               | 22 +------------------
 boot/binaries-marvell/binaries-marvell.hash   |  4 ++--
 boot/binaries-marvell/binaries-marvell.mk     |  6 ++---
 boot/mv-ddr-marvell/mv-ddr-marvell.hash       |  2 +-
 boot/mv-ddr-marvell/mv-ddr-marvell.mk         |  4 ++--
 configs/solidrun_clearfog_gt_8k_defconfig     | 11 +++++-----
 configs/solidrun_macchiatobin_mainline_defconfig  | 11 +++++-----
 configs/solidrun_macchiatobin_marvell_defconfig   |  1 -
 8 files changed, 19 insertions(+), 42 deletions(-)
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/5 binaries-marvell: bump version and switch to common firmware

Since release 18.12 binaries-marvell repository provides common firmware supporting both A7K and A8K SoC families.

This commit bumps package version to 18.12 and removes platform specific binary selections from Config.in. Single firmware image suitable for both A7K and A8K platforms is now specified in mk file explicitely.

---
 boot/binaries-marvell/Config.in             | 22 +--------------------
 boot/binaries-marvell/binaries-marvell.hash |  4 ++--
 boot/binaries-marvell/binaries-marvell.mk   |  6 +++---
 3 files changed, 6 insertions(+), 26 deletions(-)
boot/binaries-marvell/Config.in +1 -21
index 63052070bd..80fbecb270 100644
@@ -7,26 +7,6 @@ config BR2_TARGET_BINARIES_MARVELL
 	  reset and system control. ATF Boot Loader stage 2 (BL2) loads
 	  optional SCP_BL2 image into a platform-specific region
 	  of secure memory. This package downloads and installs such
-	  firmwares, which are needed to build ATF.
+	  firmware, which is needed to build ATF.
 
 	  https://github.com/MarvellEmbeddedProcessors/binaries-marvell/
-
-if BR2_TARGET_BINARIES_MARVELL
-
-choice
-	prompt "Marvell Armada platform"
-
-config BR2_TARGET_BINARIES_MARVELL_7040
-	bool "7040"
-
-config BR2_TARGET_BINARIES_MARVELL_8040
-	bool "8040"
-
-endchoice
-
-config BR2_TARGET_BINARIES_MARVELL_IMAGE
-	string
-	default "mrvl_scp_bl2_mss_ap_cp1_a8040.img" if BR2_TARGET_BINARIES_MARVELL_8040
-	default "mrvl_scp_bl2_mss_ap_cp1_a7040.img" if BR2_TARGET_BINARIES_MARVELL_7040
-
-endif
boot/binaries-marvell/binaries-marvell.hash +2 -2
index 0d214502a7..a7d5928a5d 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 45c348d7a62fd147e7c6a59211a77876ce5dd26de690bd45ab79c8ff891acedf binaries-marvell-14481806e699dcc6f7025dbe3e46cf26bb787791.tar.gz
-sha256 509a36bb6faa106bbc9730c23038a361ee0c860e53a4cdf9e8605c0174fe45f7	README.md
+sha256 d818c95bcd4d5c026238d6e554151184ed7fea15bce1f861f9068b97b4cd320a binaries-marvell-c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee.tar.gz
+sha256 e6d08ef60068ee72c68835001a24eb832dcba27cac0dde0f179dfb428be050ca README.md
boot/binaries-marvell/binaries-marvell.mk +3 -3
index 6c70148540..49fd8b7704 100644
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-# This is version binaries-marvell-armada-18.06
-BINARIES_MARVELL_VERSION = 14481806e699dcc6f7025dbe3e46cf26bb787791
+# This is version binaries-marvell-armada-18.12
+BINARIES_MARVELL_VERSION = c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee
 BINARIES_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,binaries-marvell,$(BINARIES_MARVELL_VERSION))
 
 BINARIES_MARVELL_LICENSE = GPL-2.0 with freertos-exception-2.0
 BINARIES_MARVELL_LICENSE_FILES = README.md
 
-BINARIES_MARVELL_IMAGE = $(call qstrip,$(BR2_TARGET_BINARIES_MARVELL_IMAGE))
+BINARIES_MARVELL_IMAGE = mrvl_scp_bl2.img
 BINARIES_MARVELL_INSTALL_IMAGES  = YES
 
 define BINARIES_MARVELL_INSTALL_IMAGES_CMDS
Signature · 1 line
2.23.0
#2 lore raw

PATCH 1/5 binaries-marvell: bump version and switch to common firmware

Quoted 28 lines · Sergey Matyukevich

Since release 18.12 binaries-marvell repository provides common firmware supporting both A7K and A8K SoC families.

This commit bumps package version to 18.12 and removes platform specific binary selections from Config.in. Single firmware image suitable for both A7K and A8K platforms is now specified in mk file explicitely.

---
 boot/binaries-marvell/Config.in             | 22 +--------------------
 boot/binaries-marvell/binaries-marvell.hash |  4 ++--
 boot/binaries-marvell/binaries-marvell.mk   |  6 +++---
 3 files changed, 6 insertions(+), 26 deletions(-)
boot/binaries-marvell/Config.in +1 -2
index 63052070bd..80fbecb270 100644
@@ -7,26 +7,6 @@ config BR2_TARGET_BINARIES_MARVELL
 	  reset and system control. ATF Boot Loader stage 2 (BL2) loads
 	  optional SCP_BL2 image into a platform-specific region
 	  of secure memory. This package downloads and installs such
-	  firmwares, which are needed to build ATF.
+	  firmware, which is needed to build ATF.
 
 	  https://github.com/MarvellEmbeddedProcessors/binaries-marvell/
-

boot/binaries-marvell/Config.in config BR2_TARGET_BINARIES_MARVELL · line 23

Quoted 10 lines
boot/binaries-marvell/Config.in +0 -10
-if BR2_TARGET_BINARIES_MARVELL
-
-choice
-	prompt "Marvell Armada platform"
-
-config BR2_TARGET_BINARIES_MARVELL_7040
-	bool "7040"
-
-config BR2_TARGET_BINARIES_MARVELL_8040
-	bool "8040"

If you remove these options, they should also be removed (in the same commit)
from the 3 defconfigs and the runtime test that use the option. This ensures bisectability.

Also, when a user-visible option is removed, legacy handling is normally
required. In this case it isn't because any existing config will still work without changes. So I've just added a remark about that to the commit message.

Quoted 28 lines
boot/binaries-marvell/Config.in +0 -9
-
-endchoice
-
-config BR2_TARGET_BINARIES_MARVELL_IMAGE
-	string
-	default "mrvl_scp_bl2_mss_ap_cp1_a8040.img" if BR2_TARGET_BINARIES_MARVELL_8040
-	default "mrvl_scp_bl2_mss_ap_cp1_a7040.img" if BR2_TARGET_BINARIES_MARVELL_7040
-
-endif
boot/binaries-marvell/binaries-marvell.hash +2 -2
index 0d214502a7..a7d5928a5d 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 45c348d7a62fd147e7c6a59211a77876ce5dd26de690bd45ab79c8ff891acedf binaries-marvell-14481806e699dcc6f7025dbe3e46cf26bb787791.tar.gz
-sha256 509a36bb6faa106bbc9730c23038a361ee0c860e53a4cdf9e8605c0174fe45f7	README.md
+sha256 d818c95bcd4d5c026238d6e554151184ed7fea15bce1f861f9068b97b4cd320a binaries-marvell-c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee.tar.gz
+sha256 e6d08ef60068ee72c68835001a24eb832dcba27cac0dde0f179dfb428be050ca README.md
boot/binaries-marvell/binaries-marvell.mk +0 -1
index 6c70148540..49fd8b7704 100644
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-# This is version binaries-marvell-armada-18.06

boot/binaries-marvell/binaries-marvell.mk line 14

Quoted 10 lines
boot/binaries-marvell/binaries-marvell.mk +3 -2
-BINARIES_MARVELL_VERSION = 14481806e699dcc6f7025dbe3e46cf26bb787791
+# This is version binaries-marvell-armada-18.12
+BINARIES_MARVELL_VERSION = c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee
 BINARIES_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,binaries-marvell,$(BINARIES_MARVELL_VERSION))
 
 BINARIES_MARVELL_LICENSE = GPL-2.0 with freertos-exception-2.0
 BINARIES_MARVELL_LICENSE_FILES = README.md
 
-BINARIES_MARVELL_IMAGE = $(call qstrip,$(BR2_TARGET_BINARIES_MARVELL_IMAGE))
+BINARIES_MARVELL_IMAGE = mrvl_scp_bl2.img

This variable is no longer useful (it's used only once), so I removed it.

Applied to master with those changes, thanks.

Regards,
Arnout

Quoted 4 lines
boot/binaries-marvell/binaries-marvell.mk +0 -0
 BINARIES_MARVELL_INSTALL_IMAGES  = YES
 
 define BINARIES_MARVELL_INSTALL_IMAGES_CMDS
#3 lore raw

PATCH 2/5 boot/mv-ddr-marvell: bump version to armada-18.12

In reply to Sergey Matyukevich

Bump version of Marvell DDR training software. This update accompanies update of the ARM Trusted Firmware used on Marvell A8K platforms.

---
 boot/mv-ddr-marvell/mv-ddr-marvell.hash | 2 +-
 boot/mv-ddr-marvell/mv-ddr-marvell.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
boot/mv-ddr-marvell/mv-ddr-marvell.hash +1 -1
index 90fab71d60..9324dd21c3 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 9aaea1f5e8bf3c9d7e735f569d130b5c2ec773c43e0cfabc9b8dee32adbf7e4e mv-ddr-marvell-99d772547314f84921268d57e53d8769197d3e21.tar.gz
+sha256 39dcc8baccb82cbc746d8f82ce7f673e1b1236e8aee0d09e7ab12c27eeb6ecda mv-ddr-marvell-618dadd1491eb2f7b2fd74313c04f7accddae475.tar.gz
boot/mv-ddr-marvell/mv-ddr-marvell.mk +2 -2
index 8d508215f8..a4e0c0467d 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# This is the commit for mv_ddr-armada-18.09.2
-MV_DDR_MARVELL_VERSION = 99d772547314f84921268d57e53d8769197d3e21
+# This is the commit for mv_ddr-armada-18.12.0
+MV_DDR_MARVELL_VERSION = 618dadd1491eb2f7b2fd74313c04f7accddae475
 MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION))
 MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial
 MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c
Signature · 1 line
2.23.0
#4 lore raw

PATCH 3/5 configs/solidrun_clearfog_gt_8k: bump versions of BSP components

In reply to Sergey Matyukevich

Bump Linux to 5.2, U-Boot to 2019.07, and ATF to armada-18.12.2.

Updated ATF uses updated binaries-marvell package which now provides common firmware supporting both A7K and A8K. So no need to specify platform for binaries-marvell anymore.

---
 configs/solidrun_clearfog_gt_8k_defconfig | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
configs/solidrun_clearfog_gt_8k_defconfig +5 -6
index a44038e663..8804ce0473 100644
@@ -1,5 +1,5 @@
 BR2_aarch64=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y
 BR2_TARGET_GENERIC_HOSTNAME="clearfog-gt-8k"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for SolidRun Clearfog GT-8K"
 
@@ -7,20 +7,19 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for SolidRun Clearfog GT-8K"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git"
-# This commit corresponds to release armada-18.09.4
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18"
+# This commit corresponds to release armada-18.12.2
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="9484123bfe29011ed44b717a23eb53a70b97ce3d"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0"
 BR2_TARGET_BINARIES_MARVELL=y
-BR2_TARGET_BINARIES_MARVELL_8040=y
 BR2_TARGET_MV_DDR_MARVELL=y
 
 # U-Boot
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog_gt_8k"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/uboot-fragment.config"
@@ -28,7 +27,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/uboot-frag
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/linux-extras.config"
Signature · 1 line
2.23.0
#5 lore raw

PATCH 4/5 configs/solidrun_macchiatobin_mainline: bump versions of BSP components

In reply to Sergey Matyukevich

Bump Linux to 5.2, U-Boot to 2019.07, and ATF to armada-18.12.2.

Updated ATF uses updated binaries-marvell package which now provides common firmware supporting both A7K and A8K. So no need to specify platform for binaries-marvell anymore.

---
 configs/solidrun_macchiatobin_mainline_defconfig | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
configs/solidrun_macchiatobin_mainline_defconfig +5 -6
index 8e5fbfa4e8..e601092d67 100644
@@ -1,5 +1,5 @@
 BR2_aarch64=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y
 BR2_TARGET_GENERIC_HOSTNAME="mcbin"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin"
 
@@ -7,20 +7,19 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git"
-# This commit corresponds to release armada-18.09.4
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18"
+# This commit corresponds to release armada-18.12.2
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="9484123bfe29011ed44b717a23eb53a70b97ce3d"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0"
 BR2_TARGET_BINARIES_MARVELL=y
-BR2_TARGET_BINARIES_MARVELL_8040=y
 BR2_TARGET_MV_DDR_MARVELL=y
 
 # U-Boot
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_USE_DEFCONFIG=y
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040"
@@ -29,7 +28,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/uboot-fragme
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin"
Signature · 1 line
2.23.0
#6 lore raw

PATCH 5/5 configs/solidrun_macchiatobin_marvell: drop platform for Marvell binaries

In reply to Sergey Matyukevich

Updated binaries-marvell package provides common firmware supporting both A7K and A8K. So no need to specify platform for binaries-marvell package anymore.

---
 configs/solidrun_macchiatobin_marvell_defconfig | 1 -
 1 file changed, 1 deletion(-)
configs/solidrun_macchiatobin_marvell_defconfig +0 -1
index 4b52e47945..4d269b9f75 100644
@@ -14,7 +14,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0"
 BR2_TARGET_BINARIES_MARVELL=y
-BR2_TARGET_BINARIES_MARVELL_8040=y
 BR2_TARGET_MV_DDR_MARVELL=y
 
 # U-Boot
Signature · 1 line
2.23.0
#7 lore raw

cover Bump BSP versions for Marvell A8K boards

In reply to Sergey Matyukevich
Quoted 15 lines · Sergey Matyukevich

Hi Thomas, Baruch, and all,

These patches update mainline BSP components for Marvell A8K boards. Vendor packages such as binaries-marvell and mv-ddr-marvell are updated as well. Note that updated binaries-marvell package provides common firmware supporting both A7K and A8K. So no need to specify platform for binaries-marvell anymore.

Images for MacchiatoBin defconfigs have been tested on hardware. As for clearfog_gt_8k board, I don't have access to hardware, so only build test has been completed.

Regards,
Sergey

Quoted 6 lines

Sergey Matyukevich (5):
binaries-marvell: bump version and use common firmware boot/mv-ddr-marvell: bump version to armada-18.12 configs/solidrun_clearfog_gt_8k: bump versions of BSP components configs/solidrun_macchiatobin_mainline: bump versions of BSP components configs/solidrun_macchiatobin_marvell: drop platform for Marvell binaries

Series applied to master, except for the last one because I essentially
squashed that into the first patch.

Also, you forgot to remove the old option from the runtime test.

Regards,
Arnout

Quoted 11 lines
 boot/binaries-marvell/Config.in               | 22 +------------------
 boot/binaries-marvell/binaries-marvell.hash   |  4 ++--
 boot/binaries-marvell/binaries-marvell.mk     |  6 ++---
 boot/mv-ddr-marvell/mv-ddr-marvell.hash       |  2 +-
 boot/mv-ddr-marvell/mv-ddr-marvell.mk         |  4 ++--
 configs/solidrun_clearfog_gt_8k_defconfig     | 11 +++++-----
 configs/solidrun_macchiatobin_mainline_defconfig  | 11 +++++-----
 configs/solidrun_macchiatobin_marvell_defconfig   |  1 -
 8 files changed, 19 insertions(+), 42 deletions(-)