From: Michael Olbrich <m.olbrich@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [DistroKit] [PATCH] platform-rpi: image-boot-vfat: add layer support
Date: Fri, 26 Oct 2018 13:58:55 +0200 [thread overview]
Message-ID: <20181026115855.11056-1-m.olbrich@pengutronix.de> (raw)
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
next reply other threads:[~2018-10-26 11:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-26 11:58 Michael Olbrich [this message]
2018-10-26 13:27 ` Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181026115855.11056-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox