summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/platform-v7a/barebox-rpi2.config2
-rw-r--r--configs/platform-v7a/rules/barebox-rpi2.make8
2 files changed, 8 insertions, 2 deletions
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 6e673bd..74c52e9 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -174,7 +174,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_COMPRESSION_NONE=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/raspberry-pi/env ${PTXDIST_PLATFORMCONFIGDIR}/barebox-rpi2-defaultenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH=".ptxdist-defaultenv"
CONFIG_BAREBOXENV_TARGET=y
# CONFIG_BAREBOXCRC32_TARGET is not set
CONFIG_POLLER=y
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index ba16511..cf9fc00 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -21,7 +21,7 @@ BAREBOX_RPI2_MD5 := 8286a8ea2cdd88104e5c6762d93d81db
BAREBOX_RPI2 := barebox-$(BAREBOX_RPI2_VERSION)
BAREBOX_RPI2_SUFFIX := tar.bz2
BAREBOX_RPI2_DIR := $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION)
-BAREBOX_RPI2_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-rpi2.config
+BAREBOX_RPI2_CONFIG := $(call ptx/in-platformconfigdir, barebox-rpi2.config)
BAREBOX_RPI2_LICENSE := GPL-2.0
BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2)
BAREBOX_RPI2_SOURCE := $(SRCDIR)/$(BAREBOX_RPI2).$(BAREBOX_RPI2_SUFFIX)
@@ -58,6 +58,12 @@ $(BAREBOX_RPI2_CONFIG):
endif
$(STATEDIR)/barebox-rpi2.prepare: $(BAREBOX_RPI2_CONFIG)
+ @$(call targetinfo)
+ @rm -f "$(BAREBOX_RPI2_DIR)/.ptxdist-defaultenv"
+ @ln -s "$(call ptx/in-platformconfigdir, barebox-rpi2-defaultenv)" \
+ "$(BAREBOX_RPI2_DIR)/.ptxdist-defaultenv"
+ @$(call world/prepare, BAREBOX_RPI2)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install