aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils
diff options
context:
space:
mode:
authorAndre Heider <a.heider@gmail.com>2021-06-08 04:20:26 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-25 13:52:39 +0200
commit6618e33f2633390d3572390616fe354ecd21bfb8 (patch)
tree2981ee3e3897df4117b7deca65f8afee00b54200 /package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils
parentb40705b677030c30896917b7d2aa050fe5865605 (diff)
downloadupstream-6618e33f2633390d3572390616fe354ecd21bfb8.tar.gz
upstream-6618e33f2633390d3572390616fe354ecd21bfb8.tar.bz2
upstream-6618e33f2633390d3572390616fe354ecd21bfb8.zip
arm-trusted-firmware-mvebu: update a3700-tools to current master
2efdb10 wtmi: Fix calculation of UART divider 4247e39 fix: twin die ddr porting guide 8ad7992 sys_init: Add missing newlines in debug mode 4ddea19 avs: Validate VDD value from OTP c444aeb avs: Fix description for avs value 0x2e 1915b78 tim: Optimize code generated by gettimver.sh and print newline 21f566d tim: Print mv_ddr version and configuration on UART 840b70b tim: Use variable $DDRFILE where possible c10e6ae tim: Fix waiting for UART TX ready 7bf95cf wtmi: Wait 3ms for the TX on UART to be empty prior resetting TX FIFO 63e8433 wtmi: Add "dirty" suffix to git commit and rebuild sys_init.bin binary when VERSION changes e949b58 wtmi: During setup clock phase print CPU and DDR speed 10376b5 wtmi: Flush output on UART after the '\n' character 509c647 Makefile: Check that specified DDR_TOPOLOGY option is valid Signed-off-by: Andre Heider <a.heider@gmail.com>
Diffstat (limited to 'package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils')
-rw-r--r--package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch11
1 files changed, 6 insertions, 5 deletions
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