Skip to contentSkip to conversation

macchiatobin: drop vendor defconfig and update bsp

PATCH New Sergey Matyukevich 2 participants 6 messages Apr 15, 2020 – Apr 16, 2020

lore
Share & tools
lore
#0 lore raw

cover macchiatobin: drop vendor defconfig and update bsp

Hello Thomas and all,

This patch series includes regular MacchiatoBin BSP maintenance. U-Boot and Linux kernel versions are updated. Besides, removal of vendor specific defconfig is suggested.

Regards,
Sergey

Sergey Matyukevich (2):
configs/solidrun_macchiatobin_mainline: bump bsp versions configs/macchiatobin: drop marvell defconfig

 DEVELOPERS                                    |  3 +-
 board/solidrun/macchiatobin/readme.txt        | 44 ++++++-------------
 ...config => solidrun_macchiatobin_defconfig} |  8 ++--
 .../solidrun_macchiatobin_marvell_defconfig   | 44 -------------------
 4 files changed, 20 insertions(+), 79 deletions(-)
 rename configs/{solidrun_macchiatobin_mainline_defconfig => solidrun_macchiatobin_defconfig} (90%)
 delete mode 100644 configs/solidrun_macchiatobin_marvell_defconfig
Signature · 1 line
2.26.0
#1 lore raw

PATCH 1/2 configs/solidrun_macchiatobin_mainline: bump bsp versions

Bump Linux to 5.6.3, U-Boot to 2020.01. New kernel and modules based on arm64 defconfig do not fit into default size filesystem anymore. So increase filesystem size to 120M.

---
 configs/solidrun_macchiatobin_mainline_defconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
configs/solidrun_macchiatobin_mainline_defconfig +5 -3
index e601092d67..f1ca7764b1 100644
@@ -1,5 +1,5 @@
 BR2_aarch64=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y
 BR2_TARGET_GENERIC_HOSTNAME="mcbin"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin"
 
@@ -19,7 +19,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="2019.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_USE_DEFCONFIG=y
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040"
@@ -28,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="5.2.14"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin"
@@ -40,6 +40,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_TARGET_ROOTFS_TAR=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg"
Signature · 1 line
2.26.0
#2 lore raw

PATCH 1/2 configs/solidrun_macchiatobin_mainline: bump bsp versions

Quoted 8 lines · On Wed, 15 Apr 2020 16:41:35 +0300 Sergey Matyukevich <[email protected]>…

Bump Linux to 5.6.3, U-Boot to 2020.01. New kernel and modules based on arm64 defconfig do not fit into default size filesystem anymore. So increase filesystem size to 120M.

---
 configs/solidrun_macchiatobin_mainline_defconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Applied to master, thanks. It would be good to see of upstream ATF could be used instead of the Marvell-specific version.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 configs/solidrun_macchiatobin_mainline: bump bsp versions

Quoted 11 lines
Quoted 8 lines

Bump Linux to 5.6.3, U-Boot to 2020.01. New kernel and modules based on arm64 defconfig do not fit into default size filesystem anymore. So increase filesystem size to 120M.

---
 configs/solidrun_macchiatobin_mainline_defconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Applied to master, thanks. It would be good to see of upstream ATF could be used instead of the Marvell-specific version.

I plan to try upstream ATF. But not yet: at the moment I have only remote access to those boards. So it is a bit risky to experiment with early boot sequence :)

Meanwhile according to quick comparison between vendor and upstream ATF versions for Marvell SoCs, PCIe driver is not yet in upstream. Though I am not sure what could be the implications for the kernel.

Thanks,
Sergey

#4 lore raw

PATCH 2/2 configs/macchiatobin: drop marvell defconfig

In reply to Sergey Matyukevich

Support for MacchiatoBin board in U-Boot and Linux has been significantly improved during the last several years. So there is not much sense in having a separate build configuration based on older vendor Linux kernel and U-Boot. Drop marvell config and rename mainline config.

---
 DEVELOPERS                                    |  3 +-
 board/solidrun/macchiatobin/readme.txt        | 44 ++++++-------------
 ...config => solidrun_macchiatobin_defconfig} |  0
 .../solidrun_macchiatobin_marvell_defconfig   | 44 -------------------
 4 files changed, 15 insertions(+), 76 deletions(-)
 rename configs/{solidrun_macchiatobin_mainline_defconfig => solidrun_macchiatobin_defconfig} (100%)
 delete mode 100644 configs/solidrun_macchiatobin_marvell_defconfig
DEVELOPERS +1 -2
index 375ab07092..3d9c976a95 100644
@@ -2308,8 +2308,7 @@ 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_mainline_defconfig
-F:	configs/solidrun_macchiatobin_marvell_defconfig
+F:	configs/solidrun_macchiatobin_defconfig
 F:	package/armbian-firmware/
 F:	package/hostapd/
 F:	package/rtl8189fs/
board/solidrun/macchiatobin/readme.txt +14 -30

59 lines not on this page · raw message

configs/solidrun_macchiatobin_defconfig renamed from configs/solidrun_macchiatobin_mainline_defconfig +0 -0
similarity index 100%
rename from configs/solidrun_macchiatobin_mainline_defconfig
rename to configs/solidrun_macchiatobin_defconfig
configs/solidrun_macchiatobin_marvell_defconfig deleted +0 -44

44 lines not on this page · raw message

Signature · 1 line
2.26.0
#5 lore raw

PATCH 2/2 configs/macchiatobin: drop marvell defconfig

Quoted 6 lines · On Wed, 15 Apr 2020 16:41:36 +0300 Sergey Matyukevich <[email protected]>…

Support for MacchiatoBin board in U-Boot and Linux has been significantly improved during the last several years. So there is not much sense in having a separate build configuration based on older vendor Linux kernel and U-Boot. Drop marvell config and rename mainline config.

Quoted 8 lines
---
 DEVELOPERS                                    |  3 +-
 board/solidrun/macchiatobin/readme.txt        | 44 ++++++-------------
 ...config => solidrun_macchiatobin_defconfig} |  0
 .../solidrun_macchiatobin_marvell_defconfig   | 44 -------------------
 4 files changed, 15 insertions(+), 76 deletions(-)
 rename configs/{solidrun_macchiatobin_mainline_defconfig => solidrun_macchiatobin_defconfig} (100%)
 delete mode 100644 configs/solidrun_macchiatobin_marvell_defconfig

I have slightly reworded the commit log, regenerated the .gitlab-ci.yml file and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com