From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Greylist: delayed 368 seconds by postgrey-1.34 at layers.openembedded.org; Fri, 27 Apr 2018 14:58:03 UTC Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by mail.openembedded.org (Postfix) with ESMTP id CCD2C607AD for ; Fri, 27 Apr 2018 14:58:03 +0000 (UTC) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 40XcMw04yDz1qwJK; Fri, 27 Apr 2018 16:51:55 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 40XcMv5t8bz1qqkk; Fri, 27 Apr 2018 16:51:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 6mY6hROYkcjG; Fri, 27 Apr 2018 16:51:54 +0200 (CEST) X-Auth-Info: E6d0EOzik9P3EjR4kOVtgP6/CRBi9uJ5CvKeaHkQ9xg= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Fri, 27 Apr 2018 16:51:54 +0200 (CEST) From: Lukasz Majewski To: OpenEmbedded Core Mailing List , Marek Vasut Date: Fri, 27 Apr 2018 16:51:39 +0200 Message-Id: <20180427145139.30732-1-lukma@denx.de> X-Mailer: git-send-email 2.11.0 Cc: Tom Rini , Stefan Agner Subject: [PATCH] u-boot: Add {gen|deploy}_default_envs tasks to generate environment images X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2018 14:58:04 -0000 This commit provides the ability to generate u-boot environment(s) as images, which afterwards can be used to produce image (with wic) for flashing (eMMC or SPI-NOR). This change removes the need to run "env default" during production phase, as proper environment (including redundant one) is already stored on persistent memory (the CRC is also correct). Signed-off-by: Lukasz Majewski --- This patch depends on "u-boot: Upgrade to 2018.03 release" https://patchwork.openembedded.org/patch/149998/ --- meta/recipes-bsp/u-boot/u-boot.inc | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index c2bcf99840..2796e503cf 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -305,3 +305,38 @@ do_deploy () { } addtask deploy before do_build after do_compile + +# Create new rules to extract default envs +UBOOT_ENVS_DEFAULT ?= "uboot-envs-default" +DEFAULT_ENVS ?= "u-boot-env-default.txt" +DEFAULT_ENVS_SIZE ?= "65536" + +# Generate default environment +do_gen_default_envs[doc] = "Generate image with default U-Boot environment(s)" +do_gen_default_envs () { + ${B}/source/scripts/get_default_envs.sh ${B} > ${B}/${DEFAULT_ENVS} + + # Generate env image + ${B}/tools/mkenvimage -s ${DEFAULT_ENVS_SIZE} -o ${B}/${UBOOT_ENVS_DEFAULT} ${B}/${DEFAULT_ENVS} + + # Generate redundant env image + ${B}/tools/mkenvimage -r -s ${DEFAULT_ENVS_SIZE} -o ${B}/${UBOOT_ENVS_DEFAULT}_r ${B}/${DEFAULT_ENVS} + + rm ${B}/${DEFAULT_ENVS} +} + +addtask gen_default_envs before do_deploy_default_envs after do_compile + +# Deploy default environment +do_deploy_default_envs[doc] = "Copy images with default U-Boot environment to deployment directory" +do_deploy_default_envs () { + install -d ${DEPLOYDIR} + + install ${B}/${UBOOT_ENVS_DEFAULT} ${DEPLOYDIR}/${UBOOT_ENVS_DEFAULT} + install ${B}/${UBOOT_ENVS_DEFAULT}_r ${DEPLOYDIR}/${UBOOT_ENVS_DEFAULT}_r + + rm ${B}/${UBOOT_ENVS_DEFAULT} + rm ${B}/${UBOOT_ENVS_DEFAULT}_r +} + +addtask deploy_default_envs before do_deploy after do_gen_default_envs -- 2.11.0