From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 31 May 2023 13:47:58 +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 1q4KJ5-004CNJ-TO for lore@lore.pengutronix.de; Wed, 31 May 2023 13:47:58 +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 1q4KJ2-0005hT-FS; Wed, 31 May 2023 13:47:56 +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 1q4KIt-0005dF-Tv; Wed, 31 May 2023 13:47:47 +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 1q4KIt-00463P-5z; Wed, 31 May 2023 13:47:47 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q4KIs-00DldJ-By; Wed, 31 May 2023 13:47:46 +0200 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Wed, 31 May 2023 13:47:43 +0200 Message-Id: <20230531114744.3281270-8-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531114744.3281270-1-a.fatoum@pengutronix.de> References: <20230531114744.3281270-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v3 7/8] v8a: barebox: switch to upstream rule 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 Now that we have configured the upstream rule to support both i.MX8M and Rockchip, let's wire it into the image rules. Signed-off-by: Ahmad Fatoum --- configs/platform-v8a/config/images/imx8mm-evk.config | 2 +- configs/platform-v8a/config/images/imx8mp-evk.config | 2 +- configs/platform-v8a/config/images/imx8mq-evk.config | 2 +- configs/platform-v8a/config/images/rock3a.config | 6 +++--- configs/platform-v8a/platforms/image-imx8mm-evk.in | 2 +- configs/platform-v8a/platforms/image-imx8mp-evk.in | 2 +- configs/platform-v8a/platforms/image-imx8mq-evk.in | 2 +- configs/platform-v8a/platforms/image-rock3a.in | 2 +- doc/hardware_v8a_rock3a.rst | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/platform-v8a/config/images/imx8mm-evk.config b/configs/platform-v8a/config/images/imx8mm-evk.config index 5c04b6c36405..80f569139704 100644 --- a/configs/platform-v8a/config/images/imx8mm-evk.config +++ b/configs/platform-v8a/config/images/imx8mm-evk.config @@ -4,7 +4,7 @@ image @IMAGE@ { disk-signature = 0x9e1b14a8 } partition barebox { - image = "barebox-nxp-imx8mm-evk.img-imx8m" + image = "barebox-nxp-imx8mm-evk.img" size = 896K in-partition-table = false holes = {"(440; 1K)"} diff --git a/configs/platform-v8a/config/images/imx8mp-evk.config b/configs/platform-v8a/config/images/imx8mp-evk.config index 99b921023470..2f019381cace 100644 --- a/configs/platform-v8a/config/images/imx8mp-evk.config +++ b/configs/platform-v8a/config/images/imx8mp-evk.config @@ -4,7 +4,7 @@ image @IMAGE@ { disk-signature = 0x9e1b14a8 } partition barebox { - image = "barebox-nxp-imx8mp-evk.img-imx8m" + image = "barebox-nxp-imx8mp-evk.img" size = 896K in-partition-table = false holes = {"(440; 1K)"} diff --git a/configs/platform-v8a/config/images/imx8mq-evk.config b/configs/platform-v8a/config/images/imx8mq-evk.config index 5932688360d9..385672543b90 100644 --- a/configs/platform-v8a/config/images/imx8mq-evk.config +++ b/configs/platform-v8a/config/images/imx8mq-evk.config @@ -4,7 +4,7 @@ image @IMAGE@ { disk-signature = 0x9e1b14a8 } partition barebox { - image = "barebox-nxp-imx8mq-evk.img-imx8m" + image = "barebox-nxp-imx8mq-evk.img" size = 896K in-partition-table = false holes = {"(440; 1K)"} diff --git a/configs/platform-v8a/config/images/rock3a.config b/configs/platform-v8a/config/images/rock3a.config index 8b78ce7df4e7..522d82cdc9c9 100644 --- a/configs/platform-v8a/config/images/rock3a.config +++ b/configs/platform-v8a/config/images/rock3a.config @@ -7,13 +7,13 @@ image @IMAGE@ { offset = 32k size = 2M in-partition-table = false - image = "barebox-rock3a.img-rockchip" + image = "barebox-rock3a.img" } partition boot2 { offset = 2080k size = 2M in-partition-table = false - image = "barebox-rock3a.img-rockchip" + image = "barebox-rock3a.img" } partition barebox_environment { offset = 4128k @@ -41,6 +41,6 @@ image barebox-rock3a.norimg { offset = 32k size = 2M in-partition-table = false - image = "barebox-rock3a.img-rockchip" + image = "barebox-rock3a.img" } } diff --git a/configs/platform-v8a/platforms/image-imx8mm-evk.in b/configs/platform-v8a/platforms/image-imx8mm-evk.in index 50907881b913..f58a27b0bb64 100644 --- a/configs/platform-v8a/platforms/image-imx8mm-evk.in +++ b/configs/platform-v8a/platforms/image-imx8mm-evk.in @@ -4,7 +4,7 @@ config IMAGE_IMX8MM_EVK tristate select HOST_GENIMAGE select IMAGE_ROOT_EXT - select BAREBOX_IMX8M + select BAREBOX prompt "Generate images/imx8mm-evk.img" help Generate a bootable SD card image to deploy a NXP i.MX8MM-EVK board. diff --git a/configs/platform-v8a/platforms/image-imx8mp-evk.in b/configs/platform-v8a/platforms/image-imx8mp-evk.in index d49ce8d3da4c..87ad83368a19 100644 --- a/configs/platform-v8a/platforms/image-imx8mp-evk.in +++ b/configs/platform-v8a/platforms/image-imx8mp-evk.in @@ -4,7 +4,7 @@ config IMAGE_IMX8MP_EVK tristate select HOST_GENIMAGE select IMAGE_ROOT_EXT - select BAREBOX_IMX8M + select BAREBOX prompt "Generate images/imx8mp-evk.img" help Generate a bootable SD card image to deploy a NXP i.MX8MP-EVK board. diff --git a/configs/platform-v8a/platforms/image-imx8mq-evk.in b/configs/platform-v8a/platforms/image-imx8mq-evk.in index a286e6bf575f..254879ae5cb7 100644 --- a/configs/platform-v8a/platforms/image-imx8mq-evk.in +++ b/configs/platform-v8a/platforms/image-imx8mq-evk.in @@ -4,7 +4,7 @@ config IMAGE_IMX8MQ_EVK tristate select HOST_GENIMAGE select IMAGE_ROOT_EXT - select BAREBOX_IMX8M + select BAREBOX prompt "Generate images/imx8mq-evk.img" help Generate a bootable SD card image to deploy a NXP i.MX8MQ-EVK board. diff --git a/configs/platform-v8a/platforms/image-rock3a.in b/configs/platform-v8a/platforms/image-rock3a.in index cd09d1ec9087..96393cfc3257 100644 --- a/configs/platform-v8a/platforms/image-rock3a.in +++ b/configs/platform-v8a/platforms/image-rock3a.in @@ -4,7 +4,7 @@ config IMAGE_ROCK3A tristate select HOST_GENIMAGE select IMAGE_ROOT_EXT - select BAREBOX_ROCKCHIP + select BAREBOX prompt "Generate images/rock3a.img" help Generate an image for the Radxa ROCK3 Model A. diff --git a/doc/hardware_v8a_rock3a.rst b/doc/hardware_v8a_rock3a.rst index 3aa5a62ea8bd..72eb9d8b6c70 100644 --- a/doc/hardware_v8a_rock3a.rst +++ b/doc/hardware_v8a_rock3a.rst @@ -17,7 +17,7 @@ Barebox via USB: .. code-block:: shell - platform-v8a/sysroot-host/bin/rk-usb-loader platform-v8a/images/barebox-rock3a.img-rockchip + platform-v8a/sysroot-host/bin/rk-usb-loader platform-v8a/images/barebox-rock3a.img Once Barebox is booted, copy the image ``platform-v8a/images/rock3a.img`` via tftp or NFS to the eMMC to persist it. Disable MASKROM mode and reboot the -- 2.39.2