diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-26 13:58:55 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2018-10-26 15:26:33 +0200 |
| commit | 61a92e0b6933f593e0224fb88e1c693f380e1a8f (patch) | |
| tree | 2faefa70cb995a0292170a89076b183e9ff770ec /configs | |
| parent | 988931418facbd39a82ae643eb6df6a022444a35 (diff) | |
| download | DistroKit-61a92e0b6933f593e0224fb88e1c693f380e1a8f.tar.gz DistroKit-61a92e0b6933f593e0224fb88e1c693f380e1a8f.tar.xz | |
platform-rpi: image-boot-vfat: 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')
| -rw-r--r-- | configs/platform-rpi/firmware/config.txt (renamed from configs/platform-rpi/config.txt) | 0 | ||||
| -rw-r--r-- | configs/platform-rpi/rules/image-boot-vfat.make | 9 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configs/platform-rpi/config.txt b/configs/platform-rpi/firmware/config.txt index 956ad81..956ad81 100644 --- a/configs/platform-rpi/config.txt +++ b/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 93a725b..fcb7386 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) |