From 99fdcd0eb033d41ceffa7b93a4d5c26cbc2a6721 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Mon, 4 Nov 2019 22:21:36 +0100
Subject: barebox-mx6: sync with latest barebox template

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 configs/platform-v7a/rules/barebox-mx6.make | 41 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'configs')

diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index 69d8236..68f4bcb 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
 #
-# See CREDITS for details about who has contributed to this project.
-#
 # For further information about the PTXdist project and license conditions
 # see the README file.
 #
@@ -18,30 +16,33 @@ PACKAGES-$(PTXCONF_BAREBOX_MX6) += barebox-mx6
 #
 BAREBOX_MX6_VERSION	:= $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
 BAREBOX_MX6_MD5		:= $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_MX6		:= barebox-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6		:= barebox-mx6-$(BAREBOX_MX6_VERSION)
 BAREBOX_MX6_SUFFIX	:= tar.bz2
-BAREBOX_MX6_DIR		:= $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6_URL		:= $(call barebox-url, BAREBOX_MX6)
+BAREBOX_MX6_PATCHES	:= barebox-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6_SOURCE	:= $(SRCDIR)/$(BAREBOX_MX6_PATCHES).$(BAREBOX_MX6_SUFFIX)
+BAREBOX_MX6_DIR		:= $(BUILDDIR)/$(BAREBOX_MX6)
+BAREBOX_MX6_BUILD_DIR	:= $(BAREBOX_MX6_DIR)-build
 BAREBOX_MX6_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-mx6.config)
 BAREBOX_MX6_REF_CONFIG	:= $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_MX6_LICENSE	:= GPL-2.0
-BAREBOX_MX6_URL		:= $(call barebox-url, BAREBOX_MX6)
-BAREBOX_MX6_SOURCE	:= $(SRCDIR)/$(BAREBOX_MX6).$(BAREBOX_MX6_SUFFIX)
+BAREBOX_MX6_LICENSE	:= GPL-2.0-only
+BAREBOX_MX6_BUILD_OOT	:= KEEP
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
+# use host pkg-config for host tools
+BAREBOX_MX6_PATH := PATH=$(HOST_PATH)
+
 BAREBOX_MX6_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
-BAREBOX_MX6_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_MX6_CONF_OPT := $(call barebox-opts, BAREBOX_MX6)
+BAREBOX_MX6_CONF_OPT := \
+	-C $(BAREBOX_MX6_DIR) \
+	O=$(BAREBOX_MX6_BUILD_DIR) \
+	$(call barebox-opts, BAREBOX_MX6)
 
-BAREBOX_MX6_MAKE_ENV := $(BAREBOX_MX6_CONF_ENV)
 BAREBOX_MX6_MAKE_OPT := $(BAREBOX_MX6_CONF_OPT)
 
 BAREBOX_MX6_IMAGES := images/barebox-embest-imx6s-riotboard.img \
@@ -52,7 +53,7 @@ BAREBOX_MX6_IMAGES := images/barebox-embest-imx6s-riotboard.img \
 	images/barebox-boundarydevices-imx6qp-nitrogen6_max.img \
 	images/barebox-udoo-neo.img
 
-BAREBOX_MX6_IMAGES := $(addprefix $(BAREBOX_MX6_DIR)/,$(BAREBOX_MX6_IMAGES))
+BAREBOX_MX6_IMAGES := $(addprefix $(BAREBOX_MX6_BUILD_DIR)/,$(BAREBOX_MX6_IMAGES))
 
 ifdef PTXCONF_BAREBOX_MX6
 $(BAREBOX_MX6_CONFIG):
@@ -67,10 +68,10 @@ endif
 
 $(STATEDIR)/barebox-mx6.prepare: $(BAREBOX_MX6_CONFIG)
 	@$(call targetinfo)
+	@$(call world/prepare, BAREBOX_MX6)
 	@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)
 
 # ----------------------------------------------------------------------------
@@ -82,14 +83,14 @@ $(STATEDIR)/barebox-mx6.install:
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
 # ----------------------------------------------------------------------------
 
 $(STATEDIR)/barebox-mx6.targetinstall:
 	@$(call targetinfo)
 	@$(foreach image, $(BAREBOX_MX6_IMAGES), \
 		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image));)
+			$(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -100,7 +101,7 @@ $(STATEDIR)/barebox-mx6.clean:
 	@$(call targetinfo)
 	@$(call clean_pkg, BAREBOX_MX6)
 	@$(foreach image, $(BAREBOX_MX6_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))-mx6;)
+		rm -fv $(IMAGEDIR)/$(notdir $(image))-mx6$(ptx/nl))
 
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
-- 
cgit v1.2.3