* [DistroKit] [PATCH] platform-rpi: image-boot-vfat: add layer support
@ 2018-10-26 11:58 Michael Olbrich
2018-10-26 13:27 ` Robert Schwebel
0 siblings, 1 reply; 2+ messages in thread
From: Michael Olbrich @ 2018-10-26 11:58 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Remove all references to PTXDIST_PLATFORMCONFIGDIR to do this.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
This is similar to my patches for the v7a platform, just for the rpi
platform instead.
Regards,
Michael
configs/platform-rpi/{ => firmware}/config.txt | 0
configs/platform-rpi/rules/image-boot-vfat.make | 9 +++++----
2 files changed, 5 insertions(+), 4 deletions(-)
rename configs/platform-rpi/{ => firmware}/config.txt (100%)
diff --git a/configs/platform-rpi/config.txt b/configs/platform-rpi/firmware/config.txt
similarity index 100%
rename from configs/platform-rpi/config.txt
rename to configs/platform-rpi/firmware/config.txt
diff --git a/configs/platform-rpi/rules/image-boot-vfat.make b/configs/platform-rpi/rules/image-boot-vfat.make
index 93a725b1fc3a..fcb73866039d 100644
--- a/configs/platform-rpi/rules/image-boot-vfat.make
+++ b/configs/platform-rpi/rules/image-boot-vfat.make
@@ -19,10 +19,11 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_BOOT_VFAT) += image-boot-vfat
IMAGE_BOOT_VFAT := image-boot-vfat
IMAGE_BOOT_VFAT_DIR := $(BUILDDIR)/$(IMAGE_BOOT_VFAT)
IMAGE_BOOT_VFAT_IMAGE := $(IMAGEDIR)/boot.vfat
+IMAGE_BOOT_VFAT_DATA_DIR:= $(call ptx/in-platformconfigdir, firmware)
IMAGE_BOOT_VFAT_DATA := \
- $(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/firmware/*.bin) \
- $(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/firmware/*.elf) \
- $(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/firmware/*.dat) \
+ $(wildcard $(IMAGE_BOOT_VFAT_DATA_DIR)/*.bin) \
+ $(wildcard $(IMAGE_BOOT_VFAT_DATA_DIR)/*.elf) \
+ $(wildcard $(IMAGE_BOOT_VFAT_DATA_DIR)/*.dat) \
$(PTXDIST_TEMPDIR)/config.txt
IMAGE_BOOT_VFAT_CONFIG := boot-vfat.config
@@ -46,7 +47,7 @@ IMAGE_BOOT_VFAT_ENV := \
$(IMAGE_BOOT_VFAT_IMAGE):
@$(call targetinfo)
@GPU_MEM=$(PTXCONF_IMAGE_BOOT_VFAT_GPU_MEM) \
- ptxd_replace_magic "$(PTXDIST_PLATFORMCONFIGDIR)/config.txt" > \
+ ptxd_replace_magic "$(IMAGE_BOOT_VFAT_DATA_DIR)/config.txt" > \
"$(PTXDIST_TEMPDIR)/config.txt"
@$(call image/genimage, IMAGE_BOOT_VFAT)
@$(call finish)
--
2.19.0
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [DistroKit] [PATCH] platform-rpi: image-boot-vfat: add layer support
2018-10-26 11:58 [DistroKit] [PATCH] platform-rpi: image-boot-vfat: add layer support Michael Olbrich
@ 2018-10-26 13:27 ` Robert Schwebel
0 siblings, 0 replies; 2+ messages in thread
From: Robert Schwebel @ 2018-10-26 13:27 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit
On Fri, Oct 26, 2018 at 01:58:55PM +0200, Michael Olbrich wrote:
> Remove all references to PTXDIST_PLATFORMCONFIGDIR to do this.
>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Applied, thx.
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-26 13:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-26 11:58 [DistroKit] [PATCH] platform-rpi: image-boot-vfat: add layer support Michael Olbrich
2018-10-26 13:27 ` Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox