diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-11-04 22:21:39 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2019-11-04 23:08:22 +0100 |
| commit | 925d02074ac0b72f5dc506eb9ac05302eac4a599 (patch) | |
| tree | 5bb912b3761f939c69f70a6210ca1d8bd1147b3e | |
| parent | a171493b43bc19cb5dcf048db56bad8f20b132a5 (diff) | |
| download | DistroKit-925d02074ac0b72f5dc506eb9ac05302eac4a599.tar.gz DistroKit-925d02074ac0b72f5dc506eb9ac05302eac4a599.tar.xz | |
barebox-am335x: sync with latest barebox template
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | configs/platform-v7a/rules/barebox-am335x.make | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make index 0b9d458..9540700 100644 --- a/configs/platform-v7a/rules/barebox-am335x.make +++ b/configs/platform-v7a/rules/barebox-am335x.make @@ -2,8 +2,6 @@ # # Copyright (C) 2017 by Robert Schwebel <r.schwebel@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. # @@ -16,37 +14,40 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x # # Paths and names # -BAREBOX_AM335X_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_AM335X_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) -BAREBOX_AM335X := barebox-$(BAREBOX_AM335X_VERSION) -BAREBOX_AM335X_SUFFIX := tar.bz2 -BAREBOX_AM335X_DIR := $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION) -BAREBOX_AM335X_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x.config) -BAREBOX_AM335X_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_AM335X_LICENSE := GPL-2.0 -BAREBOX_AM335X_URL := $(call barebox-url, BAREBOX_AM335X) -BAREBOX_AM335X_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X).$(BAREBOX_AM335X_SUFFIX) +BAREBOX_AM335X_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) +BAREBOX_AM335X_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_AM335X := barebox-am335x-$(BAREBOX_AM335X_VERSION) +BAREBOX_AM335X_SUFFIX := tar.bz2 +BAREBOX_AM335X_URL := $(call barebox-url, BAREBOX_AM335X) +BAREBOX_AM335X_PATCHES := barebox-$(BAREBOX_AM335X_VERSION) +BAREBOX_AM335X_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X_PATCHES).$(BAREBOX_AM335X_SUFFIX) +BAREBOX_AM335X_DIR := $(BUILDDIR)/$(BAREBOX_AM335X) +BAREBOX_AM335X_BUILD_DIR := $(BAREBOX_AM335X_DIR)-build +BAREBOX_AM335X_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x.config) +BAREBOX_AM335X_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) +BAREBOX_AM335X_LICENSE := GPL-2.0-only +BAREBOX_AM335X_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- +# use host pkg-config for host tools +BAREBOX_AM335X_PATH := PATH=$(HOST_PATH) + BAREBOX_AM335X_WRAPPER_BLACKLIST := \ - TARGET_HARDEN_RELRO \ - TARGET_HARDEN_BINDNOW \ - TARGET_HARDEN_PIE \ - TARGET_DEBUG \ - TARGET_BUILD_ID + $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_AM335X_CONF_ENV := KCONFIG_NOTIMESTAMP=1 -BAREBOX_AM335X_CONF_OPT := $(call barebox-opts, BAREBOX_AM335X) +BAREBOX_AM335X_CONF_OPT := \ + -C $(BAREBOX_AM335X_DIR) \ + O=$(BAREBOX_AM335X_BUILD_DIR) \ + $(call barebox-opts, BAREBOX_AM335X) -BAREBOX_AM335X_MAKE_ENV := $(BAREBOX_AM335X_CONF_ENV) BAREBOX_AM335X_MAKE_OPT := $(BAREBOX_AM335X_CONF_OPT) BAREBOX_AM335X_IMAGES := images/barebox-am33xx-afi-gf.img \ images/barebox-am33xx-beaglebone.img -BAREBOX_AM335X_IMAGES := $(addprefix $(BAREBOX_AM335X_DIR)/,$(BAREBOX_AM335X_IMAGES)) +BAREBOX_AM335X_IMAGES := $(addprefix $(BAREBOX_AM335X_BUILD_DIR)/,$(BAREBOX_AM335X_IMAGES)) ifdef PTXCONF_BAREBOX_AM335X $(BAREBOX_AM335X_CONFIG): @@ -61,10 +62,10 @@ endif $(STATEDIR)/barebox-am335x.prepare: $(BAREBOX_AM335X_CONFIG) @$(call targetinfo) + @$(call world/prepare, BAREBOX_AM335X) @rm -f "$(BAREBOX_AM335X_DIR)/.ptxdist-defaultenv" @ln -s "$(call ptx/in-platformconfigdir, barebox-am335x-defaultenv)" \ "$(BAREBOX_AM335X_DIR)/.ptxdist-defaultenv" - @$(call world/prepare, BAREBOX_AM335X) @$(call touch) # ---------------------------------------------------------------------------- @@ -76,14 +77,14 @@ $(STATEDIR)/barebox-am335x.install: @$(call touch) # ---------------------------------------------------------------------------- -# Targetinstall +# Target-Install # ---------------------------------------------------------------------------- $(STATEDIR)/barebox-am335x.targetinstall: @$(call targetinfo) @$(foreach image, $(BAREBOX_AM335X_IMAGES), \ install -m 644 \ - $(image) $(IMAGEDIR)/$(notdir $(image));) + $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) @$(call touch) # ---------------------------------------------------------------------------- @@ -94,7 +95,7 @@ $(STATEDIR)/barebox-am335x.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX_AM335X) @$(foreach image, $(BAREBOX_AM335X_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x;) + rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x$(ptx/nl)) # ---------------------------------------------------------------------------- # oldconfig / menuconfig |