From patchwork Tue Nov 14 15:48:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirza Krak X-Patchwork-Id: 837906 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4010:c07::239; helo=mail-lf0-x239.google.com; envelope-from=swupdate+bncbc3i5ww64ambbw5avtiakgqesoghbbi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="PiKxrdk/"; dkim-atps=neutral Received: from mail-lf0-x239.google.com (mail-lf0-x239.google.com [IPv6:2a00:1450:4010:c07::239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ybsPC3sJHz9sBZ for ; Wed, 15 Nov 2017 02:48:47 +1100 (AEDT) Received: by mail-lf0-x239.google.com with SMTP id y85sf2530989lfk.15 for ; Tue, 14 Nov 2017 07:48:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1510674524; cv=pass; d=google.com; s=arc-20160816; b=u2yryNt9N+ciCwIo7ga8/T7K/ixRZi5OSXmbivZ1stY/PP1oATYloScVhp2f6WM11k 6CMWVZpN0hzp72/AKofz1a+KTXabzW9gW9dCHVaOasma4/YhD9hgCRXvYcGTjTT9FrSC yqqfP7BMoJYAFCH1krxU304ber3zW0eX1OsRQSGWohLz6/veyuZWgI/O/P2AcM9O4B2u VuKc9nTdtTFK2ACObz3Ypr8YpaMl9Ixk9NV2JAL/YwemXr49uSIpcTYBwH3G9HVoZWkc E/QptHf516XKqra/xKpARSqqEto6DkNxbH1dr7bZsr0yHNHYy2uWQM8D3vJ4x0rMC12m TKYA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=NY4c/56mV0HW/91rMjh89hXap/LdKS/Lgd8JuGd/9KQ=; b=nY5FD9cXH00ja7TesJM6bgmZmn7BR0ulayCw3jc7a+alUguJTkVUW+ms4+Kc3sgENO ZgT/G3SgRSSTekTxUWr/GLixdBeLJhYBTfITYVVriPM13xwOZU1qq8JOdQjZpkKQgwMt Ae3Z5aQ7J9PP/IqlQkNigX/2FChRWNeb0L9jGodlwNWNxEXdm/go0xzhM9eeAYdmighj 2Dx4vpljfzOt5E56csMifCrY99K6kDjP65lzF/wO4Ii9CY7uyJ1c7R2lPp/fFQo4UYn4 WAxkXFtgWZSVV3nmQpmXywMdrXWR0NFUForM+T3EICTwFeczXtvVEFyEcICXNJ2vS2yE hZaQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@endian-se.20150623.gappssmtp.com header.s=20150623 header.b=oNZAKeg4; spf=pass (google.com: domain of mirza.krak@endian.se designates 2a00:1450:4010:c07::233 as permitted sender) smtp.mailfrom=mirza.krak@endian.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=NY4c/56mV0HW/91rMjh89hXap/LdKS/Lgd8JuGd/9KQ=; b=PiKxrdk/ItBpOq2COYv13Y1r+aYFKZ3Cae3wk7D+I2NEogKtVLC3IrsNY968LtUqG6 MFfOel/lxOXSgel7xoYivEkQ3f85p1WxPG5JNkEjTZS9zfQDYQTYaUhoZRbXnitJnYZh PQRDpInh6bmClgNFcQXiZaAqbzZf3v+6WvufsuvObqNo/15rpXHqoZSwKopcS0DRURgj wZI42HDdcBbJQAzIzoZzIbBJ2nHKsWZqDUbbNzrx5jjTUutpwZC48isr0PI0M8ZxJmwq BsIKDECXpgJM20RDa2Ya3oissvK1w6j5A1QuBCCtP/aM1rrmP7O8m+xQntYq1Xpr/7lB i6tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=NY4c/56mV0HW/91rMjh89hXap/LdKS/Lgd8JuGd/9KQ=; b=TZ6DnHR1igALkrH3AFi1eefixpyalEsfCeNX5DHb/FIX3TRwsnu00IDme34wKzR+Kb U9acsdPObZr9Ru73cj0CkSS9zXNDSYk2q2URqKrHffkCZVm4aEG6P8MMxfTCdcPXPtFk UcJouTkOCo2a0V+wXEelXGwyEI5yPO6ow9PVulgEdOZ+iNpiWWkstZDOdlSeRPo1gBjg ycjqDkFtpEr38h1pDIxDT7wc9blkfoMAAJ3OY90HtwT/60bWoX388BnoTa7UqCY/YuTj KbTT2J4dDRHraXBE93vTabUX6aPARf60s2W6RmpgBfBGc63kLF8fpiQrq2LWFER9IY3L vsow== Sender: swupdate@googlegroups.com X-Gm-Message-State: AJaThX6qJo0AQs8h2YBkjjc0FPw6qS1oTRwUpHjUfj9Bfs/V+QFfVqMI DQDTn4uYzB0NYhq9UMKG39o= X-Google-Smtp-Source: ABhQp+SAtMWVuk1YTVhAcZVEsSN9NPEQtU5BVLEWTmLvCL1acs3ATTYma2y2ub2W8KAVDDygSgKH/Q== X-Received: by 10.25.15.203 with SMTP id 72mr45186lfp.13.1510674524131; Tue, 14 Nov 2017 07:48:44 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.46.109.9 with SMTP id i9ls248896ljc.14.gmail; Tue, 14 Nov 2017 07:48:43 -0800 (PST) X-Received: by 10.25.204.203 with SMTP id c194mr760532lfg.39.1510674523615; Tue, 14 Nov 2017 07:48:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510674523; cv=none; d=google.com; s=arc-20160816; b=WVDbCUAcmVMN9cTfnZbZo5lV+dbMyWhxOpfylyn8/pu1JvCMS+YwPj3rDIrLwfkcnn W/djJAtg7e3X2PZXgUD4Kis/lsMB/1mlyaUjSqjD0D5B0qKuOvDc8WqhYV2oZYvuu105 Wm6pm1k/vb2Vtu1hKv5tFBUofFB8lmk5EX5/hpM0Dj1Kx/57soTTfmAGRjZAetRxGNZx CSwf+/aDsqvAmMqHQRghNnZtevB+Nr3uYZ+zp7PLF3V8OFoDJ2R5V2NurjtmW9O6A4Vj 1YuGlsfbIc57Bb/UXRH2rbO5AfFN7Bs3JTm7eakgYP7t+exGXzQOc1+U+CJyo7dU7XnW bvTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=HaWEXiyUP4CgarZjjt1gqHKVa83AVu381JQEABZSjA8=; b=Kxat4+9wQzFmAAlzeQd1piTmLxvI/+pGzF2f0d2PJXI8kVzGZW+om0IkGEDWT9awts U3BKM685EfjveNCM2iJwL5ScPzxdNcPhNWlBIsxnSlDp5s9OX5eM0VOq0VzDimifSKw5 Y3dbcPfVXcxUB9DpXUwWZyTyZvlXY2teTz4XVPehFrXxb+xRg3mLbg/dXf8nNiI3XXjC diMf6opnZc6rq97AfJ7Ix2Iue/q0itBk3MnoLt8jxoZAEboGdhjacNa6kivI5LbVs3zq NElhxvZy79QJMpuwIGoS8cyFIxBweoUjY8i5Y1JCe9OcmxVTie87rkC2QZyyAZ6nUiEF mQpA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@endian-se.20150623.gappssmtp.com header.s=20150623 header.b=oNZAKeg4; spf=pass (google.com: domain of mirza.krak@endian.se designates 2a00:1450:4010:c07::233 as permitted sender) smtp.mailfrom=mirza.krak@endian.se Received: from mail-lf0-x233.google.com (mail-lf0-x233.google.com. [2a00:1450:4010:c07::233]) by gmr-mx.google.com with ESMTPS id q77si114622lfi.1.2017.11.14.07.48.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Nov 2017 07:48:43 -0800 (PST) Received-SPF: pass (google.com: domain of mirza.krak@endian.se designates 2a00:1450:4010:c07::233 as permitted sender) client-ip=2a00:1450:4010:c07::233; Received: by mail-lf0-x233.google.com with SMTP id f125so22788692lff.4 for ; Tue, 14 Nov 2017 07:48:43 -0800 (PST) X-Received: by 10.25.16.206 with SMTP id 75mr3862903lfq.66.1510674522834; Tue, 14 Nov 2017 07:48:42 -0800 (PST) Received: from e7eb581d1ce3.endian.se (h-212-116-75-34.NA.cust.bahnhof.se. [212.116.75.34]) by smtp.gmail.com with ESMTPSA id 1sm3325910lfz.35.2017.11.14.07.48.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Nov 2017 07:48:42 -0800 (PST) From: Mirza Krak To: swupdate@googlegroups.com Cc: Mirza Krak Subject: [swupdate] [meta-swupdate-boards][PATCH 1/2] rpi-uboot-scr: rename boot.cmd to boot.cmd.in Date: Tue, 14 Nov 2017 15:48:38 +0000 Message-Id: <1510674519-233-2-git-send-email-mirza.krak@endian.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1510674519-233-1-git-send-email-mirza.krak@endian.se> References: <1510674519-233-1-git-send-email-mirza.krak@endian.se> X-Original-Sender: mirza.krak@endian.se X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@endian-se.20150623.gappssmtp.com header.s=20150623 header.b=oNZAKeg4; spf=pass (google.com: domain of mirza.krak@endian.se designates 2a00:1450:4010:c07::233 as permitted sender) smtp.mailfrom=mirza.krak@endian.se Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , This file was renamed in meta-raspberrypi 43e0169 ("rpi-base.inc: Simplify setting of IMAGE_BOOT_FILES") and as such we need to update the file name otherwise our changes will not be applied. Signed-off-by: Mirza Krak --- recipes-bsp/rpi-uboot-scr/files/boot.cmd | 5 ----- recipes-bsp/rpi-uboot-scr/files/boot.cmd.in | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-bsp/rpi-uboot-scr/files/boot.cmd create mode 100644 recipes-bsp/rpi-uboot-scr/files/boot.cmd.in diff --git a/recipes-bsp/rpi-uboot-scr/files/boot.cmd b/recipes-bsp/rpi-uboot-scr/files/boot.cmd deleted file mode 100644 index 71c8c3e..0000000 --- a/recipes-bsp/rpi-uboot-scr/files/boot.cmd +++ /dev/null @@ -1,5 +0,0 @@ -saveenv -fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs -fatload mmc 0:1 ${kernel_addr_r} uImage; -if env exists rpipart;then setenv bootargs ${bootargs} root=/dev/mmcblk0p${rpipart}; fi -bootm ${kernel_addr_r} - ${fdt_addr} diff --git a/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in b/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in new file mode 100644 index 0000000..71c8c3e --- /dev/null +++ b/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in @@ -0,0 +1,5 @@ +saveenv +fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs +fatload mmc 0:1 ${kernel_addr_r} uImage; +if env exists rpipart;then setenv bootargs ${bootargs} root=/dev/mmcblk0p${rpipart}; fi +bootm ${kernel_addr_r} - ${fdt_addr} From patchwork Tue Nov 14 15:48:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirza Krak X-Patchwork-Id: 837907 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c09::23b; helo=mail-wm0-x23b.google.com; envelope-from=swupdate+bncbc3i5ww64ambbxfavtiakgqejk4n76y@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="kgCKi+ue"; dkim-atps=neutral Received: from mail-wm0-x23b.google.com (mail-wm0-x23b.google.com [IPv6:2a00:1450:400c:c09::23b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ybsPD1cPLz9sBd for ; Wed, 15 Nov 2017 02:48:47 +1100 (AEDT) Received: by mail-wm0-x23b.google.com with SMTP id e8sf5015217wmc.6 for ; Tue, 14 Nov 2017 07:48:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1510674525; cv=pass; d=google.com; s=arc-20160816; b=FJqB8kEshx5ETPSD7xeh0jPt2wpxBJ7p/WJFeW1MP+dbmazisvO871/46jgILLL+rn 50dmvHWyvWjxIAa79yRKiLmFGPskQShesz6xHTeO2gIfqD3Rjd87u4F7WDmRZm/DgkrN cC97efOTleCKIOASlaijfZpGpgE24h6Qo4eetEyDs3dXKJRP6atz5+5xw/0/E04VuyXg H0KRTKosZlffcoMoyc2EOS+7lRVmnF2GI2uLRfdJ5Twr4WEI4SPrdaoJSawOytZ47ZXU fZ5t93e0DDlWQFU2uI6OGIQyw0+n1hzdZ9gA3Y47vlDp83LLzot7lFIuwN3i/92RB+BG DMsA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=46emjTHYlsmrNF8wf2jvU6CsRpdQd4L9yI5NqQrrTf4=; b=wifDg/EfiLqBXSKaVua7Osqx/LReXpQx7fQ9HmcHOOLKFlR4/TIO/2iHoe8paG8tds neQy5Q+bl9Q2U6FJloG3YNYqtWqi1okWVu/nvOLDxF/PsGafKHh9+i6IXH6TJzXq7gWb Ec03dfvm0ORAEH+mf+/1aoiiB16l7S2LVtTAc39s5t4RpcLuRxufv/IiO5h6QN+Vwogw qoHG99fJywRVujGzSpJ3UixqzxQSlVOlO/3WALhA9o9ylMhGrpXZUpDCiE67L3iLioDb pfgxKTOMiSikXHUnnEu1WSR85FqfsAMQMlA8lU8BE0OPJxAuUBWowgha4OEKhM/Vn1or /MFw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@endian-se.20150623.gappssmtp.com header.s=20150623 header.b=uhl2doDZ; spf=pass (google.com: domain of mirza.krak@endian.se designates 2a00:1450:4010:c07::22d as permitted sender) smtp.mailfrom=mirza.krak@endian.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=46emjTHYlsmrNF8wf2jvU6CsRpdQd4L9yI5NqQrrTf4=; b=kgCKi+ueLSEBwtooH3RbcAHEqlvfUSv9kNE5sxCTHjhL1fFyaAPAMBRQHpqqIFtthE h60khn+aZzj2TwWAtxJ7t8T/dtBVdhBCQu8vsbVEax9n+LLblBlidwejpYUVykIDX2vO 71OpjPuOEhq86YsVG3tWIfTlS29KBZotrDO1lltzt8nC1zDN49oBaspIge/JwB0CTa27 /JicDNyOuvQmFcv+MfboeurqQhQCAxM0ewEMEkoSR2dOLxJdNRXzuF5qaQZRo4XLpFRW 0VOcmvmyCAaLMTURF8Ec2f2o44fBRxbx/Yt7j28HRruTpooXj4tKD5uLZcWF7tHJhXkJ JEAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=46emjTHYlsmrNF8wf2jvU6CsRpdQd4L9yI5NqQrrTf4=; b=R8+7BqPWukKChcAx1wv8haHP5w+zm3arpdROZWSyYxvLrWxuT4i1jPVsN/4AKMZz1H 1i9fFLmbqnPy4TWNdJhiy7YM34CkhTBWlam8YXV0ogqdBOBwJ5Nql33Vm6muPF8AbkfK 4zWBZkb1uts9Shoq1pDAOVGBkhmHFX9Tcme4V4wdkNXFUiGrtELVMFFzQAHKZ6fqQntE v7X7t5+evpURgZjHPxiciJ3NFNprhCzxFefo0pPbS8LQs1AwcCAhSbefOJEbYtCT5CzI ip1BbSTitHnR133WxS7tgKJh5oma0J8kEPtmuMrGdu85a6atkLvCyQ2ZmTGYp6IYCvCn 5ltA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AJaThX6/zS0+KdUqGSgBRPIG2VUAbBrLkrqoaGB4a2Y6RAW371ZA7QWU kykKTbZmobVohXTgKfMe7SA= X-Google-Smtp-Source: AGs4zMYJtPlAJ+IMY5Ksfgpcd1EEZEE+cKPl79xh52Fp/dRUV3k0nCfmWaxA3Q1I2aQvVF4tsSrZEw== X-Received: by 10.28.188.132 with SMTP id m126mr148175wmf.2.1510674525113; Tue, 14 Nov 2017 07:48:45 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.223.130.3 with SMTP id 3ls4158904wrb.4.gmail; Tue, 14 Nov 2017 07:48:44 -0800 (PST) X-Received: by 10.28.20.11 with SMTP id 11mr1155702wmu.29.1510674524669; Tue, 14 Nov 2017 07:48:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510674524; cv=none; d=google.com; s=arc-20160816; b=JquuLx0qB8xPMIi5g9SwAB9k9BTwgQwPdm08ntNpkFg7w53G1BxLzUwzJXisd6Kf/K vLpw6f/0rh+fGhaVBeInYtRx/4UU8uKz7Fw9/nYnDMxwEYrIc6CeytJoSPf4gAwSJe5C mnuEDYCQWKKKwEC80feegwI/913f4KOk3vYtR5mtMcZ9aWh4k9Pb/GCtnfemfH/TwFwn wJ2Fd3QDubQx5PmArx9wQUFh2gxksukqzZJud3ARXRwbXC+wz8yysKzFSF733/ZwOL9F tysdJsOeDyGrSQAdDxPylOk4Dc+eX+TspUmf+vhKgotK1Q1Eyvn4lDYhYv+Exm6/4Yo0 JotQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=l+elpgOx/6tkNH+xZZRo38+2nNizs9l+NpPaex90nB0=; b=Q+ORyEzlctarwiR7H6Qz1jwDvgFyzt8ebOgJ2udQVOmav/bQAiE0TV064po6TREUYN T0XZg88cflQ0k5K/f3Yd/8ZlKykPrdPA8cUWvUm1SFAm+qwNPDs7DEh8quS513+Go+Kr /6EiXZxkkMSP5o4ZliksV1FJOOKNmEEtnkP15HfRbg91bGPX2bYgni3Jch6IP4/yQEmR a7stDWQBxd3nS7Fm2dZEBRlaX0Xic9mm0/R1nHOYzKc3e74eS5P9/suIdIPknWfUQhD9 YlRE/R96xF5ZqFiaI9cHCekqaGyY7z3GxOt8549opD+npf/DvHKVl67PQupnwIUbubBC kVkQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@endian-se.20150623.gappssmtp.com header.s=20150623 header.b=uhl2doDZ; spf=pass (google.com: domain of mirza.krak@endian.se designates 2a00:1450:4010:c07::22d as permitted sender) smtp.mailfrom=mirza.krak@endian.se Received: from mail-lf0-x22d.google.com (mail-lf0-x22d.google.com. [2a00:1450:4010:c07::22d]) by gmr-mx.google.com with ESMTPS id z15si829781wmc.3.2017.11.14.07.48.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Nov 2017 07:48:44 -0800 (PST) Received-SPF: pass (google.com: domain of mirza.krak@endian.se designates 2a00:1450:4010:c07::22d as permitted sender) client-ip=2a00:1450:4010:c07::22d; Received: by mail-lf0-x22d.google.com with SMTP id 73so8498098lfu.10 for ; Tue, 14 Nov 2017 07:48:44 -0800 (PST) X-Received: by 10.25.113.22 with SMTP id m22mr4203647lfc.257.1510674524023; Tue, 14 Nov 2017 07:48:44 -0800 (PST) Received: from e7eb581d1ce3.endian.se (h-212-116-75-34.NA.cust.bahnhof.se. [212.116.75.34]) by smtp.gmail.com with ESMTPSA id 1sm3325910lfz.35.2017.11.14.07.48.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Nov 2017 07:48:43 -0800 (PST) From: Mirza Krak To: swupdate@googlegroups.com Cc: Mirza Krak Subject: [swupdate] [meta-swupdate-boards][PATCH 2/2] rpi-uboot-scr: sync with upstream Date: Tue, 14 Nov 2017 15:48:39 +0000 Message-Id: <1510674519-233-3-git-send-email-mirza.krak@endian.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1510674519-233-1-git-send-email-mirza.krak@endian.se> References: <1510674519-233-1-git-send-email-mirza.krak@endian.se> X-Original-Sender: mirza.krak@endian.se X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@endian-se.20150623.gappssmtp.com header.s=20150623 header.b=uhl2doDZ; spf=pass (google.com: domain of mirza.krak@endian.se designates 2a00:1450:4010:c07::22d as permitted sender) smtp.mailfrom=mirza.krak@endian.se Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The boot.cmd.in supports multiple kernel image formats in meta-raspberrypi and it was introduced in 43e0169 ("rpi-base.inc: Simplify setting of IMAGE_BOOT_FILES"). Updated accordingly. Signed-off-by: Mirza Krak --- recipes-bsp/rpi-uboot-scr/files/boot.cmd.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in b/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in index 71c8c3e..a2986ac 100644 --- a/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in +++ b/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in @@ -1,5 +1,5 @@ saveenv fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs -fatload mmc 0:1 ${kernel_addr_r} uImage; +fatload mmc 0:1 ${kernel_addr_r} @@KERNEL_IMAGETYPE@@ if env exists rpipart;then setenv bootargs ${bootargs} root=/dev/mmcblk0p${rpipart}; fi -bootm ${kernel_addr_r} - ${fdt_addr} +@@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr}