diff options
Diffstat (limited to 'configs/platform-v7a/rules/barebox-rpi2.make')
| -rw-r--r-- | configs/platform-v7a/rules/barebox-rpi2.make | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make index 5f16584..ea2f18f 100644 --- a/configs/platform-v7a/rules/barebox-rpi2.make +++ b/configs/platform-v7a/rules/barebox-rpi2.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_RPI2) += barebox-rpi2 # # Paths and names # -BAREBOX_RPI2_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_RPI2_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_RPI2_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_RPI2_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_RPI2 := barebox-rpi2-$(BAREBOX_RPI2_VERSION) BAREBOX_RPI2_SUFFIX := tar.bz2 BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2) @@ -41,12 +41,12 @@ BAREBOX_RPI2_WRAPPER_BLACKLIST := \ BAREBOX_RPI2_CONF_OPT := \ -C $(BAREBOX_RPI2_DIR) \ O=$(BAREBOX_RPI2_BUILD_DIR) \ + BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ $(call barebox-opts, BAREBOX_RPI2) BAREBOX_RPI2_MAKE_OPT := $(BAREBOX_RPI2_CONF_OPT) -BAREBOX_RPI2_IMAGES := images/barebox-raspberry-pi-2.img images/barebox-raspberry-pi-3.img -BAREBOX_RPI2_IMAGES := $(addprefix $(BAREBOX_RPI2_BUILD_DIR)/,$(BAREBOX_RPI2_IMAGES)) +BAREBOX_RPI2_DTB_DIR := $(BAREBOX_RPI2_BUILD_DIR)/arch/arm/dts ifdef PTXCONF_BAREBOX_RPI2 $(BAREBOX_RPI2_CONFIG): @@ -81,9 +81,11 @@ $(STATEDIR)/barebox-rpi2.install: $(STATEDIR)/barebox-rpi2.targetinstall: @$(call targetinfo) - @$(foreach image, $(BAREBOX_RPI2_IMAGES), \ + @$(foreach dtb, $(wildcard $(BAREBOX_RPI2_DTB_DIR)/*.dtb), \ install -m 644 \ - $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) + $(dtb) $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl)) + @install -m 644 $(BAREBOX_RPI2_BUILD_DIR)/images/barebox-raspberry-pi.img \ + $(IMAGEDIR)/barebox-raspberry-pi.img @$(call touch) # ---------------------------------------------------------------------------- @@ -93,8 +95,9 @@ $(STATEDIR)/barebox-rpi2.targetinstall: $(STATEDIR)/barebox-rpi2.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX_RPI2) - @$(foreach image, $(BAREBOX_RPI2_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) + @$(foreach dtb, $(wildcard $(BAREBOX_RPI2_DTB_DIR)/*.dtb), \ + rm -fv $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl)) + @rm -fv $(IMAGEDIR)/barebox-dt-2nd-rpi.img # ---------------------------------------------------------------------------- # oldconfig / menuconfig |