summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Hieber <rhi@pengutronix.de>2021-02-08 00:55:43 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2021-02-09 10:04:46 +0100
commitc22b77340be7a0a0b7322776e6d579ef516ba5ad (patch)
tree17af44ac79c738f076e10bbb62de9577b0206438
parent913b644ba8f253ad555123da8e31f9f9851be805 (diff)
downloadDistroKit-2021.02.0.tar.gz
DistroKit-2021.02.0.tar.xz
image-rpi2, image-rpi3: remove no-op ptxd_replace_magic callsDistroKit-2021.02.0
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>
-rw-r--r--configs/platform-v7a/rules/image-rpi2.make3
-rw-r--r--configs/platform-v7a/rules/image-rpi3.make3
2 files changed, 0 insertions, 6 deletions
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
index 07b1e7b..8e192e4 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 31b4295..5c56c3a 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)