From: Michael Olbrich <m.olbrich@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [DistroKit] [PATCH v2 11/16] barebox-rpi2: don't add a suffix to the images
Date: Mon, 4 Nov 2019 22:21:42 +0100 [thread overview]
Message-ID: <20191104212147.22470-12-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20191104212147.22470-1-m.olbrich@pengutronix.de>
It's not needed and now the files are actually removed during 'clean'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/config/images/rpi2.config | 2 +-
configs/platform-v7a/config/images/rpi3.config | 2 +-
configs/platform-v7a/rules/barebox-rpi2.make | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi2.config
index 428c00c2d7bd..3e45e1af5e54 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi2.config
@@ -1,7 +1,7 @@
image rpi2-boot.vfat {
vfat {
files = { @FIRMWARE_RPI2@ }
- file barebox.img { image = barebox-raspberry-pi-2.img-rpi2 }
+ file barebox.img { image = barebox-raspberry-pi-2.img }
}
size = 32M
}
diff --git a/configs/platform-v7a/config/images/rpi3.config b/configs/platform-v7a/config/images/rpi3.config
index 64911462723f..7bd1dae8dc46 100644
--- a/configs/platform-v7a/config/images/rpi3.config
+++ b/configs/platform-v7a/config/images/rpi3.config
@@ -1,7 +1,7 @@
image rpi3-boot.vfat {
vfat {
files = { @FIRMWARE_RPI3@ }
- file barebox.img { image = barebox-raspberry-pi-3.img-rpi2 }
+ file barebox.img { image = barebox-raspberry-pi-3.img }
}
size = 32M
}
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index 889c463aa7e5..b0e6ef2964ab 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -83,7 +83,7 @@ $(STATEDIR)/barebox-rpi2.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_RPI2_IMAGES), \
install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image))-rpi2$(ptx/nl))
+ $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
@$(call touch)
# ----------------------------------------------------------------------------
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev parent reply other threads:[~2019-11-04 21:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 21:21 [DistroKit] [PATCH v2 00/16] Barebox Update and Cleanup Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 01/16] v7a: barebox-common: modify oldconfig to affect all bareboxes Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 02/16] v7a: barebox-common: add clean target that affects " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 03/16] v7a: barebox: version bump 2019.08.1 → 2019.10.0 Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 04/16] barebox-vexpress: sync with latest barebox template Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 05/16] barebox-mx6: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 06/16] barebox-rpi2: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 07/16] barebox-am335x-mlo: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 08/16] barebox-am335x: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 09/16] barebox-common: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 10/16] barebox-vexpress: remove installed files Michael Olbrich
2019-11-04 21:21 ` Michael Olbrich [this message]
2019-11-04 21:21 ` [DistroKit] [PATCH v2 12/16] barebox-am335x-mlo: actually remove images during 'clean' Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 13/16] barebox-am335x: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 14/16] barebox-mx6: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 15/16] barebox: create the .ptxdist-defaultenv symlink in the build dir Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 16/16] platform-v7a: vexpress: use only one core for barebox Michael Olbrich
2019-11-04 22:10 ` [DistroKit] [PATCH v2 00/16] Barebox Update and Cleanup Robert Schwebel
2019-11-04 22:42 ` 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=20191104212147.22470-12-m.olbrich@pengutronix.de \
--to=m.olbrich@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