[Armadeus-commitlog] UNNAMED PROJECT branch, armadeus-2020.07-rc4, updated. fa121849994b9099f437b4
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] UNNAMED PROJECT branch, armadeus-2020.07-rc4, updated. fa121849994b9099f437b4f7960239fc9b38d3de
|
From: Sébastien S. <ss...@us...> - 2020-06-11 09:50:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, armadeus-2020.07-rc4 has been updated
via fa121849994b9099f437b4f7960239fc9b38d3de (commit)
via ccf9a7dc509b469bdc324001d0c9ffcabef60453 (commit)
from 24dbee730babde67c5f82967dae144b122ce6947 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fa121849994b9099f437b4f7960239fc9b38d3de
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jun 11 11:37:46 2020 +0200
imx: imx8m: allow passing DDR/HDMI firmware file paths
commit ccf9a7dc509b469bdc324001d0c9ffcabef60453
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jun 11 11:36:42 2020 +0200
imx: imx8m: build SPL file
-----------------------------------------------------------------------
Summary of changes:
arch/arm/mach-imx/Makefile | 22 +++++++++++++++-------
tools/imx8m_image.sh | 34 +++++++++++++++++++++-------------
2 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index a70d51b5cf..1759cb47ba 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -108,7 +108,7 @@ DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctre
else ifeq ($(CONFIG_ARCH_IMX8M), y)
IMAGE_TYPE := imx8mimage
IMX8M_DEPFILES := $(srctree)/tools/imx8m_image.sh
-DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o spl/u-boot-spl.cfgout $(srctree)/$(IMX_CONFIG);if [ -f spl/u-boot-spl.cfgout ]; then $(IMX8M_DEPFILES) spl/u-boot-spl.cfgout 0; echo $$?; fi)
+DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o spl/u-boot-spl.cfgout $(srctree)/$(IMX_CONFIG);if [ -f spl/u-boot-spl.cfgout ]; then $(IMX8M_DEPFILES) spl/u-boot-spl.cfgout 0 $(IMX_DDR_FW_PATH) $(IMX_HDMI_FW_PATH); echo $$?; fi)
else
IMAGE_TYPE := imximage
DEPFILE_EXISTS := 0
@@ -143,17 +143,25 @@ endif
ifdef CONFIG_ARM64
ifeq ($(CONFIG_ARCH_IMX8M), y)
-SPL:
+spl/u-boot-spl-ddr.bin: spl/u-boot-spl.bin spl/u-boot-spl.cfgout FORCE
+ifeq ($(DEPFILE_EXISTS),0)
+ $(IMX8M_DEPFILES) spl/u-boot-spl.cfgout 1 $(IMX_DDR_FW_PATH) $(IMX_HDMI_FW_PATH)
+endif
+
+spl/u-boot-spl-spl-only.cfgout: spl/u-boot-spl.cfgout
+ $(Q)sed '/^SECOND_LOADER/d' $< > $@
+
+MKIMAGEFLAGS_SPL = -n spl/u-boot-spl-spl-only.cfgout \
+ -T $(IMAGE_TYPE) -e $(CONFIG_SPL_TEXT_BASE)
+SPL: MKIMAGEOUTPUT = SPL.log
+
+SPL: spl/u-boot-spl-ddr.bin spl/u-boot-spl-spl-only.cfgout FORCE
+ $(call if_changed,mkimage)
MKIMAGEFLAGS_flash.bin = -n spl/u-boot-spl.cfgout \
-T $(IMAGE_TYPE) -e $(CONFIG_SPL_TEXT_BASE)
flash.bin: MKIMAGEOUTPUT = flash.log
-spl/u-boot-spl-ddr.bin: spl/u-boot-spl.bin spl/u-boot-spl.cfgout FORCE
-ifeq ($(DEPFILE_EXISTS),0)
- $(IMX8M_DEPFILES) spl/u-boot-spl.cfgout 1
-endif
-
flash.bin: spl/u-boot-spl-ddr.bin u-boot.itb FORCE
$(call if_changed,mkimage)
endif
diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh
index ba60104443..fef8814ddf 100755
--- a/tools/imx8m_image.sh
+++ b/tools/imx8m_image.sh
@@ -8,35 +8,43 @@ file=$1
post_process=$2
+ddr_fw_path=$3
+
+hdmi_fw_path=$4
+
blobs=`awk '/^SIGNED_HDMI/ {print $2} /^LOADER/ {print $2} /^SECOND_LOADER/ {print $2} /^DDR_FW/ {print $2}' $file`
for f in $blobs; do
if [ $f = "spl/u-boot-spl-ddr.bin" ] || [ $f = "u-boot.itb" ]; then
continue
fi
- if [ ! -f $f ]; then
- echo "WARNING '$f' not found, resulting binary is not-functional" >&2
+ if [ $f = "signed_hdmi_imx8m.bin" ] && [ -! ${hdmi_fw_path}$f ]; then
+ echo "WARNING '${hdmi_fw_path}$f' not found, resulting binary is not-functional" >&2
+ exit 1
+ fi
+
+ if [ ! -f ${ddr_fw_path}$f ]; then
+ echo "WARNING '${ddr_fw_path}$f' not found, resulting binary is not-functional" >&2
exit 1
fi
done
if [ $post_process = 1 ]; then
- if [ -f lpddr4_pmu_train_1d_imem.bin ]; then
- objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
- objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin
- objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_imem_pad.bin
+ if grep -q 'lpddr4_' <<< $blobs; then
+ objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
+ objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin
+ objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_imem_pad.bin
cat lpddr4_pmu_train_1d_imem_pad.bin lpddr4_pmu_train_1d_dmem_pad.bin > lpddr4_pmu_train_1d_fw.bin
- cat lpddr4_pmu_train_2d_imem_pad.bin lpddr4_pmu_train_2d_dmem.bin > lpddr4_pmu_train_2d_fw.bin
+ cat lpddr4_pmu_train_2d_imem_pad.bin ${ddr_fw_path}lpddr4_pmu_train_2d_dmem.bin > lpddr4_pmu_train_2d_fw.bin
dd if=spl/u-boot-spl.bin of=spl/u-boot-spl-pad.bin bs=4 conv=sync
cat spl/u-boot-spl-pad.bin lpddr4_pmu_train_1d_fw.bin lpddr4_pmu_train_2d_fw.bin > spl/u-boot-spl-ddr.bin
rm -f lpddr4_pmu_train_1d_fw.bin lpddr4_pmu_train_2d_fw.bin lpddr4_pmu_train_1d_imem_pad.bin lpddr4_pmu_train_1d_dmem_pad.bin lpddr4_pmu_train_2d_imem_pad.bin spl/u-boot-spl-pad.bin
- fi
- if [ -f ddr4_imem_1d.bin ]; then
- objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ddr4_imem_1d.bin ddr4_imem_1d_pad.bin
- objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 ddr4_dmem_1d.bin ddr4_dmem_1d_pad.bin
- objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ddr4_imem_2d.bin ddr4_imem_2d_pad.bin
+ else
+ objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}ddr4_imem_1d.bin ddr4_imem_1d_pad.bin
+ objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 ${ddr_fw_path}ddr4_dmem_1d.bin ddr4_dmem_1d_pad.bin
+ objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}ddr4_imem_2d.bin ddr4_imem_2d_pad.bin
cat ddr4_imem_1d_pad.bin ddr4_dmem_1d_pad.bin > ddr4_1d_fw.bin
- cat ddr4_imem_2d_pad.bin ddr4_dmem_2d.bin > ddr4_2d_fw.bin
+ cat ddr4_imem_2d_pad.bin ${ddr_fw_path}ddr4_dmem_2d.bin > ddr4_2d_fw.bin
dd if=spl/u-boot-spl.bin of=spl/u-boot-spl-pad.bin bs=4 conv=sync
cat spl/u-boot-spl-pad.bin ddr4_1d_fw.bin ddr4_2d_fw.bin > spl/u-boot-spl-ddr.bin
rm -f ddr4_1d_fw.bin ddr4_2d_fw.bin ddr4_imem_1d_pad.bin ddr4_dmem_1d_pad.bin ddr4_imem_2d_pad.bin spl/u-boot-spl-pad.bin
hooks/post-receive
--
UNNAMED PROJECT
|