From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7086521111035248640 X-Received: by 2002:a1c:7408:0:b0:38e:b7af:c503 with SMTP id p8-20020a1c7408000000b0038eb7afc503mr4750052wmc.58.1649959277285; Thu, 14 Apr 2022 11:01:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4ccf:0:b0:207:a2b0:7a9 with SMTP id c15-20020a5d4ccf000000b00207a2b007a9ls1292223wrt.2.gmail; Thu, 14 Apr 2022 11:01:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyybaJPIk1bUCx7Bo6Pyk7dG442akMBgwkJH71Z8umyVlNSScCLFUZ/6KZlkgfHoNh0b5J4 X-Received: by 2002:a5d:6ca5:0:b0:207:abec:fb43 with SMTP id a5-20020a5d6ca5000000b00207abecfb43mr2853159wra.274.1649959276423; Thu, 14 Apr 2022 11:01:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649959276; cv=none; d=google.com; s=arc-20160816; b=dfdLpD1IOHmuwF83n56AY0MymaKDScqgsX22ySA6ZG3qOiMv7ph01g0mQWA7jzJIYk kE5CU371Qt4aAi+bJGBzrS5BaMSkoWJUS/A+G66KkcXQI6mG0TLr6LAXpE3YyQ5Fs1IK V+F1vfovH1nVWfFdLXeEajdxugNpM93WQScXT3mQzWnYrV8EKH05drJllZDQYKMoRady LDm6nJuryJ/7tQf6t93hy1bXDeEWUaNJ68N5RdeAB38bq2HB/sUJQ8SEPDcdJz78Qt4l nW1OtVfBPPu1aeJQPpTpbeOModl3MXZvi8QrZWcjafwn6Zvok36b9LdUafs34Q6t7u4p dlrQ== 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=HqcC/kcInnBeg5NQW4D7LTpmKvkcWfIG3yPIGfNX9WM=; b=VNYj0ONTkd9/zQOuNX7fKz42UCEH6euHyNbzYPUXCE5Oq701SFvC/ozBpS0Ji1AbvB 0UkCeVmvmESuRfGI4ktweg36TEwMUUF8cgEFd33ymuJpsFJO2KKQpFsLItWPRT5cuysg 3N9NU1x1oKHLySpuiLbkt/PF/364oZNOzm+LA2bcg6Nypq/r2Vx2cXG3S9JMjbv56wXa Sipd2FjiTsmHudCN5ZFizLFm0yEhZdzGsIT2NreW+aR8ncvlz0osEuRBUpIknaSN1NvK YeMgdo0biqBPIbV2Vvd6wlwqpGXpiE0KdM+YAiH1ZGKwFMGmFhoMvwdPhCWWcTYqXLLA 94wA== 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 186-20020a1c02c3000000b0038ed7affcc5si41183wmc.0.2022.04.14.11.01.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Apr 2022 11:01:16 -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-207-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.207] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 23EI19vj008241 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Apr 2022 20:01:15 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 4/7] ubi: Split UBI configs for phyboard-mira and imx6-sabrelite Date: Thu, 14 Apr 2022 21:00:58 +0300 Message-Id: <20220414180101.3373-5-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220414180101.3373-1-amikan@ilbers.de> References: <20220414180101.3373-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: RBC6OH+vWuQb 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 6538263..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" -INHERIT += "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