4 files changed, 4 insertions, 28 deletions
diff --git a/configs/platform-v7a/platforms/barebox-rpi2.in b/configs/platform-v7a/platforms/barebox-rpi2.in
index d62acd3..82ef1c5 100644
--- a/configs/platform-v7a/platforms/barebox-rpi2.in
+++ b/configs/platform-v7a/platforms/barebox-rpi2.in
@@ -2,7 +2,7 @@
 
 menuconfig BAREBOX_RPI2
 	tristate
-	prompt "Barebox (rpi2)"
+	prompt "Barebox (rpi2/3/CM3)"
 	select BAREBOX_COMMON
 	help
-	  Raspberry Pi 2 support for barebox.
+	  Raspberry Pi 2, 3, CM3 support for barebox.
diff --git a/configs/platform-v7a/platforms/image-rpi2.in b/configs/platform-v7a/platforms/image-rpi2.in
index c1ad7c9..cf14b80 100644
--- a/configs/platform-v7a/platforms/image-rpi2.in
+++ b/configs/platform-v7a/platforms/image-rpi2.in
@@ -7,6 +7,6 @@ config IMAGE_RPI2
 	select HOST_MTOOLS
 	select IMAGE_ROOT_EXT
 	select BAREBOX_RPI2
-	prompt "Generate images/rpi2.hdimg"
+	prompt "Generate images/rpi.hdimg"
 	help
-	  SD card image for the Raspberry Pi 2
+	  SD card image for the Raspberry Pi 2, 3 and CM3
diff --git a/configs/platform-v7a/platforms/image-rpi3.in b/configs/platform-v7a/platforms/image-rpi3.in
deleted file mode 100644
index 022de98..0000000
--- a/configs/platform-v7a/platforms/image-rpi3.in
+++ /dev/null
@@ -1,12 +0,0 @@
-## SECTION=image
-
-config IMAGE_RPI3
-	tristate
-	select HOST_GENIMAGE
-	select HOST_DOSFSTOOLS
-	select HOST_MTOOLS
-	select IMAGE_ROOT_EXT
-	select BAREBOX_RPI2
-	prompt "Generate images/rpi3.hdimg"
-	help
-	  SD card image for the Raspberry Pi 3
diff --git a/configs/platform-v7a/platforms/image-rpicm3.in b/configs/platform-v7a/platforms/image-rpicm3.in
deleted file mode 100644
index 5cecf9a..0000000
--- a/configs/platform-v7a/platforms/image-rpicm3.in
+++ /dev/null
@@ -1,12 +0,0 @@
-## SECTION=image
-
-config IMAGE_RPICM3
-	tristate
-	select HOST_GENIMAGE
-	select HOST_DOSFSTOOLS
-	select HOST_MTOOLS
-	select IMAGE_ROOT_EXT
-	select BAREBOX_RPI2
-	prompt "Generate images/rpiCM3.hdimg"
-	help
-	  SD card image for the Raspberry Pi Compute Module 3