macchiatobin: bump kernel and u-boot versions
PATCH 1/1 macchiatobin: bump kernel and u-boot versions
Bump Linux to 4.15 and U-Boot to 2018.01. Remove networking dts patches since they has landed in Linux 4.15. Update readme.txt: fix mainline BSP versions and update boot selection for board rev 1.3.
Signed-off-by Sergey Matyukevich <[email protected]>
--- ...arvell-extend-the-cp110-syscon-register-a.patch | 45 -------- ...arvell-add-comphy-nodes-on-cp110-master-a.patch | 118 --------------------- ...arvell-mcbin-add-comphy-references-to-Eth.patch | 58 ---------- board/solidrun/macchiatobin/readme.txt | 26 +++-- configs/solidrun_macchiatobin_mainline_defconfig | 7 +- 5 files changed, 20 insertions(+), 234 deletions(-) delete mode 100644 board/solidrun/macchiatobin/patches/linux/0001-arm64-dts-marvell-extend-the-cp110-syscon-register-a.patch delete mode 100644 board/solidrun/macchiatobin/patches/linux/0002-arm64-dts-marvell-add-comphy-nodes-on-cp110-master-a.patch delete mode 100644 board/solidrun/macchiatobin/patches/linux/0003-arm64-dts-marvell-mcbin-add-comphy-references-to-Eth.patch
board/solidrun/macchiatobin/patches/linux/0001-arm64-dts-marvell-extend-the-cp110-syscon-register-a.patch deleted +0 -45
@@ -1,45 +0,0 @@ -From c25a2b8559989011d43fb901824dd8b981fc6b7b Mon Sep 17 00:00:00 2001 -From: Sergey Matyukevich <[email protected]> -Date: Fri, 8 Dec 2017 23:08:34 +0300 -Subject: [PATCH] arm64: dts: marvell: extend the cp110 syscon register area length - -This patch extends on both cp110 the system register area length to -include some of the comphy registers as well. - -Signed-off-by: Antoine Tenart <[email protected]> -Signed-off-by: Gregory CLEMENT <[email protected]> -Signed-off-by: Sergey Matyukevich <[email protected]> ---- - arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 +- - arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi -index f2aa2a81de4d..4dd8c7d53764 100644 ---- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi -+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi -@@ -143,7 +143,7 @@ - - cpm_syscon0: system-controller at 440000 { - compatible = "syscon", "simple-mfd"; -- reg = <0x440000 0x1000>; -+ reg = <0x440000 0x2000>; - - cpm_clk: clock { - compatible = "marvell,cp110-clock"; -diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi -index 4fe70323abb3..43fa491da6ce 100644 ---- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi -+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi -@@ -143,7 +143,7 @@ - - cps_syscon0: system-controller at 440000 { - compatible = "syscon", "simple-mfd"; -- reg = <0x440000 0x1000>; -+ reg = <0x440000 0x2000>; - - cps_clk: clock { - compatible = "marvell,cp110-clock"; --- -2.11.0 -
board/solidrun/macchiatobin/patches/linux/0002-arm64-dts-marvell-add-comphy-nodes-on-cp110-master-a.patch deleted +0 -118
118 lines not on this page · raw message
board/solidrun/macchiatobin/patches/linux/0003-arm64-dts-marvell-mcbin-add-comphy-references-to-Eth.patch deleted +0 -58
58 lines not on this page · raw message
board/solidrun/macchiatobin/readme.txt +17 -9
@@ -15,8 +15,8 @@ How to build There are two build options: mainline support and vendor support. For the mainline BSP, we use: - - Linux v4.14.4 - - U-Boot v2017.11 + - Linux v4.15 + - U-Boot v2018.01 For the vendor BSP, we use the sources available from Marvell Github page at https://github.com/MarvellEmbeddedProcessors, which uses:
@@ -24,10 +24,10 @@ page at https://github.com/MarvellEmbeddedProcessors, which uses: - U-Boot v2017.03 At the moment mainline support for the board is a work in progress. -Mainline kernel 4.14 with provided patches enables eth2 in 1Gb (RJ45 -connector J5) and eth0 in 10Gb (SFP connector J15). The vendor BSP -enables more hardware features out of the box, e.g. all the network -interfaces. +Mainline kernel 4.15 enables eth2 in 1Gb (RJ45 connector J5) and +eth0 in 10Gb (SFP connector CON15 and RJ45 connector CON16). +The vendor BSP enables more hardware features out of the box, +e.g. all the network interfaces. To use the mainline BSP run the following commands:
@@ -54,13 +54,21 @@ How to boot the board ===================== The MacchiatoBin board can be setup to load the bootloader from -different sources including eMMC, SPI flash, and SD-card. In order to -select boot from SD-card DIP switches SW1 and SW2 should be configured -as follows: +different sources including eMMC, SPI flash, and SD-card. + +On Rev 1.2 board to select boot from SD-card the DIP switches +SW1 and SW2 should be configured as follows: SW2: 01110 SW1: 1xxxx +The upcoming Rev 1.3 board will have a single pins header J1 instead +of the SW1/2 DIP switches. To boot from SD-card the setting of J1 +jumpers should match the DIP switches of Rev v1.2 board +from left to right: + +J1: 011101xxxx + Insert the micro SDcard in the MacchiatoBin board and power it up. The serial console is accessible at the micro-USB Type-B connector marked CON9. The serial line settings are 115200 8N1.
configs/solidrun_macchiatobin_mainline_defconfig +3 -4
@@ -1,6 +1,5 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/solidrun/macchiatobin/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_TARGET_GENERIC_HOSTNAME="mcbin" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin"
@@ -21,12 +20,12 @@ 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="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" 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.16.1
PATCH 1/1 macchiatobin: bump kernel and u-boot versions
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Sergey" == Sergey Matyukevich <[email protected]> writes:
Bump Linux to 4.15 and U-Boot to 2018.01. Remove networking dts patches since they has landed in Linux 4.15. Update readme.txt: fix mainline BSP versions and update boot selection for board rev 1.3.
Signed-off-by Sergey Matyukevich <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard