From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <distrokit-bounces@pengutronix.de>
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Mon,  4 Nov 2019 22:21:42 +0100
Message-Id: <20191104212147.22470-12-m.olbrich@pengutronix.de>
In-Reply-To: <20191104212147.22470-1-m.olbrich@pengutronix.de>
References: <20191104212147.22470-1-m.olbrich@pengutronix.de>
MIME-Version: 1.0
Subject: [DistroKit] [PATCH v2 11/16] barebox-rpi2: don't add a suffix to
 the images
List-Id: DistroKit Mailinglist <distrokit.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/distrokit>, 
 <mailto:distrokit-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/distrokit/>
List-Post: <mailto:distrokit@pengutronix.de>
List-Help: <mailto:distrokit-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/distrokit>, 
 <mailto:distrokit-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: distrokit-bounces@pengutronix.de
Sender: "DistroKit" <distrokit-bounces@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <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