summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksij Rempel <o.rempel@pengutronix.de>2022-04-07 12:53:49 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2022-04-08 13:24:27 +0200
commit66cafd2dff1e36799330e116e030a1f845ceab74 (patch)
tree1b8c52ff203a0fdaecb32c2c1af9b5f309191a49
parentcf1b5820882cc9566e8f841926bb71d8f6de4451 (diff)
downloadDistroKit-66cafd2dff1e36799330e116e030a1f845ceab74.tar.gz
DistroKit-66cafd2dff1e36799330e116e030a1f845ceab74.tar.xz
v7a: barebox-stm32mp: build out of tree
Sync barebox-stm32mp make file with other make variants and enable build out of tree, to avoid build conflicts if local_src is used. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Link: https://lore.pengutronix.de/20220407105352.1256734-1-o.rempel@pengutronix.de Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r--configs/platform-v7a/rules/barebox-stm32mp.make30
1 files changed, 15 insertions, 15 deletions
diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make
index 17548fa..f120a09 100644
--- a/configs/platform-v7a/rules/barebox-stm32mp.make
+++ b/configs/platform-v7a/rules/barebox-stm32mp.make
@@ -16,32 +16,32 @@ PACKAGES-$(PTXCONF_BAREBOX_STM32MP) += barebox-stm32mp
#
BAREBOX_STM32MP_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
BAREBOX_STM32MP_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_STM32MP := barebox-$(BAREBOX_STM32MP_VERSION)
+BAREBOX_STM32MP := barebox-stm32mp-$(BAREBOX_STM32MP_VERSION)
BAREBOX_STM32MP_SUFFIX := tar.bz2
-BAREBOX_STM32MP_DIR := $(BUILDDIR)/barebox-stm32mp-$(BAREBOX_STM32MP_VERSION)
+BAREBOX_STM32MP_URL := $(call barebox-url, BAREBOX_STM32MP)
+BAREBOX_STM32MP_PATCHES := barebox-$(BAREBOX_STM32MP_VERSION)
+BAREBOX_STM32MP_SOURCE := $(SRCDIR)/$(BAREBOX_STM32MP).$(BAREBOX_STM32MP_SUFFIX)
+BAREBOX_STM32MP_DIR := $(BUILDDIR)/$(BAREBOX_STM32MP)
+BAREBOX_STM32MP_BUILD_DIR := $(BAREBOX_STM32MP_DIR)-build
BAREBOX_STM32MP_CONFIG := $(call ptx/in-platformconfigdir, barebox-stm32mp.config)
BAREBOX_STM32MP_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
BAREBOX_STM32MP_LICENSE := GPL-2.0
-BAREBOX_STM32MP_URL := $(call barebox-url, BAREBOX_STM32MP)
-BAREBOX_STM32MP_SOURCE := $(SRCDIR)/$(BAREBOX_STM32MP).$(BAREBOX_STM32MP_SUFFIX)
+BAREBOX_STM32MP_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
BAREBOX_STM32MP_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
BAREBOX_STM32MP_CONF_ENV := KCONFIG_NOTIMESTAMP=1
BAREBOX_STM32MP_CONF_OPT := \
+ -C $(BAREBOX_STM32MP_DIR) \
+ O=$(BAREBOX_STM32MP_BUILD_DIR) \
BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
$(call barebox-opts, BAREBOX_STM32MP)
-BAREBOX_STM32MP_MAKE_ENV := $(BAREBOX_STM32MP_CONF_ENV)
BAREBOX_STM32MP_MAKE_OPT := $(BAREBOX_STM32MP_CONF_OPT)
BAREBOX_STM32MP_IMAGES := \
@@ -49,7 +49,7 @@ BAREBOX_STM32MP_IMAGES := \
images/barebox-stm32mp15x-ev1.img \
images/barebox-stm32mp157c-lxa-mc1.img
-BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_DIR)/,$(BAREBOX_STM32MP_IMAGES))
+BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/,$(BAREBOX_STM32MP_IMAGES))
ifdef PTXCONF_BAREBOX_STM32MP
$(BAREBOX_STM32MP_CONFIG):
@@ -64,10 +64,10 @@ endif
$(STATEDIR)/barebox-stm32mp.prepare: $(BAREBOX_STM32MP_CONFIG)
@$(call targetinfo)
- @rm -f "$(BAREBOX_STM32MP_DIR)/.ptxdist-defaultenv"
- @ln -s "$(call ptx/in-platformconfigdir, barebox-stm32mp-defaultenv)" \
- "$(BAREBOX_STM32MP_DIR)/.ptxdist-defaultenv"
@$(call world/prepare, BAREBOX_STM32MP)
+ @rm -f "$(BAREBOX_STM32MP_BUILD_DIR)/.ptxdist-defaultenv"
+ @ln -s "$(call ptx/in-platformconfigdir, barebox-stm32mp-defaultenv)" \
+ "$(BAREBOX_STM32MP_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ $(STATEDIR)/barebox-stm32mp.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_STM32MP)
@$(foreach image, $(BAREBOX_STM32MP_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-stm32mp;)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig