From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 194A4E00DC3; Fri, 17 Jun 2016 00:51:44 -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 SPF_HELO_PASS SPF: HELO matches SPF record * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [65.55.169.62 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0062.outbound.protection.outlook.com [65.55.169.62]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id ACC4CE0071C for ; Fri, 17 Jun 2016 00:51:18 -0700 (PDT) Received: from CH1PR03CA009.namprd03.prod.outlook.com (10.255.156.154) by BLUPR03MB1443.namprd03.prod.outlook.com (10.163.81.152) 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:55 +0000 Received: from BY2FFO11FD030.protection.gbl (10.255.156.132) by CH1PR03CA009.outlook.office365.com (10.255.156.154) with Microsoft SMTP Server (TLS) id 15.1.501.7 via Frontend Transport; Fri, 17 Jun 2016 07:36:55 +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 BY2FFO11FD030.mail.protection.outlook.com (10.1.14.211) with Microsoft SMTP Server (TLS) id 15.1.511.7 via Frontend Transport; Fri, 17 Jun 2016 07:36:55 +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 u5H7aldw014803; Fri, 17 Jun 2016 00:36:53 -0700 From: To: Date: Fri, 17 Jun 2016 15:36:16 +0800 Message-ID: <1466148986-926-4-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: 131106226155416335; (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)(1109001)(1110001)(339900001)(199003)(189002)(81156014)(81166006)(11100500001)(97736004)(2906002)(106466001)(47776003)(86152002)(36756003)(586003)(86362001)(50986999)(76176999)(356003)(105606002)(2351001)(4326007)(2876002)(110136002)(8676002)(5008740100001)(104016004)(8666005)(189998001)(6806005)(2950100001)(19580395003)(5003940100001)(229853001)(19580405001)(92566002)(8936002)(77096005)(33646002)(87936001)(68736007)(50226002)(85426001)(230783001)(48376002)(50466002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB1443; 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; BY2FFO11FD030; 1:DTw1JQaj7Ow+CXwmKx+Toxo+SOkkFb90oEd20v2pIdyIZE/bduQzBAarud5u7vLx3+ebMK8OpAWpkVXjJzP9j9MMKghpgB6lKYbv5uhLnTdwitsu5koeCXLos7I0XEKPmqMCY8vfvOJSONBxkermasbHNtO6jKdgOCPhH1zOCwhFSPAKOxVfaH7fARgfO8FvpA+eh/SWWg4Z7LMWeeVKw6XysUkyqfayhJywvdMJ447oe+hhgPvuoCJaQ85OAq6tvExqCzue0/s4HIvaTuSeGFUtGZOIwwJYKm8HHX0FohKHEr88J/zX8m6mm/n7gAWzQoF6ZDiEGcW43GX7bNcqaO2OaqUqUFv7fPmzFj2Qy/x3MWfmGAx+XMpV4w9IHhNglAbNEkIzHkxXPilSVTdNzvvVk8Kg+x049oj445deb/LMBgdRMdKi+aEwaL0TtUwMmHyR/VVlfKTn+lHutTSmpWGEL0d+55621/eHwQ08hR/30Limvs1/QvjROOR97Ry1QomLEW0N1EW9oyOnvLJkdM6bDaIJuLSUaPac9HY++XgnqgTzQrf6rEIIxYJZiXlwxmUxyoBvcNjlL79xzktttNBrr9GcytRVXyQ8d/pt9LSDxOrZAc//MWn7Hk0VzsYXO/aLkmvmN6/KqFwYYaykqe8YQKkijc79j5B3Wo69Yl62isOmTHBRDVzKNyyjq2Wi MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 19a8f344-fd92-4929-eb0f-08d39682284c X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1443; 2:3J6IjMHqVH/3FlcMm3+3es2/4+PCwcxiNa1CqTsnDxmuV5hCP75/pu18QFRMqKuYWx0b0SdZqNsrm02jfY+fxVRQh52pux7KJal4nRhSD2I6VxeI5gE02KAkfSGc2WiIbcEAgOuutmLjZU7QtOM9bNPEuC4eltXV1ZlFAxidLZJFHheVYpBYs5c4uGcyidV/; 3:Owyra64bHtYM0CWbEJ42stdb8gmI6sExd5CjG0FWVBX4cbBZnvBQuiYoMczxEOraAbR7r4Mm6zKY3IaEOuFDWdWkpWReEn+/NhPWdWeDsPGM/ZWA/+uIa5GvB2KHKkpAq9f3xPFf3YYpkD5cmpdQTU+cp1H+DZhQ3U0uW6PGe/7wEIKpNxfzV+RSsdfBENNPVrAF2xpHHVMBNmM1qEOyIBGfgIqFEbA8+mkVkAzzxcE=; 25:GaLLd/GlDUgj6dNY3ZQEbJdPG4C9UXvALaIsrC2Vm2/PjAFkaDTOfi3Qvu5begpodM6btzvCAkNgW7Ji2Lsgd72QqKpZTv8Yi8K9dItPhNCa77IV0P5vSM4ClR8f9ZZ9sXmANTIvBzVVn+DmsJSfZYcZmGZ6L6lIPL0EsQkS3JPCu22+TeUS2PqP6mXTsJA3fxKA4kMviQKgafNF3Bx9WWa2Sv76t051m9i5NZM5hmqXJz3dLlDUpjq3Ej8DjSthV88azXH7ZLSvqtIQsbl2Ws715Ot9TlYZMvhiLEbh988U70E47XhBqnzb7t+Om4spVqRrNkKsHraBUJkrQeQ6Y71i9o1a8uS2GbsTpr+0ZakqvqNQnG4SC+0XQ6msPIz+DmISrfZXbur2HXTsstHkPMKKlIw6WmMS8EEsSNK2qiM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1443; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13023025)(13017025)(13024025)(13015025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:BLUPR03MB1443; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB1443; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1443; 4:JEFPirCwqVPB3z6bOaF/ePXZI0nvJRT+hFqnW5dZbauK+stBNKdFXXJK2xqtGutEYz6LN9Q8YK17F6h2vk0CHhnvYXjn2aMwWJ+gSVYJ7IrnpZYz9C4slroa5+iK6WUfbeWSevgUGlTOxWf8FZeAARd5Rk1lxkI8j1rF07hEY2/BEwAKB1YJslXAUHvcKrtgkKYXkDytT8bnPYs93XDcjYB+iKMPb0d4qmeMEmJqyTuEXBzV4YdqF0zbQjFiYpcpHRntkTpwDoc8lFGdxwKeK69NiRyCThEsBxM2msaHil1lYFAkftWmmmT4DZQGvcnMdBqMuOR8ckKukrFzuuXrF/XZdl8tHaSLO5OBwWNx0JZBVBqjU2ENL8GTqb8Q5jQlbHShR0xdISuT5XWYsQzBT5ritstZ+xIJyD1LJS5EIy3e5L3DDU89BBuPSJTpGAalGoaE8XZUGYsxt7SfDDwAmuVsI6avjqGw8P7DUavQ50NVTHB7N4TUu48ThD0bpjHw9yxZE6w/dgkoiSJE1rIFPQ== X-Forefront-PRVS: 09760A0505 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB1443; 23:gtt8YcTCUPQOBZvP/i+Z3JYTe/XK/SGfqN/5PW+uc?= =?us-ascii?Q?EuBSCUABcGO2y3eHEq19xWoJ0zFHPXPPO+nS4tzFA+t4qW9aP3/AWcTViV4d?= =?us-ascii?Q?QPx2MTUurYUBVd4BBtkAlLO2vS5z1kB0bPkgSIUF0pig92RkXvSKVTlBK0mF?= =?us-ascii?Q?qLHzk9hJ1wZh0gT1NVyMReM5+16uzHXonrG/mQCyUZMG76DSOT6ZRuMoY54f?= =?us-ascii?Q?4AYaI9KlD6lCrxpBIgmcKrAMC3CSa4I24v25porevRZVCXwAIPDGAIf/6GGs?= =?us-ascii?Q?pEIxTw5wDpo6XWGf7QCb1D6UukgoyjdBJ7v/9aczSGC9h2iLgE02ksGjoxIg?= =?us-ascii?Q?ghwckdPeEhOugYWn9TzYjU6G77/MYE5HJNYbHcTQA81TEr+u2A0PsM9nzVL0?= =?us-ascii?Q?05d4A1P2Q2SuyuqyrNtm6Ds+qvSZmnB7QEHItmgT0Xm/zLIsSD3p1GF7Op8i?= =?us-ascii?Q?/oc6wRmuFiIl++VmsNqj7KagcvKlqWbb9FzTPopapDlBOxAe7QVcUa0BbFiN?= =?us-ascii?Q?k4YVT6Nrbwp6Hx6RjsNz5bOFzmziBxFsReGPWmQZ999aMmzEy9gQsDg+o1d3?= =?us-ascii?Q?5ad5imSijW+M2cGASixLDl/+g5qmp11bbEMA1g8RIljn5E7wJWASIGdQcI13?= =?us-ascii?Q?WI+BeU4ou10iVoRUAcFsK5sxEj7JGamvFRzGLXX/nHWgXqYHrdAL2vsRUA0q?= =?us-ascii?Q?MlDSRZQEXapktIe9PrN/3oQZo14UGTVlvCerY1FHba0cBH7KmQVRdxaKBELA?= =?us-ascii?Q?ESLuQQNPg/AxZ9OmlKVlOv3xFABCG2DiMO9Bg8vwTy6MMx4RxrgJGmCkfF9Z?= =?us-ascii?Q?yjS98WIoW5P4x7dxmY/H2hvGXilAnZh24d0pyEgVbWpaZEmnAuyaTrI7akDR?= =?us-ascii?Q?PbU/W8XwaCAWzUbdRPg/g91BggwI4jxYgfSfQyxHA/WrYKeXvek+joAo8HVV?= =?us-ascii?Q?wmn3R+QOp6qtYS1pNhh8EC8cf6mlqCi6oSGZ4zhsa8weQuphux+yB10Vl+pW?= =?us-ascii?Q?LRkNISQpmKPo5Qk4cFGw1dudApzHztSZ+0D6ivOLOoYMlww3u33aycZqIj4W?= =?us-ascii?Q?OM1pcvjuvX3uTHqMF4TPukyA7dYlW5Zv9bJD8W6aChba/Lx1RTn4tjrHDMPD?= =?us-ascii?Q?IekcFKOYOpZhdrsNwm0FbHSy8/i3HHRxv9BJdjRp7tE3W+bdG/dkPrldibJk?= =?us-ascii?Q?0rH/Mtkt+IUxubzguEoPTh0or8go8y3o0h5PxwGSUdtypU6JTC0cK+LbqXB+?= =?us-ascii?Q?q4CrnNKDihfBa1IrY4=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1443; 6:xyDJ3P3olpI3zsg9L9mhZh66vMLJHLok7besHS5BYJtf+wo6ptEjJ2r5xO5b3cRSDdQ29lXQhKqftmC50rFgA0wsWzBGZoQ4lRvSvxTqs3MOQWIUmtqQb/4WEkJ/qa/TWgik3Y7FI/IvNUwNveyNW0yRNoMYemhgym5jZoXC+bmDKjvyMK1/2bGVlzXfq4KxQXqlS6jRflm987H1klx1qjvYli2JRFfamON6058u9FEVjVGekV/UhoiMpqp5i3uVhxqS5K5LvqFOb3PLePgBpZguXDJouguTRv/frheHVaQ=; 5:HM77dnHjj+OI9XOneGOsJtRfMtZ1Yi4BgwCfpkEXf2dG85qc3bRvj31+0IwR/gYx299SI2FSj1ZJYTZKTaYIqAXhMw5Xjv8UG/vFqpvuyJRqOPop+NpzaPjO7Y0lQvtkOODCPBIrytciKVhhZq1nPM9AqzxnId59qYJcmNlpEgU=; 24:V5/EL0AeZxHrW9l7w/xQ/Scu3uTuqpXAO9e7P820AdxTtpyxnjvW3A63zVxrEX2MTSD9+yCwG+9cz4ZfwGSAQIPe7SZWf5KHrqk1IH3vvBU=; 7:1yvacEfx1Tc1wiiU5opCXzMSXx8yr81EGl9WLW2bvXtiw/UDO8vyULAQ/cruSAr3gxX9Dz8yPL/JE+izXp8PuDJWXP1EhHAtP/DSZzqyT3qLhyDauVk/PPVbfAmBOVTXkvuKRHLXA2fBCgpYy5ooncvVojYovUSx0A0I1vz6mKCwn/GHp8SMGURoBwULXWXdm6F8cBa8JciszPZbrD5kjQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2016 07:36:55.3544 (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: BLUPR03MB1443 Subject: [meta-fsl-ppc][PATCH 03/13] u-boot-qoriq: switch to new UBOOT_CONFIG format 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:51:44 -0000 Content-Type: text/plain From: Ting Liu By using the new UBOOT_CONFIG format, the final u-boot binary will be configured in machine config file, and will be processed in upstream u-boot.inc. Remove the codes to copy final u-boot binary, and append the special steps which need boot-format tool. Signed-off-by: Ting Liu --- recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb | 53 +++++++----------------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb index 55e5700..d43a4a6 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb @@ -55,52 +55,23 @@ LOCALVERSION = "+fsl" EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' do_compile_append_qoriq-ppc () { - # some board's final nand/spi/sdcard binary was not named as u-boot.bin unset i j - if [ "x${UBOOT_CONFIG}" != "x" ]; then + if [ -n "${UBOOT_CONFIG}" ];then for config in ${UBOOT_MACHINE}; do i=`expr $i + 1`; - UBOOT_SOURCE=${UBOOT_BINARY} - if echo ${config} |egrep -v "SECBOOT|SECURE" |egrep -qi "SDCARD|SPIFLASH|NAND"; then - if echo ${config} |egrep -qi "NAND";then - if echo ${config} |egrep -qi "^(BSC|C29|P10|P2020RDB)";then - UBOOT_SOURCE=u-boot-with-spl.bin - elif echo ${config} |egrep -qi "^(B4|T1|T2|T4)";then - UBOOT_SOURCE=u-boot-with-spl-pbl.bin - elif echo ${config} |egrep -qi "^(P2041|P3|P4|P5)";then - UBOOT_SOURCE=u-boot.pbl - fi - elif echo ${config} |egrep -qi "SPIFLASH";then - if echo ${config} |egrep -qi "^(P10|P2020RDB)";then - UBOOT_SOURCE=u-boot-with-spl.bin - elif echo ${config} |egrep -qi "^(T1|T2)";then - UBOOT_SOURCE=u-boot-with-spl-pbl.bin - elif echo ${config} |egrep -qi "^(B4|P2041|P3|P4|P5|T4)";then - UBOOT_SOURCE=u-boot.pbl - fi - elif echo ${config} |egrep -qi "SDCARD";then - if echo ${config} |egrep -qi "^(P10|P2020RDB)";then - UBOOT_SOURCE=u-boot-with-spl.bin - elif echo ${config} |egrep -qi "^(B4|T1|T2|T4)";then - UBOOT_SOURCE=u-boot-with-spl-pbl.bin - elif echo ${config} |egrep -qi "^(P2041|P3|P4|P5)";then - UBOOT_SOURCE=u-boot.pbl - fi - fi - for type in ${UBOOT_CONFIG}; do - j=`expr $j + 1`; - if [ $j -eq $i ]; then - cp ${S}/${config}/${UBOOT_SOURCE} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} - # use boot-format to regenerate spi image if BOOTFORMAT_CONFIG is not empty - if echo ${config} |egrep -qi "SPIFLASH" && [ -n "${BOOTFORMAT_CONFIG}" ];then - ${STAGING_BINDIR_NATIVE}/boot_format \ + for type in ${UBOOT_CONFIG}; do + j=`expr $j + 1`; + if [ $j -eq $i ]; then + # use boot-format to regenerate spi image if BOOTFORMAT_CONFIG is not empty + if [ -n "${BOOTFORMAT_CONFIG}" ] && echo "${type}" |grep -q spi;then + ${STAGING_BINDIR_NATIVE}/boot_format \ ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \ - ${S}/${config}/${UBOOT_SOURCE} -spi ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} - fi + ${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin + cp ${config}/u-boot.format.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX} fi - done - unset j - fi + fi + done + unset j done unset i fi -- 1.9.2