From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [DistroKit] [PATCH 4/7] v8a: imx8m: use common genimage configuration
Date: Fri, 28 Jul 2023 18:49:30 +0200 [thread overview]
Message-ID: <20230728164933.342061-5-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230728164933.342061-1-a.fatoum@pengutronix.de>
The i.MX8M defconfigs are identical, except for the bootloader binary used.
We already fix up the hd image name into the genimage config, so let's
fix up the bootloader image name as well and just have all i.MX8M share a
single config template.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
configs/platform-v8a/config/images/imx8m.config | 17 +++++++++++++++++
.../config/images/imx8mm-evk.config | 17 -----------------
.../config/images/imx8mp-evk.config | 17 -----------------
.../config/images/imx8mq-evk.config | 17 -----------------
.../platform-v8a/rules/image-imx8mm-evk.make | 5 ++++-
.../platform-v8a/rules/image-imx8mp-evk.make | 5 ++++-
.../platform-v8a/rules/image-imx8mq-evk.make | 5 ++++-
7 files changed, 29 insertions(+), 54 deletions(-)
create mode 100644 configs/platform-v8a/config/images/imx8m.config
delete mode 100644 configs/platform-v8a/config/images/imx8mm-evk.config
delete mode 100644 configs/platform-v8a/config/images/imx8mp-evk.config
delete mode 100644 configs/platform-v8a/config/images/imx8mq-evk.config
diff --git a/configs/platform-v8a/config/images/imx8m.config b/configs/platform-v8a/config/images/imx8m.config
new file mode 100644
index 000000000000..367d98edcc1d
--- /dev/null
+++ b/configs/platform-v8a/config/images/imx8m.config
@@ -0,0 +1,17 @@
+image @IMAGE@ {
+ hdimage {
+ align = 1M
+ disk-signature = 0x9e1b14a8
+ }
+ partition barebox {
+ image = "@BAREBOX_IMAGE@"
+ size = 896K
+ in-partition-table = false
+ holes = {"(440; 1K)"}
+ }
+ partition root {
+ offset = 2M
+ image = "root.ext2"
+ partition-type = 0x83
+ }
+}
diff --git a/configs/platform-v8a/config/images/imx8mm-evk.config b/configs/platform-v8a/config/images/imx8mm-evk.config
deleted file mode 100644
index 80f569139704..000000000000
--- a/configs/platform-v8a/config/images/imx8mm-evk.config
+++ /dev/null
@@ -1,17 +0,0 @@
-image @IMAGE@ {
- hdimage {
- align = 1M
- disk-signature = 0x9e1b14a8
- }
- partition barebox {
- image = "barebox-nxp-imx8mm-evk.img"
- size = 896K
- in-partition-table = false
- holes = {"(440; 1K)"}
- }
- partition root {
- offset = 2M
- image = "root.ext2"
- partition-type = 0x83
- }
-}
diff --git a/configs/platform-v8a/config/images/imx8mp-evk.config b/configs/platform-v8a/config/images/imx8mp-evk.config
deleted file mode 100644
index 2f019381cace..000000000000
--- a/configs/platform-v8a/config/images/imx8mp-evk.config
+++ /dev/null
@@ -1,17 +0,0 @@
-image @IMAGE@ {
- hdimage {
- align = 1M
- disk-signature = 0x9e1b14a8
- }
- partition barebox {
- image = "barebox-nxp-imx8mp-evk.img"
- size = 896K
- in-partition-table = false
- holes = {"(440; 1K)"}
- }
- partition root {
- offset = 2M
- image = "root.ext2"
- partition-type = 0x83
- }
-}
diff --git a/configs/platform-v8a/config/images/imx8mq-evk.config b/configs/platform-v8a/config/images/imx8mq-evk.config
deleted file mode 100644
index 385672543b90..000000000000
--- a/configs/platform-v8a/config/images/imx8mq-evk.config
+++ /dev/null
@@ -1,17 +0,0 @@
-image @IMAGE@ {
- hdimage {
- align = 1M
- disk-signature = 0x9e1b14a8
- }
- partition barebox {
- image = "barebox-nxp-imx8mq-evk.img"
- size = 896K
- in-partition-table = false
- holes = {"(440; 1K)"}
- }
- partition root {
- offset = 2M
- image = "root.ext2"
- partition-type = 0x83
- }
-}
diff --git a/configs/platform-v8a/rules/image-imx8mm-evk.make b/configs/platform-v8a/rules/image-imx8mm-evk.make
index 60b8b3086713..074690bf0c9f 100644
--- a/configs/platform-v8a/rules/image-imx8mm-evk.make
+++ b/configs/platform-v8a/rules/image-imx8mm-evk.make
@@ -18,12 +18,15 @@ IMAGE_IMX8MM_EVK := image-imx8mm-evk
IMAGE_IMX8MM_EVK_DIR := $(BUILDDIR)/$(IMAGE_IMX8MM_EVK)
IMAGE_IMX8MM_EVK_IMAGE := $(IMAGEDIR)/imx8mm-evk.img
IMAGE_IMX8MM_EVK_FILES := $(IMAGEDIR)/root.tgz
-IMAGE_IMX8MM_EVK_CONFIG := imx8mm-evk.config
+IMAGE_IMX8MM_EVK_CONFIG := imx8m.config
# ----------------------------------------------------------------------------
# Image
# ----------------------------------------------------------------------------
+IMAGE_IMX8MM_EVK_ENV := \
+ BAREBOX_IMAGE=barebox-nxp-imx8mm-evk.img
+
$(IMAGE_IMX8MM_EVK_IMAGE):
@$(call targetinfo)
@$(call image/genimage, IMAGE_IMX8MM_EVK)
diff --git a/configs/platform-v8a/rules/image-imx8mp-evk.make b/configs/platform-v8a/rules/image-imx8mp-evk.make
index 758aee9237fb..d37dd7e54328 100644
--- a/configs/platform-v8a/rules/image-imx8mp-evk.make
+++ b/configs/platform-v8a/rules/image-imx8mp-evk.make
@@ -18,12 +18,15 @@ IMAGE_IMX8MP_EVK := image-imx8mp-evk
IMAGE_IMX8MP_EVK_DIR := $(BUILDDIR)/$(IMAGE_IMX8MP_EVK)
IMAGE_IMX8MP_EVK_IMAGE := $(IMAGEDIR)/imx8mp-evk.img
IMAGE_IMX8MP_EVK_FILES := $(IMAGEDIR)/root.tgz
-IMAGE_IMX8MP_EVK_CONFIG := imx8mp-evk.config
+IMAGE_IMX8MP_EVK_CONFIG := imx8m.config
# ----------------------------------------------------------------------------
# Image
# ----------------------------------------------------------------------------
+IMAGE_IMX8MP_EVK_ENV := \
+ BAREBOX_IMAGE=barebox-nxp-imx8mp-evk.img
+
$(IMAGE_IMX8MP_EVK_IMAGE):
@$(call targetinfo)
@$(call image/genimage, IMAGE_IMX8MP_EVK)
diff --git a/configs/platform-v8a/rules/image-imx8mq-evk.make b/configs/platform-v8a/rules/image-imx8mq-evk.make
index b70bd76522ba..84dfe4dc3cc7 100644
--- a/configs/platform-v8a/rules/image-imx8mq-evk.make
+++ b/configs/platform-v8a/rules/image-imx8mq-evk.make
@@ -18,12 +18,15 @@ IMAGE_IMX8MQ_EVK := image-imx8mq-evk
IMAGE_IMX8MQ_EVK_DIR := $(BUILDDIR)/$(IMAGE_IMX8MQ_EVK)
IMAGE_IMX8MQ_EVK_IMAGE := $(IMAGEDIR)/imx8mq-evk.img
IMAGE_IMX8MQ_EVK_FILES := $(IMAGEDIR)/root.tgz
-IMAGE_IMX8MQ_EVK_CONFIG := imx8mq-evk.config
+IMAGE_IMX8MQ_EVK_CONFIG := imx8m.config
# ----------------------------------------------------------------------------
# Image
# ----------------------------------------------------------------------------
+IMAGE_IMX8MQ_EVK_ENV := \
+ BAREBOX_IMAGE=barebox-nxp-imx8mq-evk.img
+
$(IMAGE_IMX8MQ_EVK_IMAGE):
@$(call targetinfo)
@$(call image/genimage, IMAGE_IMX8MQ_EVK)
--
2.39.2
next prev parent reply other threads:[~2023-07-28 16:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 16:49 [DistroKit] [PATCH 0/7] v8a: imx8m: build image for i.MX8M Nano Ahmad Fatoum
2023-07-28 16:49 ` [DistroKit] [PATCH 1/7] v8a: imx8m: tf-a: build for i.MX8M Nano as well Ahmad Fatoum
2023-07-28 16:49 ` [DistroKit] [PATCH 2/7] v8a: imx8m: imx-firmware: install DDR4 PHY firmware Ahmad Fatoum
2023-07-28 16:49 ` [DistroKit] [PATCH 3/7] v8a: barebox: enable i.MX8M Nano EVK support Ahmad Fatoum
2023-07-28 16:49 ` Ahmad Fatoum [this message]
2023-07-28 16:49 ` [DistroKit] [PATCH 5/7] v8a: imx8m: genimage: switch from MBR to GPT images Ahmad Fatoum
2023-07-28 16:49 ` [DistroKit] [PATCH 6/7] v8a: imx8m: include i.MX8MN DDR4 and LPDDR4 EVK DT in rootfs Ahmad Fatoum
2023-07-28 16:49 ` [DistroKit] [PATCH 7/7] v8a: imx8m: genimage: build i.MX8M Nano SD/eMMC image Ahmad Fatoum
2023-08-13 19:39 ` [DistroKit] [PATCH 0/7] v8a: imx8m: build image for i.MX8M Nano Roland Hieber
2023-08-15 9:51 ` Robert Schwebel
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=20230728164933.342061-5-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=distrokit@pengutronix.de \
/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