DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>, bst@pengutronix.de
Subject: [DistroKit] [PATCH v2 08/10] v8a: barebox: switch to upstream rule
Date: Thu,  4 May 2023 15:59:20 +0200	[thread overview]
Message-ID: <20230504135922.2177668-9-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230504135922.2177668-1-a.fatoum@pengutronix.de>

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 <a.fatoum@pengutronix.de>
---
 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




  parent reply	other threads:[~2023-05-04 14:00 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-04 13:59 [DistroKit] [PATCH v2 00/10] v8a: barebox: update to use upstream PTXdist rule Ahmad Fatoum
2023-05-04 13:59 ` [DistroKit] [PATCH v2 01/10] v8a: barebox: rock3a: drop no longer needed SD-Card speed quirk Ahmad Fatoum
2023-05-04 13:59 ` [DistroKit] [PATCH v2 02/10] v7a: barebox: version bump v2023.02.1 → v2023.04.0 Ahmad Fatoum
2023-05-04 13:59 ` [DistroKit] [PATCH v2 03/10] v8a: barebox: version bump v2023.01.0 " Ahmad Fatoum
2023-05-04 13:59 ` [DistroKit] [PATCH v2 04/10] Revert "v8a: barebox: rockchip: disable CONFIG_MMCBLKDEV_ROOTARG" Ahmad Fatoum
2023-05-04 13:59 ` [DistroKit] [PATCH v2 05/10] platforms: drop no longer needed blspec-rpi4 Ahmad Fatoum
2023-05-04 13:59 ` [DistroKit] [PATCH v2 06/10] v8a: rockchip: use common environment Ahmad Fatoum
2023-05-04 13:59 ` [DistroKit] [PATCH v2 07/10] v8a: barebox: configure upstream barebox rule for both imx8m and rockchip Ahmad Fatoum
2023-05-04 13:59 ` Ahmad Fatoum [this message]
2023-05-04 13:59 ` [DistroKit] [PATCH v2 09/10] v8a: barebox: remove left-over SoC-specific rules Ahmad Fatoum
2023-05-04 13:59 ` [DistroKit] [PATCH v2 10/10] v8a: barebox: enable fastboot over UDP Ahmad Fatoum
2023-05-08  8:10 ` [DistroKit] [PATCH v2 00/10] v8a: barebox: update to use upstream PTXdist rule Robert Schwebel
2023-05-31 12:46   ` 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=20230504135922.2177668-9-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=bst@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