From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 28 Jul 2023 18:49:45 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qPQew-00Dm0d-J9 for lore@lore.pengutronix.de; Fri, 28 Jul 2023 18:49:45 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qPQet-0001a2-Fa; Fri, 28 Jul 2023 18:49:43 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qPQem-0001US-RV; Fri, 28 Jul 2023 18:49:36 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qPQem-002kWS-67; Fri, 28 Jul 2023 18:49:36 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qPQel-001R4V-0Y; Fri, 28 Jul 2023 18:49:35 +0200 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Fri, 28 Jul 2023 18:49:30 +0200 Message-Id: <20230728164933.342061-5-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230728164933.342061-1-a.fatoum@pengutronix.de> References: <20230728164933.342061-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 4/7] v8a: imx8m: use common genimage configuration X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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