diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-26 13:52:13 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2018-10-26 13:58:37 +0200 |
| commit | d209a7363bef95763fbbe54f40869cc8310f4435 (patch) | |
| tree | 805c706f0414569dac02e495d5f6ad88551c6249 /configs/platform-v7a | |
| parent | 1569c93d9601adef5b6b47eebb0de0ca2bdda67a (diff) | |
| download | DistroKit-d209a7363bef95763fbbe54f40869cc8310f4435.tar.gz DistroKit-d209a7363bef95763fbbe54f40869cc8310f4435.tar.xz | |
platform-v7a: image-rpi2: add layer support
Remove all references to PTXDIST_PLATFORMCONFIGDIR to do this.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a')
| -rw-r--r-- | configs/platform-v7a/rules/image-rpi2.make | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make index 43d2e34..6ca4827 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) |