From patchwork Sun Feb 11 15:56:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 871773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FgNRD0Hp"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zfYMt44yFz9s7f for ; Mon, 12 Feb 2018 02:57:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9970F869D2; Sun, 11 Feb 2018 15:57:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w0ednFh7iNha; Sun, 11 Feb 2018 15:57:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0902986AFB; Sun, 11 Feb 2018 15:57:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7EBCE1C064E for ; Sun, 11 Feb 2018 15:57:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7AA062CB96 for ; Sun, 11 Feb 2018 15:57:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aa2DdGTvV-85 for ; Sun, 11 Feb 2018 15:57:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by silver.osuosl.org (Postfix) with ESMTPS id 0719A27A45 for ; Sun, 11 Feb 2018 15:57:06 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id w10so4561398lfc.9 for ; Sun, 11 Feb 2018 07:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1RNA/F1jGgZy8+cXs1RnNNbl43t5KOrpqoGmWp3Wgws=; b=FgNRD0HplF8v4jZwMW0D+0M8jRK0Tl1eGA0/RSbLM5Zra3QH9kDXxMCIOL+0nNsI16 S0yHDKoKZrVe/K0ixNrmf1s08vvkgkRZOhPdqOSMtifrQQxakBzvAjhzj4PdnTEcBWK9 pUNzeDsMBvom4HnCcJO5KlnyyEa28oCj60megBqREqAqUiW2anjIpg8hg1dD2AD+aSx8 627Bd7e9+9lOk68fckWZ1I65VF6blyGGlG7uBgc2IRRZ+HhZdHIrRYg3YnJh0Bm+Zl0Y 4JKR4/kL5TLy6YqzJWAHZzjrkW2DdnY4tI63IRd7+zFvLxh3ntmJjtifhSDBZGa00NoZ cymQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1RNA/F1jGgZy8+cXs1RnNNbl43t5KOrpqoGmWp3Wgws=; b=U4zEf5JrnZezxHeyivgF6aXFn+2DeztEVGk2NbtC+azjsjsrwqc+1b/laPP3ESbtW8 ZA+UJ/5WCyGG/FZZcRQFZm/CjD8JVub5YVq2b71ZchHevae8/mOAgKuLZaMlm2O+SJp8 t5lWt05AkE5tQYZdqhUlql55LDhAf63am7eub/DSEhpZsFQ+H1AWSJBovdnLSTSmXkUc v6DZ2Xe1kmAgll21/bowWkVRgYTQyplgp2lucFDeGrJk++rWVJdCqkS084odmQWHVBym ciI4Xh16DUclSkqX/I+iInHUqSDfW5pO0tmJe/PXDHPrcyt7Iw7YBfVrmeKaluNXQOJy Je2g== X-Gm-Message-State: APf1xPA2WSh8qNBPTte0VR3bUGsbnS/xsu+uHkUmQz7f1cfa+5bDCxj8 +Eu1GW0UFgtDMzOXoA1xMYi9lUiq X-Google-Smtp-Source: AH8x226xfcUYzGg2M/XnrKYEXHiY2L29KNkRNVGbpb66YUq/bqP1OcYfEC7D5+P5XG1RHFEkAz4RXw== X-Received: by 10.25.99.204 with SMTP id v73mr4963773lfi.137.1518364624050; Sun, 11 Feb 2018 07:57:04 -0800 (PST) Received: from speedy.hunter (ppp91-122-144-182.pppoe.avangarddsl.ru. [91.122.144.182]) by smtp.gmail.com with ESMTPSA id b76sm1322498lfh.90.2018.02.11.07.57.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2018 07:57:03 -0800 (PST) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sun, 11 Feb 2018 18:56:48 +0300 Message-Id: <20180211155649.21996-2-geomatsi@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180211155649.21996-1-geomatsi@gmail.com> References: <20180211155649.21996-1-geomatsi@gmail.com> Subject: [Buildroot] [PATCH/next 1/2] orange-pi-zero-plus2: bump kernel and u-boot versions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jagan Teki , Sergey Matyukevich MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Bump versions: - use U-Boot 2008.01 - use Linux kernel v4.15.2 Drop patch with dts sdcard fix since it has been merged to Linux v4.15. Signed-off-by: Sergey Matyukevich --- ...ts-orange-pi-zero-plus2-fix-sdcard-detect.patch | 30 ---------------------- configs/orangepi_zero_plus2_defconfig | 11 +++----- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch diff --git a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch b/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch deleted file mode 100644 index 203402932b..0000000000 --- a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f88e9301948173dd35afad4a6939092c7f269aed Mon Sep 17 00:00:00 2001 -From: Sergey Matyukevich -Date: Fri, 3 Nov 2017 22:58:54 +0300 -Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: fix sdcard detect - -The sdcard detect pin on orange-pi-zero-plus2 is pulled up. -Fix cd-gpio description to enable sdcard detect. - -Signed-off-by: Sergey Matyukevich -Signed-off-by: Maxime Ripard ---- - arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -index b6b7a56..a42fd79 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -@@ -71,7 +71,7 @@ - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; - vmmc-supply = <®_vcc3v3>; - bus-width = <4>; -- cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; - status = "okay"; - }; - --- -1.9.1 - diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 5b1ff3500c..7906dba5c7 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,11 +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 - -# Patch dir -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches" +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -20,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="2018.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y @@ -34,7 +31,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/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="4.15.2" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"