diff options
| -rw-r--r-- | configs/platform-v7a/rules/barebox-am335x-mlo.make | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make index 2056fc9..c668521 100644 --- a/configs/platform-v7a/rules/barebox-am335x-mlo.make +++ b/configs/platform-v7a/rules/barebox-am335x-mlo.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,34 +16,37 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X_MLO) += barebox-am335x-mlo # BAREBOX_AM335X_MLO_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) BAREBOX_AM335X_MLO_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) -BAREBOX_AM335X_MLO := barebox-$(BAREBOX_AM335X_MLO_VERSION) +BAREBOX_AM335X_MLO := barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION) BAREBOX_AM335X_MLO_SUFFIX := tar.bz2 -BAREBOX_AM335X_MLO_DIR := $(BUILDDIR)/barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION) -BAREBOX_AM335X_MLO_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x-mlo.config) -BAREBOX_AM335X_MLO_LICENSE := GPL-2.0 BAREBOX_AM335X_MLO_URL := $(call barebox-url, BAREBOX_AM335X_MLO) -BAREBOX_AM335X_MLO_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X_MLO).$(BAREBOX_AM335X_MLO_SUFFIX) +BAREBOX_AM335X_MLO_PATCHES := barebox-$(BAREBOX_AM335X_MLO_VERSION) +BAREBOX_AM335X_MLO_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X_MLO_PATCHES).$(BAREBOX_AM335X_MLO_SUFFIX) +BAREBOX_AM335X_MLO_DIR := $(BUILDDIR)/$(BAREBOX_AM335X_MLO) +BAREBOX_AM335X_MLO_BUILD_DIR := $(BAREBOX_AM335X_MLO_DIR)-build +BAREBOX_AM335X_MLO_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x-mlo.config) +BAREBOX_AM335X_MLO_LICENSE := GPL-2.0-only +BAREBOX_AM335X_MLO_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- +# use host pkg-config for host tools +BAREBOX_AM335X_MLO_PATH := PATH=$(HOST_PATH) + BAREBOX_AM335X_MLO_WRAPPER_BLACKLIST := \ - TARGET_HARDEN_RELRO \ - TARGET_HARDEN_BINDNOW \ - TARGET_HARDEN_PIE \ - TARGET_DEBUG \ - TARGET_BUILD_ID + $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_AM335X_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1 -BAREBOX_AM335X_MLO_CONF_OPT := $(call barebox-opts, BAREBOX_AM335X_MLO) +BAREBOX_AM335X_MLO_CONF_OPT := \ + -C $(BAREBOX_AM335X_MLO_DIR) \ + O=$(BAREBOX_AM335X_MLO_BUILD_DIR) \ + $(call barebox-opts, BAREBOX_AM335X_MLO) -BAREBOX_AM335X_MLO_MAKE_ENV := $(BAREBOX_AM335X_MLO_CONF_ENV) BAREBOX_AM335X_MLO_MAKE_OPT := $(BAREBOX_AM335X_MLO_CONF_OPT) BAREBOX_AM335X_MLO_IMAGES := images/barebox-am33xx-afi-gf-mlo.img \ images/barebox-am33xx-beaglebone-mlo.img -BAREBOX_AM335X_MLO_IMAGES := $(addprefix $(BAREBOX_AM335X_MLO_DIR)/,$(BAREBOX_AM335X_MLO_IMAGES)) +BAREBOX_AM335X_MLO_IMAGES := $(addprefix $(BAREBOX_AM335X_MLO_BUILD_DIR)/,$(BAREBOX_AM335X_MLO_IMAGES)) ifdef PTXCONF_BAREBOX_AM335X_MLO $(BAREBOX_AM335X_MLO_CONFIG): @@ -58,8 +59,6 @@ $(BAREBOX_AM335X_MLO_CONFIG): @exit 1 endif -$(STATEDIR)/barebox-am335x-mlo.prepare: $(BAREBOX_AM335X_MLO_CONFIG) - # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- @@ -69,14 +68,14 @@ $(STATEDIR)/barebox-am335x-mlo.install: @$(call touch) # ---------------------------------------------------------------------------- -# Targetinstall +# Target-Install # ---------------------------------------------------------------------------- $(STATEDIR)/barebox-am335x-mlo.targetinstall: @$(call targetinfo) @$(foreach image, $(BAREBOX_AM335X_MLO_IMAGES), \ install -m 644 \ - $(image) $(IMAGEDIR)/$(notdir $(image));) + $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) @$(call touch) # ---------------------------------------------------------------------------- @@ -87,7 +86,7 @@ $(STATEDIR)/barebox-am335x-mlo.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX_AM335X_MLO) @$(foreach image, $(BAREBOX_AM335X_MLO_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x-mlo;) + rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x-mlo$(ptx/nl)) # ---------------------------------------------------------------------------- # oldconfig / menuconfig |