From: Kerma Gérald Date: Tue, 12 Oct 2021 11:25:32 +0000 (+0200) Subject: arm-trusted-firmware-mvebu: fix commit ids to for mv-ddr-marvell X-Git-Tag: v22.03.0-rc1~1104 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=35b0dc36a3f9af259a488c86abc892b1288dc00d;p=openwrt%2Fopenwrt.git arm-trusted-firmware-mvebu: fix commit ids to for mv-ddr-marvell without this patch a3700-utils/tim/ddr/ddr_tool.verstr contains the OpenWrt commit ID. this patch fix the mv_ddr version commit ID by using the global variable MV_DDR_COMMIT_ID. Upon boot it now prints "mv_ddr-devel-g02e23dbc-d DDR4 16b 1GB 1CS". Cc: Andre Heider Signed-off-by: Kerma Gérald --- diff --git a/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/002-version_mv_ddr_fix.patch b/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/002-version_mv_ddr_fix.patch new file mode 100644 index 0000000000..6c3956c121 --- /dev/null +++ b/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/002-version_mv_ddr_fix.patch @@ -0,0 +1,12 @@ +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ + @cp -f ${MV_DDR_PATH}/a3700_tool $(TIM_DDR_PATH)/ddr_tool + + $(TIM_DDR_PATH)/ddr_tool.verstr: $(MV_DDR_PATH)/a3700_tool +- @echo mv_ddr-$(shell sed 's/^mv_ddr-//' $(MV_DDR_PATH)/localversion 2>/dev/null || echo 'unknown')$(if $(shell git -C $(MV_DDR_PATH) rev-parse --git-dir 2>/dev/null),-g$(shell git -C $(MV_DDR_PATH) rev-parse --verify --quiet --short HEAD 2>/dev/null)$(shell git -C $(MV_DDR_PATH) diff-index --quiet HEAD || echo -d)) > $@ ++ @echo mv_ddr-$(shell sed 's/^mv_ddr-//' $(MV_DDR_PATH)/localversion 2>/dev/null || echo 'unknown')-g$(MV_DDR_COMMIT_ID) > $@ + + mv_ddr: $(TIM_DDR_PATH)/ddr_tool $(TIM_DDR_PATH)/ddr_tool.verstr + +