summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-11-04 22:21:40 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2019-11-04 23:08:22 +0100
commita171493b43bc19cb5dcf048db56bad8f20b132a5 (patch)
treebd74ceec9333fd91e34e07e070168f15980b3bce /configs
parent9af0c45be62d2f36606d1a112e4de9fc4d03c158 (diff)
downloadDistroKit-a171493b43bc19cb5dcf048db56bad8f20b132a5.tar.gz
DistroKit-a171493b43bc19cb5dcf048db56bad8f20b132a5.tar.xz
barebox-common: sync with latest barebox template
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'configs')
-rw-r--r--configs/platform-v7a/rules/barebox-common.make53
1 files changed, 28 insertions, 25 deletions
diff --git a/configs/platform-v7a/rules/barebox-common.make b/configs/platform-v7a/rules/barebox-common.make
index 84df4fe..8f7c52f 100644
--- a/configs/platform-v7a/rules/barebox-common.make
+++ b/configs/platform-v7a/rules/barebox-common.make
@@ -9,22 +9,23 @@
#
# We provide this package
#
-EXTRA_PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common
+PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common
#
# Paths and names
#
-BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
-BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION)
-BAREBOX_COMMON_SUFFIX := tar.bz2
-BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON)
-BAREBOX_COMMON_SOURCE := $(SRCDIR)/barebox-$(BAREBOX_COMMON_VERSION).$(BAREBOX_COMMON_SUFFIX)
-BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
-BAREBOX_COMMON_LICENSE := GPL-2.0-only
-BAREBOX_COMMON_DEVPKG := NO
-
-BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
+BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION)
+BAREBOX_COMMON_SUFFIX := tar.bz2
+BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON)
+BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION)
+BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX)
+BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
+BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build
+BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_COMMON_LICENSE := GPL-2.0-only
+BAREBOX_COMMON_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
@@ -33,15 +34,25 @@ BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
# use host pkg-config for host tools
BAREBOX_COMMON_PATH := PATH=$(HOST_PATH)
-BAREBOX_COMMON_CONF_OPT := $(call barebox-opts)
+BAREBOX_COMMON_CONF_OPT := \
+ -C $(BAREBOX_COMMON_DIR) \
+ O=$(BAREBOX_COMMON_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_COMMON)
+
BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT)
BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope
-$(STATEDIR)/barebox-common.prepare:
- @$(call targetinfo)
- @$(call world/prepare, BAREBOX_COMMON)
- @$(call touch)
+ifdef PTXCONF_BAREBOX_COMMON
+$(BAREBOX_COMMON_CONFIG):
+ @echo
+ @echo "****************************************************************************"
+ @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'"
+ @echo "****************************************************************************"
+ @echo
+ @echo
+ @exit 1
+endif
# ----------------------------------------------------------------------------
# Compile
@@ -60,14 +71,6 @@ $(STATEDIR)/barebox-common.install:
@$(call touch)
# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-common.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
# oldconfig / menuconfig
# ----------------------------------------------------------------------------