From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4404EC433EF for ; Thu, 21 Apr 2022 21:56:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D287C4198A; Thu, 21 Apr 2022 21:56:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hl8xH8ty1qRS; Thu, 21 Apr 2022 21:56:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 2BFF14192E; Thu, 21 Apr 2022 21:56:24 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BEEBC1BF95C for ; Thu, 21 Apr 2022 21:56:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A581E841F4 for ; Thu, 21 Apr 2022 21:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UEWmsSp1alcV for ; Thu, 21 Apr 2022 21:56:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by smtp1.osuosl.org (Postfix) with ESMTPS id 8812F841C3 for ; Thu, 21 Apr 2022 21:56:21 +0000 (UTC) Received: by mail-oi1-x22c.google.com with SMTP id 12so7030672oix.12 for ; Thu, 21 Apr 2022 14:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eYDMNw1PCHgVtedQKnf/vatef4NZpomPQpKMkULjPck=; b=RY8StLCoJcu9Naucv+V7Y9KFoxLicRZV06eShpdrxDtD4i9+QjaatovDi3dMTNvpKY VyNFbNnSXuuwFrCNkpLyVRwsbLpvh/O8uTnFyNMwS55v5wh/INyfbVlWrJFMUIBclguy e5dqM1c49aL3JcM6cE9EzEwt6rNgXdn0Lx72LshbXw2LBTwBA3xPWsMDODIw4s4q9OXx cZDNOIXLe0B0a40k4H/2uD5yWUvTCgGoTbaJ/nV/ca82C+AKfQULBzFpNw4aNAzoj/GM 27k7MyXrkmkGOgdwsl74JIpyu3XuoP2spjqUi2Vb213kOXxIuPgZzeMvf2wUrt1Phtv8 FogQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eYDMNw1PCHgVtedQKnf/vatef4NZpomPQpKMkULjPck=; b=vieTR4OQNXBGRwNhsN4XHmb6BxqK5RFyg8o8KRsbaa5BaqOJRCmT+NGginctZscsru 6cODCy3/RI1xds/qoEj6Lyg0sWlHYIspmr/jgWULQ6dEgGRgu3hThJy/R6Y6J9pNbAuX hF9K12DjcmhntShI+ShnhIh/zDDnSA1Q3Dx/YYAt5SbYgyKFEpnKUk0tYs/YUfk38HkP X6cSYL0Q/0jfdyQi/vP2FKwdaOS2grYURuFN/SquJCnnBJcQtSszb84L7ExSGa7EGYZ0 aQjdYxpDvUjwX/FPQj7hAnwUD0RvcX8pEUbhKS1+nh+7zt2QK15j2uScm9qQc0idIUG0 P5hw== X-Gm-Message-State: AOAM531Bvw+1/HgGvSCZuXLHiFTESpHk/zZ7+R4CI8X2mcy/oqQ7tQpP V1kacRa0+lVFWMPpNRM+QoIK6Our6eY= X-Google-Smtp-Source: ABdhPJzUmXquBjodBqj/ZF2B2GDs8R8HbSufF6nOWKHAheZ7NAVmasG32ZvliXw26FT3yukQXl/Rwg== X-Received: by 2002:aca:da85:0:b0:2fa:7bff:dec3 with SMTP id r127-20020acada85000000b002fa7bffdec3mr4816984oig.81.1650578179963; Thu, 21 Apr 2022 14:56:19 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:485:4b69:c003:f945:ad3e:e82]) by smtp.gmail.com with ESMTPSA id z13-20020a9d62cd000000b006056f8657ccsm76700otk.10.2022.04.21.14.56.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Apr 2022 14:56:19 -0700 (PDT) From: Fabio Estevam To: buildroot@buildroot.org Date: Thu, 21 Apr 2022 18:56:11 -0300 Message-Id: <20220421215611.1362150-1-festevam@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: Bump U-Boot X-BeenThere: buildroot@buildroot.org 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: heiko.thiery@gmail.com, Fabio Estevam , frieder.schrempf@kontron.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Bump U-Boot to version 2022.04 and remove the two patches that have already been upstreamed. Signed-off-by: Fabio Estevam --- Hi Heiko, This is not tested. Did it by inspection. ...m-kontron-n801x-s-convert-options-to.patch | 31 -- ...m-kontron-n801x-s-add-common-board-u.patch | 305 ------------------ configs/kontron_bl_imx8mm_defconfig | 4 +- 3 files changed, 1 insertion(+), 339 deletions(-) delete mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch delete mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch deleted file mode 100644 index 6d76282defb2..000000000000 --- a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Mon, 10 Jan 2022 14:13:02 +0100 -Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig - -CONFIG_SPL_MMC and CONFIG_SPL_SERIAL - -Patch submitted upstream: -https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery@gmail.com/ - -Signed-off-by: Heiko Thiery ---- - configs/kontron-sl-mx8mm_defconfig | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig -index 35d12fca32..940bf07a92 100644 ---- a/configs/kontron-sl-mx8mm_defconfig -+++ b/configs/kontron-sl-mx8mm_defconfig -@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y - CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" - CONFIG_SPL_TEXT_BASE=0x7E1000 - CONFIG_TARGET_KONTRON_MX8MM=y -+CONFIG_SPL_MMC=y -+CONFIG_SPL_SERIAL=y - CONFIG_BOOTCOUNT_BOOTLIMIT=3 - CONFIG_SPL=y - CONFIG_DISTRO_DEFAULTS=y --- -2.30.2 - diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch deleted file mode 100644 index a88d7aba870b..000000000000 --- a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch +++ /dev/null @@ -1,305 +0,0 @@ -From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Wed, 12 Jan 2022 08:44:36 +0100 -Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board - u-boot.dtsi - -When using a board variant that selects the lvds specific dtb the -*.u-boot.dtsi file will not be included. To have a lvds dtb specific -u-boot.dtsi file move this part to a common board u-boot.dtsi file and -include this in the board base u-boot.dtsi and create an additional one -for the lvds variant. - -Patch submitted upstream: -https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery@gmail.com/ - -Signed-off-by: Heiko Thiery ---- - .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + - .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- - arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ - 3 files changed, 135 insertions(+), 123 deletions(-) - create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi - create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi - -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi -new file mode 100644 -index 0000000000..4bf75722bf ---- /dev/null -+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi -@@ -0,0 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2019 Kontron Electronics GmbH -+ */ -+ -+#include "imx8mm-kontron-n801x-u-boot.dtsi" -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -index 22d18e6f1c..4bf75722bf 100644 ---- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -@@ -3,126 +3,4 @@ - * Copyright (C) 2019 Kontron Electronics GmbH - */ - --#include "imx8mm-u-boot.dtsi" -- --/ { -- aliases { -- usb0 = &usbotg1; -- usb1 = &usbotg2; -- }; -- -- wdt-reboot { -- compatible = "wdt-reboot"; -- wdt = <&wdog1>; -- u-boot,dm-spl; -- }; -- -- firmware { -- optee { -- compatible = "linaro,optee-tz"; -- method = "smc"; -- }; -- }; --}; -- --&fec1 { -- phy-mode = "rgmii-rxid"; --}; -- --&i2c1 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&i2c2 { -- status = "okay"; -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&pinctrl_ecspi1 { -- u-boot,dm-spl; --}; -- --&pinctrl_i2c1 { -- u-boot,dm-spl; --}; -- --&pinctrl_pmic { -- u-boot,dm-spl; -- fsl,pins = < -- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 -- /* Disable Pullup for SD_VSEL */ -- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 -- >; --}; -- --&pinctrl_uart3 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&pinctrl_usdhc1 { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc1_100mhz { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc1_200mhz { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc2 { -- u-boot,dm-spl; --}; -- --&pca9450 { -- u-boot,dm-spl; --}; -- --&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { -- u-boot,dm-spl; --}; -- --&ecspi1 { -- u-boot,dm-spl; --}; -- --&gpio1 { -- u-boot,dm-spl; --}; -- --&gpio2 { -- u-boot,dm-spl; --}; -- --&gpio3 { -- u-boot,dm-spl; --}; -- --&gpio4 { -- u-boot,dm-spl; --}; -- --&gpio5 { -- u-boot,dm-spl; --}; -- --&uart3 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&usdhc1 { -- u-boot,dm-spl; --}; -- --&usdhc2 { -- u-boot,dm-spl; --}; -- --&wdog1 { -- u-boot,dm-spl; --}; -+#include "imx8mm-kontron-n801x-u-boot.dtsi" -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi -new file mode 100644 -index 0000000000..22d18e6f1c ---- /dev/null -+++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi -@@ -0,0 +1,128 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2019 Kontron Electronics GmbH -+ */ -+ -+#include "imx8mm-u-boot.dtsi" -+ -+/ { -+ aliases { -+ usb0 = &usbotg1; -+ usb1 = &usbotg2; -+ }; -+ -+ wdt-reboot { -+ compatible = "wdt-reboot"; -+ wdt = <&wdog1>; -+ u-boot,dm-spl; -+ }; -+ -+ firmware { -+ optee { -+ compatible = "linaro,optee-tz"; -+ method = "smc"; -+ }; -+ }; -+}; -+ -+&fec1 { -+ phy-mode = "rgmii-rxid"; -+}; -+ -+&i2c1 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&i2c2 { -+ status = "okay"; -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&pinctrl_ecspi1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_i2c1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_pmic { -+ u-boot,dm-spl; -+ fsl,pins = < -+ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 -+ /* Disable Pullup for SD_VSEL */ -+ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 -+ >; -+}; -+ -+&pinctrl_uart3 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&pinctrl_usdhc1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc1_100mhz { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc1_200mhz { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc2 { -+ u-boot,dm-spl; -+}; -+ -+&pca9450 { -+ u-boot,dm-spl; -+}; -+ -+&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { -+ u-boot,dm-spl; -+}; -+ -+&ecspi1 { -+ u-boot,dm-spl; -+}; -+ -+&gpio1 { -+ u-boot,dm-spl; -+}; -+ -+&gpio2 { -+ u-boot,dm-spl; -+}; -+ -+&gpio3 { -+ u-boot,dm-spl; -+}; -+ -+&gpio4 { -+ u-boot,dm-spl; -+}; -+ -+&gpio5 { -+ u-boot,dm-spl; -+}; -+ -+&uart3 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&usdhc1 { -+ u-boot,dm-spl; -+}; -+ -+&usdhc2 { -+ u-boot,dm-spl; -+}; -+ -+&wdog1 { -+ u-boot,dm-spl; -+}; --- -2.30.2 - diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 2b7e121e252e..705222df2833 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -3,8 +3,6 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV3=y -BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" - # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" @@ -40,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot