Misc fixes after mv-ddr-marvell update
cover Misc fixes after mv-ddr-marvell update
Hi all,
This patch series includes several fixes and updates related to mv-ddr-marvell package update. Major changes include fixes and updates for MacchiatoBin board BSP as well as updates for ATF unit tests. MacchiatoBin board config has been updated to use upstream ATF instead of Marvell ATF. TestATFMarvell unit test has been removed since there are no other Marvell ATF users in Buildroot.
Sergey Matyukevich (4):
configs/solidrun_macchiatobin: bump BSP components support/testing: remove TestATFMarvell support/testing: fix TestATFAllwinner test
DEVELOPERS: remove S. Matyukevich from mcbin BSP components
DEVELOPERS | 4 ---- configs/solidrun_macchiatobin_defconfig | 13 +++++------ support/testing/tests/boot/test_atf.py | 30 ++----------------------- 3 files changed, 8 insertions(+), 39 deletions(-)
Signature · 1 line
2.30.0
PATCH 1/4 configs/solidrun_macchiatobin: bump BSP components
Bump U-Boot and Linux kernel versions. Fix recent build failures caused by mv-ddr-marvell package update. Marvell ATF does not provide a version compatible with up-to-date mv-ddr-marvell. According to commit log, Marvell developers are now contributing directly to upstream ATF. So switch to upstream ATF instead of using older Marvell ATF versions.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/938922500
--- configs/solidrun_macchiatobin_defconfig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
configs/solidrun_macchiatobin_defconfig +6 -7
@@ -1,17 +1,16 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="mcbin" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin" # Firmware 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.12.2 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="9484123bfe29011ed44b717a23eb53a70b97ce3d" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" 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_TARGETS="mrvl_flash" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" BR2_TARGET_BINARIES_MARVELL=y BR2_TARGET_MV_DDR_MARVELL=y
@@ -19,7 +18,7 @@ BR2_TARGET_MV_DDR_MARVELL=y # U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040"
@@ -28,7 +27,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="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.5" 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.30.0
PATCH 1/4 configs/solidrun_macchiatobin: bump BSP components
Quoted 6 lines · On Sun, 10 Jan 2021 17:16:26 +0300 Sergey Matyukevich <[email protected]>…
Bump U-Boot and Linux kernel versions. Fix recent build failures caused by mv-ddr-marvell package update. Marvell ATF does not provide a version compatible with up-to-date mv-ddr-marvell. According to commit log, Marvell developers are now contributing directly to upstream ATF. So switch to upstream ATF instead of using older Marvell ATF versions.
Quoted 7 lines
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/938922500Signed-off-by Sergey Matyukevich <[email protected]>--- configs/solidrun_macchiatobin_defconfig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
Thanks, series applied!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/4 support/testing: remove TestATFMarvell
In reply to Sergey MatyukevichThere were only two users of Marvell ATF: SolidRun MacchiatoBin board and ClearFrog GT 8k board. After mv-ddr-marvell package update both boards switched to upstream ATF. Remove tests for now unused Marvell ATF.
--- support/testing/tests/boot/test_atf.py | 27 -------------------------- 1 file changed, 27 deletions(-)
support/testing/tests/boot/test_atf.py +0 -27
@@ -53,30 +53,3 @@ class TestATFAllwinner(infra.basetest.BRTest): def test_run(self): pass - - -class TestATFMarvell(infra.basetest.BRTest): - config = \ - """ - BR2_aarch64=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y - 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" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18" - 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_MV_DDR_MARVELL=y - BR2_TARGET_UBOOT=y - BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" - BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" - BR2_TARGET_UBOOT_NEEDS_DTC=y - """ - - def test_run(self): - pass
Signature · 1 line
2.30.0
PATCH 3/4 support/testing: fix TestATFAllwinner test
In reply to Sergey MatyukevichFix U-Boot config snippet in TestATFAllwinner. Bump U-Boot version to fix DTC build on hosts with gcc 10 and add pylibfdt dependency.
--- support/testing/tests/boot/test_atf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
support/testing/tests/boot/test_atf.py +2 -1
@@ -41,9 +41,10 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" BR2_TARGET_UBOOT_NEEDS_DTC=y + BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
Signature · 1 line
2.30.0
PATCH 4/4 DEVELOPERS: remove S. Matyukevich from mcbin BSP components
In reply to Sergey MatyukevichI do not have access to MacchiatoBin hardware anymore. So remove its BSP components from my watch list.
--- DEVELOPERS | 4 ---- 1 file changed, 4 deletions(-)
DEVELOPERS +0 -4
@@ -2355,18 +2355,14 @@ F: package/mpir/ N: Sergey Matyukevich <[email protected]> F: boot/arm-trusted-firmware/ -F: boot/binaries-marvell/ -F: boot/mv-ddr-marvell/ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ -F: board/solidrun/macchiatobin F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig -F: configs/solidrun_macchiatobin_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/
Signature · 1 line
2.30.0