From 8bed21e7d0c427badcec7bef22b2772dd9dcb0d1 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 26 Oct 2018 13:52:11 +0200 Subject: platform-v7a: barebox-mx6: add layer support Remove all references to PTXDIST_PLATFORMCONFIGDIR to do this. Signed-off-by: Michael Olbrich --- configs/platform-v7a/barebox-mx6.config | 2 +- configs/platform-v7a/rules/barebox-mx6.make | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index b99dc16..980b97b 100644 --- a/configs/platform-v7a/barebox-mx6.config +++ b/configs/platform-v7a/barebox-mx6.config @@ -241,7 +241,7 @@ CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-mx6-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-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make index 7103ed4..7d7c2ce 100644 --- a/configs/platform-v7a/rules/barebox-mx6.make +++ b/configs/platform-v7a/rules/barebox-mx6.make @@ -21,7 +21,7 @@ BAREBOX_MX6_MD5 := 8286a8ea2cdd88104e5c6762d93d81db BAREBOX_MX6 := barebox-$(BAREBOX_MX6_VERSION) BAREBOX_MX6_SUFFIX := tar.bz2 BAREBOX_MX6_DIR := $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION) -BAREBOX_MX6_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-mx6.config +BAREBOX_MX6_CONFIG := $(call ptx/in-platformconfigdir, barebox-mx6.config) BAREBOX_MX6_LICENSE := GPL-2.0 BAREBOX_MX6_URL := $(call barebox-url, BAREBOX_MX6) BAREBOX_MX6_SOURCE := $(SRCDIR)/$(BAREBOX_MX6).$(BAREBOX_MX6_SUFFIX) @@ -65,6 +65,12 @@ $(BAREBOX_MX6_CONFIG): endif $(STATEDIR)/barebox-mx6.prepare: $(BAREBOX_MX6_CONFIG) + @$(call targetinfo) + @rm -f "$(BAREBOX_MX6_DIR)/.ptxdist-defaultenv" + @ln -s "$(call ptx/in-platformconfigdir, barebox-mx6-defaultenv)" \ + "$(BAREBOX_MX6_DIR)/.ptxdist-defaultenv" + @$(call world/prepare, BAREBOX_MX6) + @$(call touch) # ---------------------------------------------------------------------------- # Install -- cgit v1.2.3