From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id F006FE00E3F; Fri, 17 Jun 2016 00:53:14 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [157.56.111.89 listed in list.dnswl.org] * -0.0 SPF_HELO_PASS SPF: HELO matches SPF record * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0089.outbound.protection.outlook.com [157.56.111.89]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id CDC02E00D8D for ; Fri, 17 Jun 2016 00:52:54 -0700 (PDT) Received: from BN3PR0301CA0039.namprd03.prod.outlook.com (10.160.180.177) by CY1PR03MB2378.namprd03.prod.outlook.com (10.166.207.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.517.8; Fri, 17 Jun 2016 07:36:54 +0000 Received: from BN1BFFO11FD029.protection.gbl (2a01:111:f400:7c10::1:161) by BN3PR0301CA0039.outlook.office365.com (2a01:111:e400:4000::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.523.12 via Frontend Transport; Fri, 17 Jun 2016 07:36:54 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD029.mail.protection.outlook.com (10.58.144.92) with Microsoft SMTP Server (TLS) id 15.1.511.7 via Frontend Transport; Fri, 17 Jun 2016 07:36:53 +0000 Received: from mercury.localdomain (mercury.ap.freescale.net [10.192.208.79]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u5H7aldv014803; Fri, 17 Jun 2016 00:36:52 -0700 From: To: Date: Fri, 17 Jun 2016 15:36:15 +0800 Message-ID: <1466148986-926-3-git-send-email-ting.liu@nxp.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1466148986-926-1-git-send-email-ting.liu@nxp.com> References: <1466148986-926-1-git-send-email-ting.liu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131106226139212548; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(229853001)(48376002)(19580405001)(230783001)(19580395003)(87936001)(97736004)(47776003)(50986999)(5003940100001)(586003)(92566002)(11100500001)(36756003)(2351001)(6806005)(33646002)(76176999)(104016004)(189998001)(81156014)(575784001)(68736007)(86362001)(85426001)(105606002)(106466001)(110136002)(50466002)(2950100001)(15975445007)(5008740100001)(50226002)(86152002)(77096005)(8936002)(81166006)(2906002)(2876002)(8676002)(8666005)(4326007)(356003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2378; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; CAT:NONE; LANG:en; CAT:NONE; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD029; 1:OW3XDW2WuFYH82K6qh/uQgP15ZHjzHIhkTXevRjN7V+QMENdmgk0gOj8/CWtP2FslAfv6MSN8QDvU1Fjbb8LXM9cl1OVk85a5CE6Sp9MLMKkdpH5TDMb1voKR6FD8NyhtO7jJMaX3V6VJ+vG5pm03QATdu1ioyHyipRNMTX+yaP+HivD7ASwfUXCUJKA1n/7Vo7cCG+seWAtSlcoz2UvCvGe4ycjJ2RAs+RPlYZQm2RmejTidOIQA6h5L0C9v14Peguck+w8eLwlNV1g8zpdY9e30dHTBtoDsC9pizD7d5qG67LoB9oJSy+P+cE5MCkc0T7rYEIenhjw3/ls8GV+KCQFHCdp7C9QwfyGldWTuBKjPPNLE7NjYcCP5/OrqYsPZW9Z57Na5vZ2TuNKn7uQ0kdoSCrIjinSCwWSqKLZYcqlRYgRMtLVlgCFxLUDlQMJo7EAcNEH5IXq1Qy2eqDnhsAqA4GWvGNCNc4Uc/5EBmOmW621ozA77GmKHB5s1zod92pAiLYDmyuRxj5L8Ed+S0gCg+OAF6oVBJ2MwoAzCSipgGP06UPH51nMNghg+tCzyAvbZCgNcrzAsLulmyPKzs7gO9pShmjt+LbykgOCKxElPefndIZflNdmFM5c7hSCk6hlQol23sa7AAjhvuZXO5OLY6DDOVGZw1AcdIoYHNIyY6t1Yz4thuzAN/Hrp4FA MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 19c03f4e-91dc-4ffb-49a6-08d396822753 X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2378; 2:FHcknD/lym1ThiZverW01qCCHs93vlKFZnKEBIiPfZdkSo7JHyP1LubeTRJ/1xLSUpex54PrFoaneXYh9wY0y4no51lE6XNnWJ3DUNK7X1b4jMyTphbsC3tIrIO7DvoCSuimcHq42DP9OHysJXq2qZnS/E37QLvYCamaj65ye8+O89gCHy3zmqODTrjXChD+; 3:s1wkEj/zdtigQI3HoecV8Umf/ugQgJHY8o+Lnzs/cvwfGGmN1xCqxMuq/JyN1zTmFNll3JrNhBVQrKMUQt5Q2oDwx8jI/VlHvpNelqHq9EcsTT1Lyib4r//rgQecsTduNRwrxdItUuFDADrLhU13fD2UluH6y9bNe7TnkcABkpEYh2T3fXPogmzTYDIL+hf33JxkQiU+0fuP7mtObnmX535CETq6EpdQqbctxDRUFLE= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB2378; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2378; 25:UNK+0vSEsS28N/Z0nO+IuFaljFFEtTSNNWPHvXx7xomEFbOwfHRV/1cw88iwcPlFjoy05eNnXTINhdtJUg2vOu1i8IPNgiY8ojXcGhAUqCjib99Ew114l612TA+Lz3bOK6ZM/G180zNkrkmT8OFb/BDgBORJWLEFq8FmC3/HdIH21X2aqWao7jRyy+2ddCR4GeaJMgnffToL5NVtvyAzokWhxflrMVz6U3eZtTC/jhSVH4jyOsLMQ5zKejrhnpJNvRXYHEPjt/qd6+ymRoW8lAsejLe7Pyb4rWPbVLIQ/iOS19gl+DO6Xga9h17hxGTpOHsPqbVoW6M7Og1AOE1Irn5ezzh+fjTDiqu4Yoazalut/+AEXwpB94xGmWSCWRLL9XYkSk3ur8aZSHa3xyhiJ6xjMrhJBR1uT2XZuOz6b3rWkHpPjMkJiyIUbIItJA6kXVYo7Hz/kXgPcRWkeASJupkM4s2sdFHBEW/tVRhxVsGEXpzk4e+0HzmTCb0EXwPJDuzaaCfWxquGRmG5cZFJUsMKy9rdDlvN2/IZTo+Cvc1PL45/qeb4UeuP9fCTvUsNPP+cXQOaNoFepE7DzTOecfUC/zqqejRJ0EOi0HyUsduOrLesppuHXRM3EQez0b0YVdZ3jFD+hkEfsA2/e3wVi3oE0VD6E2GnhsqHnCvkuh0mHbVyYFPfGUoutLPkRR7XaOGdkCb/wJfF5gUUw7FKa1hgUEE0RQ/fD4WEkRoBa4Jc1P7+8MmWDOtklB0Q2XTqb/J+4yHoQVcrLPI6t/cRQGg/fPKODVwua+NiC/DNHiH7zxjbqJeTxbsVP30I4Yf0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(22074186197030)(185117386973197)(101931422205132)(183786458502308); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(13023025)(13015025)(13024025)(13017025)(13018025)(3002001)(10201501046)(6055026); SRVR:CY1PR03MB2378; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR03MB2378; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2378; 4:ipFG1LS/+IIkYHWNwuyLDM3CHW+FDpepvaVU51HNqv6XDrNPCeS5HYlCDHR+mb0TuWghXhtYc8bxgeaVWVAd8zUBfRfxRUKiN8ekZiQOof7tBHG9Zo+fbCiV3i9cGwZAWCi6VyMaTPpgdryvSCHAx7DcIxdOXMxT35RTafKgmYQLXsh7xOz4VAsifpzBdLIac4YKCsTMHKpdrH1DLWlvHjrOOJnhIXQk+9sYEIHZWz+8txmqPXH0X4lSu5qVjIMNS7EFxZZq+wZfSj2gp8DY4JsQdiRYci8qdFSYT/hOkekBM2984FQJFVPE4n+bswIv+8GcQqw1gP8EaBS4C2xfnTEh4iomHAH7151PcSUvgAcSeAMzg8Wx0mx2nfeJmZNd7PgvxEbl4DdVEF/kOIJbUXQo7IRq4js2ai67oqeoXQ+7f6B03ez1PHOj40BfTxB4ILPI3aVdrCsW7WH8FsOCksoQEOp8oxgOCn5FbJa922jm+GYKqXMD8Qra4UbOvo0QCMrcUrDxJfYDFt/67xCuKrP2WzaTBGWXs8/NCZnafbk35m4anEpa9IvGPy0nkZ2jv7rGqW8g5I4BXWFU+GfZckTOOPsKm+zyO0hAtf+xLRMf+AcE6ik8ax30gVMxKBLr X-Forefront-PRVS: 09760A0505 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2378; 23:4BmOMSaz9QYNEjrdTihu8QpCBA3Hp2Z1VcW/dbwl+?= =?us-ascii?Q?UWYCP6QmRYPqQQyX283w03I5vrduFomVZohlc6CUeRaZHCZwiS/696gPdXg0?= =?us-ascii?Q?5Gp8oZiKtInsw6IuQd2I+64i9M8bzSvikm1Dh2eEtBl+Y2QxR8pfaOLp+28c?= =?us-ascii?Q?3nxl43rBRG0PPPNNzXNg6ROHsU1JgIDDm9KTgZ4TsrdHjdUYMXVPaWaUsJba?= =?us-ascii?Q?TZtZEutuFkqTlXZd5o8lcKcwtnFXiQE5cvB83WP8fS/kejoW05tuXp/wTv9+?= =?us-ascii?Q?e66Yp5O+21ph3ns0WyxPqVWpD5k1wg0cl+8QflvoQGs13NFTebzfQrTOP4h5?= =?us-ascii?Q?4qgVXYRALF8VLMVhei2BOLVdUF6Y996ZpSGt5wTuZ42eG3fvEbtaSlUU0Wa9?= =?us-ascii?Q?SxXNoSTsDP7mlIxOq9ejQ5W2BQU5ZirPnV8q3nICUmk/eKDTuefGn42GHhh0?= =?us-ascii?Q?ODY+m9ClsTScsloALhBrG5snv3GpjFz9MS5TvYACjMZx5WBZX+VutaR768Gp?= =?us-ascii?Q?KJhfLwi2ZHQVO2YvVUWKVTjrQUo8uz0/dx2vCnuaCbj/03d2WtzH3kGaeBOJ?= =?us-ascii?Q?4IyYQLKDh+lPknC19bOU6p/oOzxrfu8SrNl+n1Y1lhq/sdarYo+Jp7skfhgw?= =?us-ascii?Q?YV8g8CU0/dWNXY2J020PV0BBPGTh/6R/PotYE7svrhW3wyYgvB4Vsw9T9ddt?= =?us-ascii?Q?CJlUyvGNt61DM4ui7NJImRBRt9leb4MZk5wppLxMDqN4p39qes+VEvguAiCt?= =?us-ascii?Q?oUTJNTfPFyoJ8z9qAZiyCbJW66W0gDUhT4EJN24iMw3a6n+rNcKKdkBpgHGP?= =?us-ascii?Q?IlHU1DCmrKk1nf6ATPukNCag+rmjogs5Z8VrpcRk34JWLET0GlnG4oXjiKje?= =?us-ascii?Q?88eHu/N1XprAlEAG6JoMklg49MlJ2qdFvFf5zRkVpZ9Vx9X213eP4O2MQhaw?= =?us-ascii?Q?Nxc8JyXLlqwNZL5ihsRT8/dgWUE0qSfNCngv3Uax//iFW/TWypSuz2xtU/HD?= =?us-ascii?Q?9FpKrQ8s4Boys4l1YaOtAKwIgk0Vg5/YANlpApBAxqfAWMEo9dFdUca0q6qV?= =?us-ascii?Q?Fts75AK8/9sBC40t2mu2+Iiap0WXArj/81yDkMMktwMByOiLv8aCA7GQP/k+?= =?us-ascii?Q?/qge2A0jc4JmBsyjIeFdexGT3pS/mfn4LnllKNND2nKiOmLloHVP4GB5Q2Ua?= =?us-ascii?Q?on2R6uZDIWpLz7OD9jI3wcrk/6N2CUWpCpKg9tHilyB42vaQPyG8SrOXrD2s?= =?us-ascii?Q?JvQXJVgArFYtc7TEyLsEOs9+W2euzX8VpxrygJfOTPDAjJ/KPV0SPrfD3m5Y?= =?us-ascii?B?Zz09?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2378; 6:TE8561g5PK/7OdsPeQw8nsyM2vTXiG3OuyeefX+BlbDiZWpOdQUH0tDBM4WYcxGmNuePF0YMAWpPVcuaB5dYgY8ESiuZlJg8jqWMZvxsMpcFMwEB49L9wj/Zxb8eDA1BKC9JMdfs66AsFCgCRPcRtdKClJGaoP7HZn09hLirQZpWsx6n6Zhirr/9d7gAtacaZWjj7DY/5WGsElstM/GIaiy5Gh2y+un/9VFe1hPYTt8wJC0I+7GQ3TgnBwpvoSLbSC1J05cRIvkYTq3sTHxWOvYVlhe29Nb6du1CoAhC4RI=; 5:1D+/rrJ3BN9RKS6KauFGHZriBRony9l3rxKT/g9UzCbf3Xh7LjHJpvWn/GPqWpWGMR9HdZSCPf0V0TVY+1qXr61Nmz38jDHbw0KkJg7Uw/sy09TC+TONoRYCrcz2STYMemLee6EIwWxMal9FmHMmdBw9qiub8vw1U/TbBB4YFT0=; 24:U+83pXTl1XZ2qjbfPbq6sWiXjTUYpPSUd0OWH+oY3M8UrCedPsuzVjfAVe94dLI+FPM92n/ErZe6FZKWaEihGvNSGqTCeaZsp2zEffO2ixE=; 7:U0n5hpyNb71JsdCLvIW2wUdCF3hNd9zYtx1TkzL6Lq3utWGFTkce4417BRMB8oiIGYfOVHBHeh6VKVCOsS1Zv5BBz34FihUnU95/SJs5+cdfLVNRKIA8NGxLc+5H4icMlRaZT0pXugqdpsaEtCSxhyK8yTSovtOa8nLvIVbJh2iMhFEP5IIe97VjBqYkKAlosW1sDGuAWcqUrzvw3KExtA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2016 07:36:53.7184 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2378 Subject: [meta-fsl-ppc][PATCH 02/13] u-boot-qoriq: upgrade to 2016.01 X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2016 07:53:15 -0000 Content-Type: text/plain From: Ting Liu The main features are: * Upgrade to 2016.01 * On ARM platforms, the U-Boot image includes the device tree * Non-secure and Secure Boot (ESBC) * Primary Protected Application (PPA) firmware integration [LS1043A] * Clock, CPLD, DUART, DDR3, DDR4, DSPI, eSDHC, GIC-400, GIC-500, I2C, OCRAM, PCIe, USB 2 & 3, SATA, UART * Networking support using eTSEC, FMAN Independent Mode or DPAA2 networking * DCU, eMMC 4.5, I2C3, LPUART, QSPI [LS1021A] * eLBC and IFC access to NOR and NAND flash * Boot from NOR, NAND flash, eSPI, SDHC * Boot from SRIO [B4860, P5020, P4080] * Voltage ID (board specific) * CodeWarrior debug patch for U-Boot Detailed commit log can be found at: http://git.freescale.com/git/cgit.cgi/ppc/sdk/u-boot.git/log/?h=sdk-v2.0.x Signed-off-by: Ting Liu --- ...5xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch | 77 ------------------ .../u-boot/files/Fix-the-depend-race-issue.patch | 38 --------- .../files/add-fgnu89-inline-option-for-gcc5.patch | 39 ---------- recipes-bsp/u-boot/files/gcc5.patch | 91 ---------------------- ...ot-qoriq_2015.01.bb => u-boot-qoriq_2016.01.bb} | 6 +- 5 files changed, 2 insertions(+), 249 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch delete mode 100644 recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch delete mode 100644 recipes-bsp/u-boot/files/add-fgnu89-inline-option-for-gcc5.patch delete mode 100644 recipes-bsp/u-boot/files/gcc5.patch rename recipes-bsp/u-boot/{u-boot-qoriq_2015.01.bb => u-boot-qoriq_2016.01.bb} (97%) diff --git a/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch b/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch deleted file mode 100644 index e6b8d2e..0000000 --- a/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 9ba002f1b1afc7af84a352f4ecab32a30d7ba353 Mon Sep 17 00:00:00 2001 -From: Zhenhua Luo -Date: Mon, 9 Feb 2015 18:33:56 +0800 -Subject: [PATCH] u-boot/mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ - definition - -In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in -u-boot.lds overrides the linker built-in symbols -(https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=b893397a4b1316610f49819344817715e4305de9), -so the linker is treating _GLOBAL_OFFSET_TABLE_ as a definition into the .reloc section. - -To align with the change of binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbol -should not be defined in sections, and the symbols in linker generated .got -section should be used(https://sourceware.org/ml/binutils/2008-09/msg00122.html). - -Fixed the following build errors with binutils-2.25: -| powerpc-poky-linux-gnuspe-ld.bfd: _GLOBAL_OFFSET_TABLE_ not defined in linker created .got - -Signed-off-by: Zhenhua Luo ---- - arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 1 - - arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 - - arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 1 - - arch/powerpc/cpu/mpc85xx/u-boot.lds | 1 - - 4 files changed, 4 deletions(-) - -diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -index f933b21..0399f93 100644 ---- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -@@ -44,7 +44,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -index b83c553..f044564 100644 ---- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -@@ -22,7 +22,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -index 5ae7b3e..889a4c2 100644 ---- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -+++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -@@ -29,7 +29,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds -index 2cf0b25..f15eaf3 100644 ---- a/arch/powerpc/cpu/mpc85xx/u-boot.lds -+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds -@@ -50,7 +50,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } --- -2.1.0 - diff --git a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch deleted file mode 100644 index 1ddc667..0000000 --- a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Pending - -From 301832414369b749918e0d5db850eed19b81c0fc Mon Sep 17 00:00:00 2001 -From: Zhenhua Luo -Date: Tue, 24 Sep 2013 00:54:40 -0500 -Subject: [PATCH] Fix the depend race issue - -| make[3]: Entering directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx' -| /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: *** missing separator. Stop. -| make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx' -| make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2 -| make[2]: *** Waiting for unfinished jobs.... - -Signed-off-by: Zhenhua Luo ---- - spl/Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/spl/Makefile b/spl/Makefile -index 6dbb105..3156d87 100644 ---- a/spl/Makefile -+++ b/spl/Makefile -@@ -185,7 +185,11 @@ $(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS))) - $(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend - $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@ - --depend: $(obj).depend -+# Explicitly make _depend in subdirs containing multiple targets to prevent -+# parallel sub-makes creating .depend files simultaneously. -+depend dep: $(obj).depend -+ for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \ -+ $(MAKE) -C $(SRCTREE)/$$dir _depend ; done - .PHONY: depend - - # defines $(obj).depend target --- -1.8.2.1 - diff --git a/recipes-bsp/u-boot/files/add-fgnu89-inline-option-for-gcc5.patch b/recipes-bsp/u-boot/files/add-fgnu89-inline-option-for-gcc5.patch deleted file mode 100644 index cfe1c07..0000000 --- a/recipes-bsp/u-boot/files/add-fgnu89-inline-option-for-gcc5.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Pending - -From 4d4fcfc41288134b48b72ac69702f68741d7631f Mon Sep 17 00:00:00 2001 -From: Ting Liu -Date: Tue, 28 Jul 2015 16:29:26 +0800 -Subject: [PATCH] add -fgnu89-inline option for gcc5 - -Fix the below build issues: - CC drivers/crypto/fsl/sec.o - LD arch/powerpc/cpu/mpc8xxx/built-in.o -arch/powerpc/cpu/mpc8xxx/fdt.o: In function `ld_le16': -../arch/powerpc/include/asm/byteorder.h:12: multiple definition of `ld_le16' - -The problem is the change of the default C standard from gnu89 to gnu11 -which changes the semantics of 'inline'. The issue is described in the -Porting guide at https://gcc.gnu.org/gcc-5/porting_to.html. Adding the -'-fgnu89-inline' option fixes the issue. - -Signed-off-by: Ting Liu ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9995e00..00497cc 100644 ---- a/Makefile -+++ b/Makefile -@@ -349,7 +349,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ - - KBUILD_CPPFLAGS := -D__KERNEL__ -D__UBOOT__ - --KBUILD_CFLAGS := -Wall -Wstrict-prototypes \ -+KBUILD_CFLAGS := -fgnu89-inline -Wall -Wstrict-prototypes \ - -Wno-format-security \ - -fno-builtin -ffreestanding - KBUILD_AFLAGS := -D__ASSEMBLY__ --- -1.9.2 - diff --git a/recipes-bsp/u-boot/files/gcc5.patch b/recipes-bsp/u-boot/files/gcc5.patch deleted file mode 100644 index 12db94c..0000000 --- a/recipes-bsp/u-boot/files/gcc5.patch +++ /dev/null @@ -1,91 +0,0 @@ -Upstream-Status: Backport - -From 478b02f1a7043b673565075ea5016376f3293b23 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sat, 7 Feb 2015 22:52:40 +0100 -Subject: [PATCH] Add linux/compiler-gcc5.h to fix builds with gcc5 - -Add linux/compiler-gcc5/h from the kernel sources at: - -commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b -Author: Steven Noonan -Date: Sat Oct 25 15:09:42 2014 -0700 - - compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles - -Signed-off-by: Hans de Goede ---- - include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 65 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -Index: git/include/linux/compiler-gcc5.h -=================================================================== ---- /dev/null -+++ git/include/linux/compiler-gcc5.h -@@ -0,0 +1,65 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb similarity index 97% rename from recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb rename to recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb index 4a89b30..55e5700 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb @@ -21,12 +21,10 @@ DEPENDS_append_qoriq-ppc = " boot-format-native" inherit deploy -SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=sdk-v1.9.x \ - file://gcc5.patch \ - file://add-fgnu89-inline-option-for-gcc5.patch \ +SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=sdk-v2.0.x \ file://fix-build-error-under-gcc6.patch \ " -SRCREV = "eb3d4fc5759729d7af71ac31ebf6a7e8d0e79da3" +SRCREV = "a9b437f50e2051f8d42ec9e1a6df52de4bc00e1e" python () { if d.getVar("TCMODE", True) == "external-fsl": -- 1.9.2