From: Michael Olbrich <m.olbrich@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [DistroKit] [PATCH 4/6] platform-v7a: image-rpi2: add layer support
Date: Fri, 26 Oct 2018 13:52:13 +0200 [thread overview]
Message-ID: <20181026115215.20186-5-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20181026115215.20186-1-m.olbrich@pengutronix.de>
Remove all references to PTXDIST_PLATFORMCONFIGDIR to do this.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/image-rpi2.make | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
index 43d2e3436d47..6ca4827a7db3 100644
--- a/configs/platform-v7a/rules/image-rpi2.make
+++ b/configs/platform-v7a/rules/image-rpi2.make
@@ -21,11 +21,12 @@ IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2)
IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi2.hdimg
IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz
IMAGE_RPI2_CONFIG := rpi2.config
-IMAGE_RPI2_DATA := \
- $(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/rpi-firmware/*.bin) \
- $(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/rpi-firmware/*.elf) \
- $(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/rpi-firmware/*.dat) \
- $(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/rpi-firmware/config.txt)
+IMAGE_RPI2_DATA_DIR := $(call ptx/in-platformconfigdir, 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)/config.txt)
# ----------------------------------------------------------------------------
# Image
@@ -41,7 +42,7 @@ IMAGE_RPI2_ENV := \
$(IMAGE_RPI2_IMAGE):
@$(call targetinfo)
@GPU_MEM=$(PTXCONF_IMAGE_RPI2_GPU_MEM) \
- ptxd_replace_magic "$(PTXDIST_PLATFORMCONFIGDIR)/rpi-firmware/config.txt" > \
+ ptxd_replace_magic "$(IMAGE_RPI2_DATA_DIR)/config.txt" > \
"$(PTXDIST_TEMPDIR)/config.txt"
@$(call image/genimage, IMAGE_RPI2)
@$(call finish)
--
2.19.0
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev parent reply other threads:[~2018-10-26 11:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-26 11:52 [DistroKit] [PATCH 0/6] platform-v7a: basic " Michael Olbrich
2018-10-26 11:52 ` [DistroKit] [PATCH 1/6] platform-v7a: barebox-am335x: add " Michael Olbrich
2018-10-26 11:52 ` [DistroKit] [PATCH 2/6] platform-v7a: barebox-mx6: " Michael Olbrich
2018-10-26 11:52 ` [DistroKit] [PATCH 3/6] platform-v7a: barebox-rpi2: " Michael Olbrich
2018-10-26 11:52 ` Michael Olbrich [this message]
2018-10-26 11:52 ` [DistroKit] [PATCH 5/6] platform-v7a: barebox-vexpress: " Michael Olbrich
2018-10-26 11:52 ` [DistroKit] [PATCH 6/6] platform-v7a: barebox-am335x-mlo: " Michael Olbrich
2018-10-26 11:59 ` [DistroKit] [PATCH 0/6] platform-v7a: basic " 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=20181026115215.20186-5-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