linux and uboot version bumps and cleanup
v2 cover linux and uboot version bumps and cleanup
Changelog:
V2:
- consildate uboot and linux version bump patches into one single patch per board config file
- Logically reorder all nanopi m1 plus patches
- Remove BR2_GLOBAL_PATCH_DIR option from nanopi_m1_plus_defconfig
Shyam Saini (7):
configs: pine64_sopine: Bump to the linux 5.0 and u-boot 2019.01
configs: orangepi_prime: Bump to the linux 5.0 and u-boot 2019.01
configs: olimex_a64_olinuxino: Bump to the linux 5.0 and u-boot
2019.01
configs: orangepi_plus: Bump to the linux 5.0 and u-boot 2019.01
configs: nanopi_m1: Bump to the linux 5.0 and u-boot 2019.01
configs: nanopi_m1_plus: Bump to the linux 5.0 and u-boot 2019.01
board: friendlyarm: nanopi-m1-plus: patches: Remove linux patch
...ts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch | 103 --------------------- configs/nanopi_m1_defconfig | 8 +- configs/nanopi_m1_plus_defconfig | 9 +- configs/olimex_a64_olinuxino_defconfig | 8 +- configs/orangepi_plus_defconfig | 8 +- configs/orangepi_prime_defconfig | 8 +- configs/pine64_sopine_defconfig | 8 +- 7 files changed, 24 insertions(+), 128 deletions(-) delete mode 100644 board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch
Signature · 1 line
2.11.0
PATCH v2 1/7 configs: pine64_sopine: Bump to the linux 5.0 and u-boot 2019.01
This bumps to linux/linux-headers 5.0 and u-boot version 2019.01
--- configs/pine64_sopine_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
configs/pine64_sopine_defconfig +4 -4
@@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y 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="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sopine_baseboard" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-sopine-baseboard"
Signature · 1 line
2.11.0
PATCH v2 2/7 configs: orangepi_prime: Bump to the linux 5.0 and u-boot 2019.01
In reply to Shyam SainiThis bumps to linux/linux-headers 5.0 and u-boot version 2019.01
--- configs/orangepi_prime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
configs/orangepi_prime_defconfig +4 -4
@@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y 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="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime"
Signature · 1 line
2.11.0
PATCH v2 3/7 configs: olimex_a64_olinuxino: Bump to the linux 5.0 and u-boot 2019.01
In reply to Shyam SainiThis bumps to linux/linux-headers 5.0 and u-boot version 2019.01
--- configs/olimex_a64_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
configs/olimex_a64_olinuxino_defconfig +4 -4
@@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y 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="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino"
Signature · 1 line
2.11.0
PATCH v2 4/7 configs: orangepi_plus: Bump to the linux 5.0 and u-boot 2019.01
In reply to Shyam SainiThis bumps to linux/linux-headers 5.0 and u-boot version 2019.01
--- configs/orangepi_plus_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
configs/orangepi_plus_defconfig +4 -4
@@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Plus"
@@ -14,7 +14,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Plus" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
@@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus"
Signature · 1 line
2.11.0
PATCH v2 5/7 configs: nanopi_m1: Bump to the linux 5.0 and u-boot 2019.01
In reply to Shyam SainiThis bumps to linux/linux-headers 5.0 and u-boot version 2019.01
--- configs/nanopi_m1_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
configs/nanopi_m1_defconfig +4 -4
@@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1"
@@ -14,7 +14,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1"
Signature · 1 line
2.11.0
PATCH v2 6/7 configs: nanopi_m1_plus: Bump to the linux 5.0 and u-boot 2019.01
In reply to Shyam SainiThis bumps to linux/linux-headers 5.0 and u-boot version 2019.01
--- configs/nanopi_m1_plus_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
configs/nanopi_m1_plus_defconfig +4 -4
@@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1-plus"
@@ -14,7 +14,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1 Plus" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_GLOBAL_PATCH_DIR="board/friendlyarm/nanopi-m1-plus/patches/" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y
Signature · 1 line
2.11.0
PATCH v2 7/7 board: friendlyarm: nanopi-m1-plus: patches: Remove linux patch
In reply to Shyam SainiPrior to linux v4.13, there was no support for Nanopi M1 Plus so we used a custom device tree patch file for this puspose. In the preceeding patch, linux is bumped to newer version which has support for the board in question and thus makes this patch file obselete. So lets drop it.
This also removes buildroot BR2_GLOBAL_PATCH_DIR option which is no longer needed
--- ...ts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch | 103 --------------------- configs/nanopi_m1_plus_defconfig | 1 - 2 files changed, 104 deletions(-) delete mode 100644 board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch
board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch deleted +0 -103
@@ -1,103 +0,0 @@ -From 4ec28d4e1040b94c66e97aa77071c9ef3478f022 Mon Sep 17 00:00:00 2001 -From: Chakra Divi <[email protected]> -Date: Thu, 6 Jul 2017 18:22:35 +0530 -Subject: [PATCH] ARM: dts: nanopi-m1-plus : add dts to linux 4.11.5 - -This patch is used to add nanopi-m1-plus dts -file in linux source code helps to add nanopi-m1-plus -board support in buildroot and is part of the linux -main-line ; refer to the below link for info -[https://patchwork.kernel.org/patch/9755033] - -Signed-off-by: Chakra Divi <[email protected]> ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 64 +++++++++++++++++++++++++ - 2 files changed, 65 insertions(+) - create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 0118084..928e5d3 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -867,6 +867,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ - sun8i-h3-bananapi-m2-plus.dtb \ - sun8i-h3-beelink-x2.dtb \ - sun8i-h3-nanopi-m1.dtb \ -+ sun8i-h3-nanopi-m1-plus.dtb \ - sun8i-h3-nanopi-neo.dtb \ - sun8i-h3-orangepi-2.dtb \ - sun8i-h3-orangepi-lite.dtb \ -diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts -new file mode 100644 -index 0000000..8ddd1b2 ---- /dev/null -+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts -@@ -0,0 +1,64 @@ -+/* -+ * Copyright (C) 2017 Jagan Teki <[email protected]> -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "sun8i-h3-nanopi.dtsi" -+ -+/ { -+ model = "FriendlyArm NanoPi M1 Plus"; -+ compatible = "friendlyarm,nanopi-m1-plus", "allwinner,sun8i-h3"; -+}; -+ -+&ehci1 { -+ status = "okay"; -+}; -+ -+&ehci2 { -+ status = "okay"; -+}; -+ -+&ohci1 { -+ status = "okay"; -+}; -+ -+&ohci2 { -+ status = "okay"; -+}; --- -1.7.9.5 -
configs/nanopi_m1_plus_defconfig +0 -1
@@ -25,7 +25,6 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_GLOBAL_PATCH_DIR="board/friendlyarm/nanopi-m1-plus/patches/" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1-plus"
Signature · 1 line
2.11.0
v2 cover linux and uboot version bumps and cleanup
In reply to Shyam SainiHello Shyam,
Quoted 7 lines · On Tue, 9 Apr 2019 21:14:56 +0530 Shyam Saini…
- Logically reorder all nanopi m1 plus patches
- RemoveBR2_GLOBAL_PATCH_DIRoption fromnanopi_m1_plus_defconfigShyam Saini (7):
configs:pine64_sopine: Bump to the linux 5.0 and u-boot 2019.01
configs:orangepi_prime: Bump to the linux 5.0 and u-boot 2019.01
configs:olimex_a64_olinuxino: Bump to the linux 5.0 and u-boot
Quoted 5 lines
2019.01configs:
orangepi_plus: Bump to the linux 5.0 and u-boot 2019.01
configs:nanopi_m1: Bump to the linux 5.0 and u-boot 2019.01
configs:nanopi_m1_plus: Bump to the linux 5.0 and u-boot 2019.01
board: friendlyarm: nanopi-m1-plus: patches: Remove linux patch
This was still wrong: if I apply the first 6 patches but not the last one, the nanopi_m1_plus defconfig is broken: you try to build Linux 5.0 but apply a patch that was made for Linux 4.13. The last two patches should have been squashed together to form a single patch.
Also, the commit title prefix should follow the format "configs/<configname>".
I have fixed those issues and applied. Thanks!
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com