diff options
Diffstat (limited to 'configs/platform-v7a/rules/barebox-stm32mp.make')
| -rw-r--r-- | configs/platform-v7a/rules/barebox-stm32mp.make | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make index 17548fa..e39d7c1 100644 --- a/configs/platform-v7a/rules/barebox-stm32mp.make +++ b/configs/platform-v7a/rules/barebox-stm32mp.make @@ -16,40 +16,46 @@ 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_PATCHES).$(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 := \ - images/barebox-stm32mp15xx-dkx.img \ - images/barebox-stm32mp15x-ev1.img \ - images/barebox-stm32mp157c-lxa-mc1.img + images/barebox-stm32mp-generic-bl33.img + +BAREBOX_STM32MP_FIP_DTBS := \ + stm32mp157c-dk2.dtb \ + stm32mp157c-ev1.dtb \ + stm32mp157c-lxa-mc1.dtb \ + stm32mp135f-dk.dtb -BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_DIR)/,$(BAREBOX_STM32MP_IMAGES)) +BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/,$(BAREBOX_STM32MP_IMAGES)) +BAREBOX_STM32MP_FIP_DTBS := \ + $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/arch/arm/dts/,$(BAREBOX_STM32MP_FIP_DTBS)) ifdef PTXCONF_BAREBOX_STM32MP $(BAREBOX_STM32MP_CONFIG): @@ -64,10 +70,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) # ---------------------------------------------------------------------------- @@ -87,6 +93,9 @@ $(STATEDIR)/barebox-stm32mp.targetinstall: @$(foreach image, $(BAREBOX_STM32MP_IMAGES), \ install -m 644 \ $(image) $(IMAGEDIR)/$(notdir $(image));) + @$(foreach dtb, $(BAREBOX_STM32MP_FIP_DTBS), \ + install -m 644 \ + $(dtb) $(IMAGEDIR)/$(notdir $(dtb))-bb;) @$(call touch) # ---------------------------------------------------------------------------- @@ -97,7 +106,9 @@ $(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)) + @$(foreach dtb, $(BAREBOX_STM32MP_FIP_DTBS), \ + rm -fv $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl)) # ---------------------------------------------------------------------------- # oldconfig / menuconfig |