From patchwork Tue Mar 24 17:40:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Julien Olivain (OSS)" X-Patchwork-Id: 1260923 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=Y07MLM80; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48n1C01rC2z9sPR for ; Wed, 25 Mar 2020 06:14:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 67B8120522; Tue, 24 Mar 2020 19:14:17 +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 uz2+ZsGonZmJ; Tue, 24 Mar 2020 19:14:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2CFD9204CD; Tue, 24 Mar 2020 19:14:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9D4A91BF2A2 for ; Tue, 24 Mar 2020 19:14:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9A0A384DE6 for ; Tue, 24 Mar 2020 19:14:11 +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 vWQE8QC5ShYQ for ; Tue, 24 Mar 2020 19:14:10 +0000 (UTC) X-Greylist: delayed 01:33:17 by SQLgrey-1.7.6 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2047.outbound.protection.outlook.com [40.107.22.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A2AD584D41 for ; Tue, 24 Mar 2020 19:14:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VUxJ/ouumN1xSwXah7iTo8RjFVBM7cSC4YevrlxekTDKzfMK7pOZVVyNEBUmF32KyZVsDkfg2wWCtxe04sYSdqs5Jo+PZPgvdWk3K99kxEEJ4mXwGAgOhgc5IutVoBpeBGPijqwQGzMjS5aZZmXY+xpZZSmdp7i+ew30x8LfpuPq/o+6cnkWBKONoGIm1sFnD5rEvp+NPBdZ2dhN0Q3DtzfJARmjItYUPoSzId+fz2jEDCn/zxFOCLCQqhr7MNAJpxnnKHYGKnWhNTz2xB2q5KZkDK0aMMTKX6S6nUSBibMJzyfFM+1IIHeV1b932KMDhnxWFV4/uGWPE2qFv1krqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QkxCZiiKhtQ2ECvlxdFdxqyxK8bmFNwnaNrOgqbMYD4=; b=GFWNIOXRf7lI0lpowoabvTMXYO3P8gJRhcX1iw2UdMBE3hnbDQGM4RqFhOubfsoMvBDUmUHbcRQmBR8ebVYEHWEZgnd5VaguqrED3IEYnXMbGNXeksYj58SpppF7vPNXHsKMXhZcygDQVjlpJOY7Y3Hh0Fy4MCh+SvlxifcXsw/gG+wGBCxIidour61eieYShNo7uxW6TxLNnGc/Q35kGfEQaHS2KxAXsjTfD+osP23zK4FbGBzL9VKOKQK0RwP5lZTvkhhOFF5HXrZwX5nexTjF+87MXCDt1oo6BM5CAokJpBRQJCJFVL3NCnTdErBajLrnwQsftmbEHz0JilFV8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QkxCZiiKhtQ2ECvlxdFdxqyxK8bmFNwnaNrOgqbMYD4=; b=Y07MLM80MR3tREcDCaycdM33uNjSyBF+S9WIzW4XI4t4OiUp6eOWcSeFfUihTOhQ55/dL5J7hLEG9pmZ1KI+pfUapL6dSHtmODtFQIFvN9jIsPBAwVvt2uk5/2WKqoQYAw5eangrcbAC37pf+2KxX36S0j6rQ9k3OVZWRkNJp4k= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=julien.olivain@oss.nxp.com; Received: from VI1PR04MB6253.eurprd04.prod.outlook.com (20.179.24.211) by VI1PR04MB5966.eurprd04.prod.outlook.com (20.178.123.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.18; Tue, 24 Mar 2020 17:40:45 +0000 Received: from VI1PR04MB6253.eurprd04.prod.outlook.com ([fe80::108b:c159:db10:c808]) by VI1PR04MB6253.eurprd04.prod.outlook.com ([fe80::108b:c159:db10:c808%6]) with mapi id 15.20.2835.021; Tue, 24 Mar 2020 17:40:45 +0000 From: Julien Olivain To: buildroot@buildroot.org Date: Tue, 24 Mar 2020 18:40:15 +0100 Message-Id: <20200324174015.125787-1-julien.olivain@oss.nxp.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: AM0PR0202CA0009.eurprd02.prod.outlook.com (2603:10a6:208:1::22) To VI1PR04MB6253.eurprd04.prod.outlook.com (2603:10a6:803:f3::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from b52572-12.ea.freescale.net (2a01:e0a:43e:e970:52f3:9afd:ecee:3fda) by AM0PR0202CA0009.eurprd02.prod.outlook.com (2603:10a6:208:1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.15 via Frontend Transport; Tue, 24 Mar 2020 17:40:44 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [2a01:e0a:43e:e970:52f3:9afd:ecee:3fda] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ee0cb2c1-4fbc-4742-de9e-08d7d01a7b1b X-MS-TrafficTypeDiagnostic: VI1PR04MB5966:|VI1PR04MB5966: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:268; X-Forefront-PRVS: 03524FBD26 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(136003)(396003)(376002)(366004)(346002)(4326008)(6916009)(5660300002)(52116002)(54906003)(16526019)(186003)(8936002)(2906002)(1076003)(316002)(66476007)(6506007)(81156014)(6666004)(8676002)(81166006)(478600001)(44832011)(2616005)(6486002)(6512007)(66946007)(86362001)(66556008); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5966; H:VI1PR04MB6253.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: oss.nxp.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jo8HLaTbERIOqU3wVl0arat0dy0Z38JqfkenRC/881wemZebaSar/JFZIorrEAS/fyFxMbo/4yFcXSS8CQNxVZLXnBsoezEaOKLILXUvoPD7VahgKON+XK9YmwXOKz8116SxZ8imW2561KDQN8wh+e2c1mj59njh1hYEoa6U69Z1D03/Z41rtQ7JOJt6XxT3xMsV91Omb+l4b/Hy0ocwzUPBbuRKyVm4Wy4FirVAfV89EHVzz8+ikcOx36V35cuElLXMVL0/BeGDcxSLHmaaok/p554sTDCW44c+NlIUujT6apbAWMSWAhg86qoXOpIU1dvsLkuC27BmBHmt0ohH21p8VqU9QtYFeJmmxiCop8RUz/xMShZWwLTzAf2iRc0hfUGus8YT1CDAweWARBFuQHzyFGkpBGi+leW37t9AeDjNBG7ow/RQ3ht09I5zEmbjEFnUsC3fYtNuLcKS70ys6NCfrsK4bjTh5eS0kSbo2eczRTP0KbsY0w1dzIZBF81VTU+Nky6tXtI62VpR+O0udA== X-MS-Exchange-AntiSpam-MessageData: JowDOolYwktlXOhl9+V3H+x/zgAiFNdvx1iEniGQCZUELkmfUh/o2HmKgc7ir4Wntoa7ekx6JY62taebav7pLUN+u2luw1G3gcnSJw9MK9wga/3UOxmG6z1WUacFipUglJPA0HGaayQUfGJFf9GRM2RiBM+zob/OwVmfjCVVLlJxDeX7ODN4rnn6TDSTwniW6jc4T1L95o5dnKv/fa8FIw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee0cb2c1-4fbc-4742-de9e-08d7d01a7b1b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2020 17:40:45.2463 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NWj7MxpYXfL9u7/lUvnhVKbSHLUiOwGJxJQ/7YoY1/4CYZhNn3+mxaZCYx8JnLV4O/5wRwdIepVPk8ZKESo3UQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5966 Subject: [Buildroot] [PATCH 1/1] configs/freescale_imx7dsabresd: bump BSP components to 4.19.35_1.1.0 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: Julien Olivain , Fabio Estevam Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also dropped uboot patch accepted upstream in v2018.05 in commit f916757300c15aa1a3f0ccc98e7abb8a84c97da0 Tested-by: Julien Olivain Signed-off-by: Julien Olivain --- ...nct-pre-processed-mkimage-config-fil.patch | 89 ------------------- configs/freescale_imx7dsabresd_defconfig | 11 +-- 2 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch diff --git a/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch b/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch deleted file mode 100644 index b8989cb965..0000000000 --- a/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001 -From: Trent Piepho -Date: Fri, 6 Apr 2018 17:11:27 -0700 -Subject: [PATCH] imx: Create distinct pre-processed mkimage config files - -Each imx image is created by a separate sub-make and during this process -the mkimage config file is run though cpp. - -The cpp output is to the same file no matter what imx image is being -created. - -This means if two imx images are generated in parallel they will attempt -to independently produce the same pre-processed mkimage config file at -the same time. - -Avoid the problem by making the pre-processed config file name unique -based on the imx image it will be used in. This way each image will -create a unique config file and they won't clobber each other when run -in parallel. - -This should fixed the build bug referenced in b5b0e4e3 ("imximage: -Remove failure when no IVT offset is found"). - -Cc: Breno Lima -Cc: Thomas Petazzoni -Cc: Fabio Estevam -Signed-off-by: Trent Piepho -Tested-by: Fabio Estevam -[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga] -Signed-off-by: Fabio Estevam ---- - arch/arm/imx-common/Makefile | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile -index d862258..f1bae8d 100644 ---- a/arch/arm/imx-common/Makefile -+++ b/arch/arm/imx-common/Makefile -@@ -69,9 +69,11 @@ endif - quiet_cmd_cpp_cfg = CFGS $@ - cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $< - --IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp -+# mkimage source config file -+IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) - --$(IMX_CONFIG): %.cfgtmp: % FORCE -+# How to create a cpp processed config file, they all use the same source -+%.cfgout: $(IMX_CONFIG) FORCE - $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cpp_cfg) - -@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim - -e $(CONFIG_SYS_TEXT_BASE) - u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log - --u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - - ifeq ($(CONFIG_OF_SEPARATE),y) -@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i - -e $(CONFIG_SYS_TEXT_BASE) - u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log - --u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - endif - - MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \ - -e $(CONFIG_SPL_TEXT_BASE) -- - SPL: MKIMAGEOUTPUT = SPL.log - --SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - - MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ -@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \ - spl/u-boot-nand-spl.imx: SPL FORCE - $(call if_changed,u-boot-nand-spl_imx) - --targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx) -+targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx) --- -2.7.4 - diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 9d00a53eb8..86009c1c21 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -2,11 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# patches -BR2_GLOBAL_PATCH_DIR="board/freescale/imx7dsdb/patches" - -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -29,7 +26,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y