summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-10-26 13:52:14 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2018-10-26 13:58:37 +0200
commit67aabd58641a4c744cd91692e414dd869ed52202 (patch)
tree54da08c6c66337c945acdec9c04101392c48857b
parentd209a7363bef95763fbbe54f40869cc8310f4435 (diff)
downloadDistroKit-67aabd58641a4c744cd91692e414dd869ed52202.tar.gz
DistroKit-67aabd58641a4c744cd91692e414dd869ed52202.tar.xz
platform-v7a: barebox-vexpress: add layer support
Remove all references to PTXDIST_PLATFORMCONFIGDIR to do this. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--configs/platform-v7a/barebox-vexpress.config2
-rw-r--r--configs/platform-v7a/rules/barebox-vexpress.make8
2 files changed, 8 insertions, 2 deletions
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 46174c2..826d222 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -163,7 +163,7 @@ CONFIG_ENV_HANDLING=y
CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_COMPRESSION_NONE=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-vexpress-defaultenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH=".ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
CONFIG_POLLER=y
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index 8dea4da..0266cbe 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -21,7 +21,7 @@ BAREBOX_VEXPRESS_MD5 := 8286a8ea2cdd88104e5c6762d93d81db
BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION)
BAREBOX_VEXPRESS_SUFFIX := tar.bz2
BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)
-BAREBOX_VEXPRESS_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-vexpress.config
+BAREBOX_VEXPRESS_CONFIG := $(call ptx/in-platformconfigdir, barebox-vexpress.config)
BAREBOX_VEXPRESS_LICENSE := GPL-2.0
BAREBOX_VEXPRESS_URL := $(call barebox-url, BAREBOX_VEXPRESS)
BAREBOX_VEXPRESS_SOURCE := $(SRCDIR)/$(BAREBOX_VEXPRESS).$(BAREBOX_VEXPRESS_SUFFIX)
@@ -58,6 +58,12 @@ $(BAREBOX_VEXPRESS_CONFIG):
endif
$(STATEDIR)/barebox-vexpress.prepare: $(BAREBOX_VEXPRESS_CONFIG)
+ @$(call targetinfo)
+ @rm -f "$(BAREBOX_VEXPRESS_DIR)/.ptxdist-defaultenv"
+ @ln -s "$(call ptx/in-platformconfigdir, barebox-vexpress-defaultenv)" \
+ "$(BAREBOX_VEXPRESS_DIR)/.ptxdist-defaultenv"
+ @$(call world/prepare, BAREBOX_VEXPRESS)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install