[DistroKit] [PATCH 10/11] v7a: rpi: remove "2" from recipe names

[Roland Hieber <rhi@pengutronix.de>]

These recipes also target RPi 3 and CM 3+, so the "2" in the recipe
names might be unnecessarily confusing. The generated image is also
already named rpi.hdimg.

Rename the documentation file accordingly.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 .../config/images/{rpi2.config => rpi.config} |  6 +--
 configs/platform-v7a/platformconfig           |  2 +-
 .../platforms/{image-rpi2.in => image-rpi.in} |  2 +-
 configs/platform-v7a/rules/image-rpi.make     | 46 +++++++++++++++++++
 configs/platform-v7a/rules/image-rpi2.make    | 46 -------------------
 doc/hardware.rst                              |  2 +-
 ...e_v7a_raspi23.rst => hardware_v7a_rpi.rst} |  0
 7 files changed, 52 insertions(+), 52 deletions(-)
 rename configs/platform-v7a/config/images/{rpi2.config => rpi.config} (85%)
 rename configs/platform-v7a/platforms/{image-rpi2.in => image-rpi.in} (92%)
 create mode 100644 configs/platform-v7a/rules/image-rpi.make
 delete mode 100644 configs/platform-v7a/rules/image-rpi2.make
 rename doc/{hardware_v7a_raspi23.rst => hardware_v7a_rpi.rst} (100%)

diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi.config
similarity index 85%
rename from configs/platform-v7a/config/images/rpi2.config
rename to configs/platform-v7a/config/images/rpi.config
index 37ce69cf89b0..e301e20087e6 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi.config
@@ -1,6 +1,6 @@
-image rpi2-boot.vfat {
+image rpi-boot.vfat {
 	vfat {
-		files = { @FIRMWARE_RPI2@ }
+		files = { @FIRMWARE_RPI@ }
 		file barebox.img { image = barebox-raspberry-pi.img }
 		file bcm2711-rpi-4-b.dtb { image = barebox-bcm2711-rpi-4.dtb }
 	}
@@ -14,7 +14,7 @@ image @IMAGE@ {
 	}
 	partition boot {
 		offset = 4M
-		image = rpi2-boot.vfat
+		image = rpi-boot.vfat
 		partition-type = 0xc
 		partition-type-uuid = fat32
 		bootable = true
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 652c13557b7d..9af61ed58b52 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -313,7 +313,7 @@ PTXCONF_IMAGE_ROOT_TGZ=y
 PTXCONF_IMAGE_ROOT_TGZ_LABEL=""
 # PTXCONF_IMAGE_ROOT_UBI is not set
 # PTXCONF_IMAGE_ROOT_UBIFS is not set
-PTXCONF_IMAGE_RPI2=y
+PTXCONF_IMAGE_RPI=y
 PTXCONF_IMAGE_SABRELITE=y
 PTXCONF_IMAGE_SAMA5D27_GIANTBOARD=y
 PTXCONF_IMAGE_SAMA5D27_SOM1_EK=y
diff --git a/configs/platform-v7a/platforms/image-rpi2.in b/configs/platform-v7a/platforms/image-rpi.in
similarity index 92%
rename from configs/platform-v7a/platforms/image-rpi2.in
rename to configs/platform-v7a/platforms/image-rpi.in
index 77848273dfb3..e3236b633bc9 100644
--- a/configs/platform-v7a/platforms/image-rpi2.in
+++ b/configs/platform-v7a/platforms/image-rpi.in
@@ -1,6 +1,6 @@
 ## SECTION=image
 
-config IMAGE_RPI2
+config IMAGE_RPI
 	tristate
 	select HOST_GENIMAGE
 	select HOST_DOSFSTOOLS
diff --git a/configs/platform-v7a/rules/image-rpi.make b/configs/platform-v7a/rules/image-rpi.make
new file mode 100644
index 000000000000..d7d91ae7adba
--- /dev/null
+++ b/configs/platform-v7a/rules/image-rpi.make
@@ -0,0 +1,46 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+IMAGE_PACKAGES-$(PTXCONF_IMAGE_RPI) += image-rpi
+
+#
+# Paths and names
+#
+IMAGE_RPI		:= image-rpi
+IMAGE_RPI_DIR		:= $(BUILDDIR)/$(IMAGE_RPI)
+IMAGE_RPI_IMAGE		:= $(IMAGEDIR)/rpi.hdimg
+IMAGE_RPI_FILES		:= $(IMAGEDIR)/root.tgz
+IMAGE_RPI_CONFIG	:= rpi.config
+IMAGE_RPI_DATA_DIR	:= $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
+IMAGE_RPI_DATA		:= \
+	$(wildcard $(IMAGE_RPI_DATA_DIR)/*.bin) \
+	$(wildcard $(IMAGE_RPI_DATA_DIR)/*.elf) \
+	$(wildcard $(IMAGE_RPI_DATA_DIR)/*.dat) \
+	$(wildcard $(IMAGE_RPI_DATA_DIR)/*.dtb) \
+	$(wildcard $(IMAGE_RPI_DATA_DIR)/config.txt)
+
+# ----------------------------------------------------------------------------
+# Image
+# ----------------------------------------------------------------------------
+
+define squote_and_comma
+$(subst $(ptx/def/space),$(comma) ,$(addsuffix $(ptx/def/squote),$(addprefix $(ptx/def/squote),$(1))))
+endef
+
+IMAGE_RPI_ENV := \
+        FIRMWARE_RPI="$(call squote_and_comma,$(IMAGE_RPI_DATA))"
+
+$(IMAGE_RPI_IMAGE):
+	@$(call targetinfo)
+	@$(call image/genimage, IMAGE_RPI)
+	@$(call finish)
+
+# vim: syntax=make
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
deleted file mode 100644
index 22f11586f814..000000000000
--- a/configs/platform-v7a/rules/image-rpi2.make
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-IMAGE_PACKAGES-$(PTXCONF_IMAGE_RPI2) += image-rpi2
-
-#
-# Paths and names
-#
-IMAGE_RPI2		:= image-rpi2
-IMAGE_RPI2_DIR	:= $(BUILDDIR)/$(IMAGE_RPI2)
-IMAGE_RPI2_IMAGE	:= $(IMAGEDIR)/rpi.hdimg
-IMAGE_RPI2_FILES	:= $(IMAGEDIR)/root.tgz
-IMAGE_RPI2_CONFIG	:= rpi2.config
-IMAGE_RPI2_DATA_DIR	:= $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
-IMAGE_RPI2_DATA		:= \
-	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \
-	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \
-	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.dat) \
-	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.dtb) \
-	$(wildcard $(IMAGE_RPI2_DATA_DIR)/config.txt)
-
-# ----------------------------------------------------------------------------
-# Image
-# ----------------------------------------------------------------------------
-
-define squote_and_comma
-$(subst $(ptx/def/space),$(comma) ,$(addsuffix $(ptx/def/squote),$(addprefix $(ptx/def/squote),$(1))))
-endef
-
-IMAGE_RPI2_ENV := \
-        FIRMWARE_RPI2="$(call squote_and_comma,$(IMAGE_RPI2_DATA))"
-
-$(IMAGE_RPI2_IMAGE):
-	@$(call targetinfo)
-	@$(call image/genimage, IMAGE_RPI2)
-	@$(call finish)
-
-# vim: syntax=make
diff --git a/doc/hardware.rst b/doc/hardware.rst
index ccec2b4d0722..50a7de1e6701 100644
--- a/doc/hardware.rst
+++ b/doc/hardware.rst
@@ -46,7 +46,7 @@ It supports the following hardware:
    hardware_v7a_beaglebone_black
    hardware_v7a_nitrogen6x
    hardware_v7a_riot
-   hardware_v7a_raspi23
+   hardware_v7a_rpi
    hardware_v7a_udoo_neo
    hardware_v7a_sama5d2
    hardware_v7a_sama5d4
diff --git a/doc/hardware_v7a_raspi23.rst b/doc/hardware_v7a_rpi.rst
similarity index 100%
rename from doc/hardware_v7a_raspi23.rst
rename to doc/hardware_v7a_rpi.rst
-- 
2.39.5