[DistroKit] [PATCH 3/3] image-rpi2, image-rpi3: remove no-op ptxd_replace_magic calls

[Roland Hieber <rhi@pengutronix.de>]

The new 'ptxdist lint' feature complained about these lines:

    Undefined symbol PTXCONF_IMAGE_RPI2_GPU_MEM used in 'next/configs/platform-v7a/rules/image-rpi2.make'.
    Undefined symbol PTXCONF_IMAGE_RPI3_GPU_MEM used in 'next/configs/platform-v7a/rules/image-rpi3.make'.

Indeed, these complaints were caused by multiple issues, probably going
back to copy-and-paste from platform-rpi:

* IMAGE_RPI2_GPU_MEM and IMAGE_RPI3_GPU_MEM were never defined in any
  kconfig menu since these lines were added (but a similar kconfig item
  exists in configs/platform-rpi)
* configs/platform-v7a/rpi-firmware/config.txt didn't have any magic
  replacement markers anymore since commit 98626f8441add596486b
* the "replaced" config.txt was never used by anything after writing it
  to PTXDIST_TEMPDIR (which is the case in configs/platform-rpi)

Remove the call completely.

Fixes: 1db122202276b9f343eb (2017-06-16, "platform-v7a: rpi2: add board support")
Fixes: 98626f8441add596486b (2018-11-29, "add RPI3 Support")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-v7a/rules/image-rpi2.make | 3 ---
 configs/platform-v7a/rules/image-rpi3.make | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
index 07b1e7ba7fb0..8e192e4fc43a 100644
--- a/configs/platform-v7a/rules/image-rpi2.make
+++ b/configs/platform-v7a/rules/image-rpi2.make
@@ -40,9 +40,6 @@ IMAGE_RPI2_ENV := \
 
 $(IMAGE_RPI2_IMAGE):
 	@$(call targetinfo)
-	@GPU_MEM=$(PTXCONF_IMAGE_RPI2_GPU_MEM) \
-		ptxd_replace_magic "$(IMAGE_RPI2_DATA_DIR)/config.txt" > \
-		"$(PTXDIST_TEMPDIR)/config.txt"
 	@$(call image/genimage, IMAGE_RPI2)
 	@$(call finish)
 
diff --git a/configs/platform-v7a/rules/image-rpi3.make b/configs/platform-v7a/rules/image-rpi3.make
index 31b42958c8f3..5c56c3afb146 100644
--- a/configs/platform-v7a/rules/image-rpi3.make
+++ b/configs/platform-v7a/rules/image-rpi3.make
@@ -40,9 +40,6 @@ IMAGE_RPI3_ENV := \
 
 $(IMAGE_RPI3_IMAGE):
 	@$(call targetinfo)
-	@GPU_MEM=$(PTXCONF_IMAGE_RPI3_GPU_MEM) \
-		ptxd_replace_magic "$(IMAGE_RPI3_DATA_DIR)/config.txt" > \
-		"$(PTXDIST_TEMPDIR)/config.txt"
 	@$(call image/genimage, IMAGE_RPI3)
 	@$(call finish)
 
-- 
2.30.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de