From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: adriaan.schmidt@siemens.com, Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v3 4/7] ubi: Split UBI configs for phyboard-mira and imx6-sabrelite
Date: Wed, 4 May 2022 08:41:26 +0300 [thread overview]
Message-ID: <20220504054129.15218-5-amikan@ilbers.de> (raw)
In-Reply-To: <20220504054129.15218-1-amikan@ilbers.de>
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 <amikan@ilbers.de>
---
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
next prev parent reply other threads:[~2022-05-04 5:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 5:41 [PATCH v3 0/7] Rebuild phyBOARD-Mira UBI image generation Anton Mikanovich
2022-05-04 5:41 ` [PATCH v3 1/7] image: Introduce template support for imagetypes Anton Mikanovich
2022-05-04 5:41 ` [PATCH v3 2/7] ubi: Move imager-related defines to image bbclasses Anton Mikanovich
2022-05-04 5:41 ` [PATCH v3 3/7] ubi: Remove isar-image-ubi Anton Mikanovich
2022-05-04 5:41 ` Anton Mikanovich [this message]
2022-05-04 5:41 ` [PATCH v3 5/7] conf: Remove machine-specific defines from multiconfig Anton Mikanovich
2022-05-04 5:41 ` [PATCH v3 6/7] meta-isar: Add linux-phy kernel Anton Mikanovich
2022-05-04 5:41 ` [PATCH v3 7/7] meta: Add barebox bootloader support Anton Mikanovich
2022-05-16 9:31 ` [PATCH v3 0/7] Rebuild phyBOARD-Mira UBI image generation Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220504054129.15218-5-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=adriaan.schmidt@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox