summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-11-04 22:21:42 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2019-11-04 23:08:22 +0100
commit4a01e1a1f0e11cb689b546421601ca96b39b3de5 (patch)
tree2c970de9bf3ff8e1714641dde02d7726be368d5f
parent236ba6c8811a5c1b3d2d71e62b96e602143f09d1 (diff)
downloadDistroKit-4a01e1a1f0e11cb689b546421601ca96b39b3de5.tar.gz
barebox-rpi2: don't add a suffix to the images
It's not needed and now the files are actually removed during 'clean'. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--configs/platform-v7a/config/images/rpi2.config2
-rw-r--r--configs/platform-v7a/config/images/rpi3.config2
-rw-r--r--configs/platform-v7a/rules/barebox-rpi2.make2
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 428c00c..3e45e1a 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 6491146..7bd1dae 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 889c463..b0e6ef2 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)
# ----------------------------------------------------------------------------