Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.5.1607113697661072757 for ; Fri, 04 Dec 2020 12:28:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=Xel6Nme5; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: praneeth@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 0B4KSGjD094634; Fri, 4 Dec 2020 14:28:16 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1607113696; bh=pYLhzzJLx7W/dGOg44tv3M7FJ/MlGbd3/TEX4YbSmAw=; h=From:To:CC:Subject:Date; b=Xel6Nme5hzH9McTCcxDbFv1BaJdrU5X+AEYEmy6EspLPSEDiKMpYk3nuZ+2c3pCvs pKds0L+tGZ6uMddMUdjRMcBw0mGU+FHc/HXX0V4e6iwbU5ici18yEyF8gDxyyv3Y4E uhrS4I1+eOvXyi0BceZQGPBiZXNOcf0nqguCzmR4= Received: from DFLE111.ent.ti.com (dfle111.ent.ti.com [10.64.6.32]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 0B4KSGKc111393 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 4 Dec 2020 14:28:16 -0600 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Fri, 4 Dec 2020 14:28:16 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Fri, 4 Dec 2020 14:28:15 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 0B4KSGgR054679; Fri, 4 Dec 2020 14:28:16 -0600 From: "praneeth" To: Praneeth Bajjuri , Dan Murphy , CC: Suman Anna , Khem Raj Subject: [dunfell/master PATCH] Revert "u-boot-ti-staging_2020.01: Fix build on hosts with gcc10 on them" Date: Fri, 4 Dec 2020 14:28:16 -0600 Message-ID: <20201204202816.16990-1-praneeth@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Content-Type: text/plain From: Praneeth Bajjuri This reverts commit 83f29e8b99144b69ed51ff69f41ab5a50f00fc5f. The mentioned fix is now pulled to ti-u-boot.git in ti-u-boot-2020.01 branch commit a6904f563f ("Remove redundant YYLOC global declaration") Signed-off-by: Praneeth Bajjuri --- ...e-redundant-YYLOC-global-declaration.patch | 28 ------------------- .../u-boot/u-boot-ti-staging_2020.01.bb | 4 +-- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch diff --git a/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch deleted file mode 100644 index 4973ea9d..00000000 --- a/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b436a29de12d3f1da579edf3e3d4d42a60b9e58a Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Thu, 30 Jan 2020 09:37:15 +0000 -Subject: [PATCH] Remove redundant YYLOC global declaration - -Same as the upstream fix for building dtc with gcc 10. - -Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/018921ee79d3f30893614b3b2b63b588d8544f73] -Signed-off-by: Peter Robinson ---- - scripts/dtc/dtc-lexer.l | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l -index fd825ebba6..24af549977 100644 ---- a/scripts/dtc/dtc-lexer.l -+++ b/scripts/dtc/dtc-lexer.l -@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n - #include "srcpos.h" - #include "dtc-parser.tab.h" - --YYLTYPE yylloc; - extern bool treesource_error; - - /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ --- -2.29.2 - diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb index 29fa6ee6..991ba0ca 100644 --- a/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +++ b/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb @@ -1,9 +1,7 @@ require u-boot-ti.inc -PR = "r23" +PR = "r22" BRANCH = "ti-u-boot-2020.01" SRCREV = "3c9ebdb87d65aacc4ec302be8bef3df15364bacd" - -SRC_URI += "file://0001-Remove-redundant-YYLOC-global-declaration.patch" -- 2.17.1