From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7093752232369192960 X-Received: by 2002:a5d:6b0e:0:b0:20a:dd17:e452 with SMTP id v14-20020a5d6b0e000000b0020add17e452mr14968724wrw.501.1651642902276; Tue, 03 May 2022 22:41:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1688:b0:20c:67b9:e68b with SMTP id y8-20020a056000168800b0020c67b9e68bls1262716wrd.3.gmail; Tue, 03 May 2022 22:41:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd4rYWy0nWiEiXSIs607VZif8b0O1nl12UHiagBEtF1tWBeQ/jYzM0Vh+OCn1CVR4LPu8i X-Received: by 2002:a05:6000:1449:b0:20c:59b4:e9b9 with SMTP id v9-20020a056000144900b0020c59b4e9b9mr12325881wrx.698.1651642901375; Tue, 03 May 2022 22:41:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651642901; cv=none; d=google.com; s=arc-20160816; b=JvsjfB5Xau2/UQ7FiNFqhzuWo+EkcMF15Ra5krj5JRqb5zEbgGqk6+l/6pqYWNxItR 5yKI6twTTbvGCD9YKSDa1GwhpXyez+u8ZBLrhMQR57yXLamekxSDVEnglh1LawfX70Jq 0ivXwfTxjR4RK9uXnd5+8xt6/cDO+ed3+gZGiU2DwAjMHsYYY2dArIFnneHn7yXwZw1R fls6pBE2MtfGDvTucSngDvFCiA2iD/ujSfy0dG1i1LTLDrumW1iyQ4aEKYhfu7AADyNV lagKonHZcLRL5AkSk9/l4IzwqDDvMsS7R4ANJUlNQ1H46c3UTrHFINTW38E6BEjoH0Eu 2cSg== 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; bh=a+ySIv2ruV6bZ9YJFzCl1lCIzmyzbh73NBtgP4UxVC0=; b=gkIIcoID1U5uvlEMppMf0qGdR8CmqtTYsosF1uEdOObRtWi5BsnNTUeMcNIjZ1AUrj 0rFZ07GbflXY0Ggf5UEZGM5EjgUSAGlyjpPUaVEnLvDSCKnABmifnK6GOLL05EGUj3G4 yj/rA6VbJIolOWFuSqkptnpNa7ySKHusZGdqUrmNX8nR9WpikMgWQhIpe+YBL6T5dTCT cejDuFn0Y7E3vfIVP8EjedGjpHoHZzsdMEdd8bm8PfGsii8mJnBOH9zVH9NGBAnrZVQk MomzEMZjPVdz5V5YPLcp718EnynB1TYuWShNrWc/khT7d/PrlTawoxUMTNISFf/za3NN wwVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id m4-20020a5d64a4000000b0020c7b2af134si137615wrp.0.2022.05.03.22.41.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 May 2022 22:41:41 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-119-82-214-37.mgts.dynamic.pppoe.byfly.by [37.214.82.119] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 2445fZ1d030650 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 4 May 2022 07:41:40 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH v3 4/7] ubi: Split UBI configs for phyboard-mira and imx6-sabrelite Date: Wed, 4 May 2022 08:41:26 +0300 Message-Id: <20220504054129.15218-5-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220504054129.15218-1-amikan@ilbers.de> References: <20220504054129.15218-1-amikan@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: +A8U9pahyQUq Split UBI image configurations for old SABRE Lite i.MX6 target and new phyBOARD-Mira target to be able to generate images with different layouts. Signed-off-by: Anton Mikanovich --- meta-isar/conf/machine/phyboard-mira.conf | 9 ++++--- .../fitimage.its.tmpl | 0 .../ubinize.cfg.tmpl | 0 .../images/phyboard-mira/ubinize.cfg.tmpl | 26 +++++++++++++++++++ 4 files changed, 31 insertions(+), 4 deletions(-) rename meta-isar/recipes-core/images/{files => imx6-sabrelite}/fitimage.its.tmpl (100%) rename meta-isar/recipes-core/images/{files => imx6-sabrelite}/ubinize.cfg.tmpl (100%) create mode 100644 meta-isar/recipes-core/images/phyboard-mira/ubinize.cfg.tmpl diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf index 0c6d29a..a2e7150 100644 --- a/meta-isar/conf/machine/phyboard-mira.conf +++ b/meta-isar/conf/machine/phyboard-mira.conf @@ -6,9 +6,10 @@ MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" -IMAGE_CLASSES += "ubi-ubifs-img" -MKUBIFS_ARGS := "-m 0x1000 -e 0x7e000 -c 8083" -UBINIZE_ARGS = "-vv -m 0x1000 -p 0x80000" -IMAGE_FSTYPES ?= "ubi-ubifs" +IMAGE_TYPEDEP_ubi += "ubifs" + +MKUBIFS_ARGS := "-m 0x800 -e 0x1f000 -c 8012" +UBINIZE_ARGS = "-vv -m 0x800 -p 0x20000" +IMAGE_FSTYPES ?= "ubi ubifs" DTB_FILES = "imx6q-phytec-mira-rdk-nand.dtb" diff --git a/meta-isar/recipes-core/images/files/fitimage.its.tmpl b/meta-isar/recipes-core/images/imx6-sabrelite/fitimage.its.tmpl similarity index 100% rename from meta-isar/recipes-core/images/files/fitimage.its.tmpl rename to meta-isar/recipes-core/images/imx6-sabrelite/fitimage.its.tmpl diff --git a/meta-isar/recipes-core/images/files/ubinize.cfg.tmpl b/meta-isar/recipes-core/images/imx6-sabrelite/ubinize.cfg.tmpl similarity index 100% rename from meta-isar/recipes-core/images/files/ubinize.cfg.tmpl rename to meta-isar/recipes-core/images/imx6-sabrelite/ubinize.cfg.tmpl diff --git a/meta-isar/recipes-core/images/phyboard-mira/ubinize.cfg.tmpl b/meta-isar/recipes-core/images/phyboard-mira/ubinize.cfg.tmpl new file mode 100644 index 0000000..aed4cd6 --- /dev/null +++ b/meta-isar/recipes-core/images/phyboard-mira/ubinize.cfg.tmpl @@ -0,0 +1,26 @@ +[kernel] +mode=ubi +image=${KERNEL_IMG} +vol_id=1 +vol_type=static +vol_name=kernel +vol_size=16MiB +vol_alignment=1 + +[oftree] +mode=ubi +image=${DTB_IMG} +vol_id=2 +vol_type=static +vol_name=oftree +vol_size=1MiB +vol_alignment=1 + +[rootfs] +mode=ubi +image=${UBIFS_IMG} +vol_id=3 +vol_type=dynamic +vol_name=root +vol_alignment=1 +vol_flags=autoresize -- 2.17.1