From patchwork Sun Feb 16 21:19:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 1238855 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BhPPlFDv; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LKky5t0wz9sRJ for ; Mon, 17 Feb 2020 08:19:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5B750870AD; Sun, 16 Feb 2020 21:19:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y0wZsxTGDD4y; Sun, 16 Feb 2020 21:19:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3170787113; Sun, 16 Feb 2020 21:19:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 642E21BF574 for ; Sun, 16 Feb 2020 21:19:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 60F21870D7 for ; Sun, 16 Feb 2020 21:19:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 86CM6eU4B9va for ; Sun, 16 Feb 2020 21:19:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id BED1E8709D for ; Sun, 16 Feb 2020 21:19:45 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id b17so16356004wmb.0 for ; Sun, 16 Feb 2020 13:19:45 -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 :mime-version:content-transfer-encoding; bh=SkfX7PJCykYqJ4gpbKhbBBw6zQ7CxJS1GWWuA7tIW5I=; b=BhPPlFDv+RcRuTIIjQUATGaoWV93HyJgfy4eZY0HRTsFCU9vHwi/HlnvJsenEjYL7h 0K8z2jtWMo9pXN1rPixlmNObEZbHXvC/Dn3FgXwT8OdzaTTLPpMyT7isMV+GuXWolg84 8vONthACNBSBpDkrLGV3N6Y/nf3W1iSjacRD0s19gfoFiufBf6dPW1lR2S8quEckNz2r JgRqGbDd3pb3v1WWoYpeVQT9EoghiJ1SnrE/HyBzPYDB0kFboLSoYxFPkZBQ+7FXrjbD R+bqjqz9ZeDF2UT0OeOgvR/3wVNIU/tgv9H5rFuqZc2Dz7Z5T5nSfhdWRwlmyXFwdgPV RdmA== 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:mime-version:content-transfer-encoding; bh=SkfX7PJCykYqJ4gpbKhbBBw6zQ7CxJS1GWWuA7tIW5I=; b=pDsRUnS7UMvY2pfiJE1d3MoOIDHuepb1PjqfMLYu+pdN7zSmgSfjTgGmHh5vIUILik Iw4QWPjYqADBZ4ZyFDV2HyS/zvBtl77oXiEVojAwHW38Qla9GkTWsTWwzRXzfjBz+6eC pzgXRksXJOqRZevTWE36cLWryEJughGWRk64GgO+Un+FHQTfKZjZRjiY2zAuj09o40mY a9lOD0VOc5VIg+qMOcS2kr2ChL3xRR1Fr+nAj4gNAEH6cgT4yzet4LJLDKdEYf7/5rVc 2Ls4NLdPG9h7vpCKaVJpdN1bkTyGD4U/5ndZ1NYn3qsVWarCR0jcFqlWvRqpoYFY1WTJ Vc1g== X-Gm-Message-State: APjAAAUxnSYio3k5K3hfe3DNOAvj3go/Xe0NkQfVMrS04JRUFoOSrfSJ yEbBJO4xSkwK1vCxuu5Oju9Qy+O8UhM= X-Google-Smtp-Source: APXvYqzbLuL1WQYCnxfdKVuIPfLVJ688hL3L7YMEulO5OjSOhx2Dj3Wa+mXw6eDNgnONN4/cq3H/4w== X-Received: by 2002:a7b:c190:: with SMTP id y16mr18011246wmi.107.1581887983615; Sun, 16 Feb 2020 13:19:43 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::42f0:c285]) by smtp.gmail.com with ESMTPSA id f1sm17688592wro.85.2020.02.16.13.19.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2020 13:19:43 -0800 (PST) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: buildroot@buildroot.org Date: Sun, 16 Feb 2020 22:19:35 +0100 Message-Id: <20200216211937.27200-2-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200216211937.27200-1-peron.clem@gmail.com> References: <20200216211937.27200-1-peron.clem@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/4] configs/beeelink_gs1: bump to U-boot 2020.01 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= , Spenser Gilliland , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The U-boot patch has been upstreamed. Bump U-boot version and drop the patch. Signed-off-by: Clément Péron --- ...01-arm-dts-sync-dts-for-Allwinner-H6.patch | 279 ------------------ configs/beelink_gs1_defconfig | 3 +- 2 files changed, 1 insertion(+), 281 deletions(-) delete mode 100644 board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch diff --git a/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch b/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch deleted file mode 100644 index 8e695f6416b9..000000000000 --- a/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch +++ /dev/null @@ -1,279 +0,0 @@ -From 99cade8743158889b3e8db93c003b3318ebd4bda Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= -Date: Sun, 11 Aug 2019 22:38:57 +0200 -Subject: [PATCH] arm: dts: sync dts for Allwinner H6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Sync Kernel DTS for Allwinner H6 boards. - -Drop /omit-if-no-ref/ keyword as it's not supported by U-boot. - -commit Linux 5.3-rc4 - -Signed-off-by: Clément Péron ---- - arch/arm/dts/sun50i-h6-beelink-gs1.dts | 76 ++++++++++++++++++++++++++ - arch/arm/dts/sun50i-h6-pine-h64.dts | 12 ++++ - arch/arm/dts/sun50i-h6.dtsi | 46 +++++++++++++++- - 3 files changed, 131 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts -index 54b0882bed..0dc33c90dd 100644 ---- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts -+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts -@@ -14,6 +14,7 @@ - compatible = "azw,beelink-gs1", "allwinner,sun50i-h6"; - - aliases { -+ ethernet0 = &emac; - serial0 = &uart0; - }; - -@@ -21,6 +22,17 @@ - stdout-path = "serial0:115200n8"; - }; - -+ connector { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_con_in: endpoint { -+ remote-endpoint = <&hdmi_out_con>; -+ }; -+ }; -+ }; -+ - leds { - compatible = "gpio-leds"; - -@@ -41,6 +53,40 @@ - }; - }; - -+&de { -+ status = "okay"; -+}; -+ -+&ehci0 { -+ status = "okay"; -+}; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ext_rgmii_pins>; -+ phy-mode = "rgmii"; -+ phy-handle = <&ext_rgmii_phy>; -+ phy-supply = <®_aldo2>; -+ status = "okay"; -+}; -+ -+&hdmi { -+ status = "okay"; -+}; -+ -+&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; -+}; -+ -+&mdio { -+ ext_rgmii_phy: ethernet-phy@1 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ }; -+}; -+ - &mmc0 { - vmmc-supply = <®_cldo1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; -@@ -57,6 +103,15 @@ - status = "okay"; - }; - -+&ohci0 { -+ status = "okay"; -+}; -+ -+&pio { -+ vcc-pd-supply = <®_cldo1>; -+ vcc-pg-supply = <®_aldo1>; -+}; -+ - &r_i2c { - status = "okay"; - -@@ -177,8 +232,29 @@ - }; - }; - -+&r_pio { -+ /* -+ * PL0 and PL1 are used for PMIC I2C -+ * don't enable the pl-supply else -+ * it will fail at boot -+ * -+ * vcc-pl-supply = <®_aldo1>; -+ */ -+ vcc-pm-supply = <®_aldo1>; -+}; -+ - &uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_ph_pins>; - status = "okay"; - }; -+ -+&usb2otg { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usb2phy { -+ usb0_vbus-supply = <®_vcc5v>; -+ status = "okay"; -+}; -diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts -index 4802902e12..1898345183 100644 ---- a/arch/arm/dts/sun50i-h6-pine-h64.dts -+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts -@@ -127,6 +127,12 @@ - status = "okay"; - }; - -+&pio { -+ vcc-pc-supply = <®_bldo2>; -+ vcc-pd-supply = <®_cldo1>; -+ vcc-pg-supply = <®_aldo1>; -+}; -+ - &r_i2c { - status = "okay"; - -@@ -243,10 +249,16 @@ - pcf8563: rtc@51 { - compatible = "nxp,pcf8563"; - reg = <0x51>; -+ interrupt-parent = <&r_intc>; -+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - #clock-cells = <0>; - }; - }; - -+&r_pio { -+ vcc-pm-supply = <®_aldo1>; -+}; -+ - &uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_ph_pins>; -diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi -index e0dc4a05c1..a117f479ae 100644 ---- a/arch/arm/dts/sun50i-h6.dtsi -+++ b/arch/arm/dts/sun50i-h6.dtsi -@@ -101,7 +101,7 @@ - #size-cells = <1>; - ranges; - -- display-engine@1000000 { -+ bus@1000000 { - compatible = "allwinner,sun50i-h6-de3", - "allwinner,sun50i-a64-de2"; - reg = <0x1000000 0x400000>; -@@ -203,11 +203,32 @@ - #reset-cells = <1>; - }; - -+ dma: dma-controller@3002000 { -+ compatible = "allwinner,sun50i-h6-dma"; -+ reg = <0x03002000 0x1000>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; -+ clock-names = "bus", "mbus"; -+ dma-channels = <16>; -+ dma-requests = <46>; -+ resets = <&ccu RST_BUS_DMA>; -+ #dma-cells = <1>; -+ }; -+ - sid: sid@3006000 { - compatible = "allwinner,sun50i-h6-sid"; - reg = <0x03006000 0x400>; - }; - -+ watchdog: watchdog@30090a0 { -+ compatible = "allwinner,sun50i-h6-wdt", -+ "allwinner,sun6i-a31-wdt"; -+ reg = <0x030090a0 0x20>; -+ interrupts = ; -+ /* Broken on some H6 boards */ -+ status = "disabled"; -+ }; -+ - pio: pinctrl@300b000 { - compatible = "allwinner,sun50i-h6-pinctrl"; - reg = <0x0300b000 0x400>; -@@ -243,6 +264,18 @@ - bias-pull-up; - }; - -+ /* -+ * /omit-if-no-ref/ isn't supported by U-boot -+ * keep this comment to avoid bad sync with Linux -+ */ -+ mmc1_pins: mmc1-pins { -+ pins = "PG0", "PG1", "PG2", "PG3", -+ "PG4", "PG5"; -+ function = "mmc1"; -+ drive-strength = <30>; -+ bias-pull-up; -+ }; -+ - mmc2_pins: mmc2-pins { - pins = "PC1", "PC4", "PC5", "PC6", - "PC7", "PC8", "PC9", "PC10", -@@ -294,6 +327,8 @@ - resets = <&ccu RST_BUS_MMC1>; - reset-names = "ahb"; - interrupts = ; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; -@@ -445,7 +480,6 @@ - resets = <&ccu RST_BUS_OHCI3>, - <&ccu RST_BUS_EHCI3>; - phys = <&usb2phy 3>; -- phy-names = "usb"; - status = "disabled"; - }; - -@@ -457,7 +491,6 @@ - <&ccu CLK_USB_OHCI3>; - resets = <&ccu RST_BUS_OHCI3>; - phys = <&usb2phy 3>; -- phy-names = "usb"; - status = "disabled"; - }; - -@@ -613,6 +646,13 @@ - #reset-cells = <1>; - }; - -+ r_watchdog: watchdog@7020400 { -+ compatible = "allwinner,sun50i-h6-wdt", -+ "allwinner,sun6i-a31-wdt"; -+ reg = <0x07020400 0x20>; -+ interrupts = ; -+ }; -+ - r_intc: interrupt-controller@7021000 { - compatible = "allwinner,sun50i-h6-r-intc", - "allwinner,sun6i-a31-r-intc"; --- -2.20.1 - diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index e5354168db5c..c48c02c4508c 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -8,7 +8,6 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -BR2_GLOBAL_PATCH_DIR="board/beelink/gs1/patches/" # Kernel Linux headers same as kernel, a 5.3 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y @@ -32,7 +31,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y