diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/boot/arm-trusted-firmware-mvebu/Makefile | 6 | ||||
-rw-r--r-- | package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index 7fefee3846..bd03a6a32e 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -122,15 +122,15 @@ TFA_MAKE_FLAGS += \ mrvl_uart A3700_UTILS_NAME:=a3700-utils -A3700_UTILS_RELEASE:=5598e150 +A3700_UTILS_RELEASE:=2efdb10f A3700_UTILS_SOURCE=$(A3700_UTILS_NAME)-$(A3700_UTILS_RELEASE).tar.bz2 define Download/a3700-utils FILE:=$(A3700_UTILS_SOURCE) PROTO:=git URL:=https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell.git - VERSION:=5598e150fa3a1568256c30223fd2b214d729f26a - MIRROR_HASH:=4c3a3bed97833d08af4e42995c0c5af6c107f990fd492cd90aa3e79134d2751e + VERSION:=2efdb10f3524c534d276002adf81fec06e0f1cf2 + MIRROR_HASH:=4476e1bacfa7abb4a1303c6cf3aa7d067038b24090dfd5da13ca2a72a0d5c7a4 SUBDIR:=$(A3700_UTILS_NAME) endef diff --git a/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch b/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch index 745e615074..0519598a28 100644 --- a/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch +++ b/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch @@ -1,13 +1,14 @@ diff --git a/wtmi/sys_init/Makefile b/wtmi/sys_init/Makefile --- a/wtmi/sys_init/Makefile +++ b/wtmi/sys_init/Makefile -@@ -51,7 +51,8 @@ ECHO = @echo +@@ -51,8 +51,8 @@ ECHO = @echo SED = @sed LOCAL_VERSION_STRING ?= -armada --BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h") -+A3700_UTILS_COMMIT_ID ?= $(shell git log -n 1 --pretty=format:"%h") -+BUILD_STRING := $(A3700_UTILS_COMMIT_ID) - VERSION_STRING := $(LOCAL_VERSION_STRING)-$(BUILD_STRING) +-BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h" && (git diff-index --quiet HEAD || echo -dirty)) +-VERSION_STRING := $(LOCAL_VERSION_STRING)-$(BUILD_STRING) ++A3700_UTILS_COMMIT_ID ?= $(shell git log -n 1 --pretty=format:"%h" && (git diff-index --quiet HEAD || echo -dirty)) ++VERSION_STRING := $(LOCAL_VERSION_STRING)-$(A3700_UTILS_COMMIT_ID) CPUOPTS = -mthumb -mcpu=cortex-m3 -mlittle-endian + BINPATH = build |