diff options
| author | Ye Li <ye.li@nxp.com> | 2019-03-20 20:16:29 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2019-03-20 20:20:19 -0700 |
| commit | dd0234001713623c79be92b60fa88bc07b07f24f (patch) | |
| tree | b5f69f37a80fb218b7de89de0dd825a5525308b7 | |
| parent | 411f02526aa0d5f0f34a3602bc0f1e9b2ed7f8f5 (diff) | |
imx8mm: Update print_fit_hab and offset dump for flexspi buildrel_virt_4.14.98_4.11_0.10_garel_imx_4.14.98_2.0.0_gap9.0.0_2.2.0-gap9.0.0_2.1.1-auto-gap9.0.0_2.1.0-auto-gap9.0.0_2.0.1-gap9.0.0_2.0.0-gao8.1.0_2.1.1-auto-gao8.1.0_2.1.0-auto-gao8.1.0_2.0.1-gao8.1.0_2.0.0-ga
Because the flexspi build image will add 0x1000 header with flexspi
configurations. So its offset and fit hab blocks needs to change
accordingly.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 250864fedd441a1ab7f4951217e1e3aea6deb604)
| -rw-r--r-- | iMX8M/mkimage_imx8.c | 20 | ||||
| -rwxr-xr-x | iMX8M/print_fit_hab.sh | 10 | ||||
| -rw-r--r-- | iMX8M/soc.mak | 4 |
3 files changed, 28 insertions, 6 deletions
diff --git a/iMX8M/mkimage_imx8.c b/iMX8M/mkimage_imx8.c index e6696ce..201d198 100644 --- a/iMX8M/mkimage_imx8.c +++ b/iMX8M/mkimage_imx8.c @@ -1580,15 +1580,27 @@ int main(int argc, char **argv) fprintf(stderr, "\nSIGNED HDMI FW:\n"); fprintf(stderr, " header_hdmi_off \t0x%x\n", header_hdmi_off); - } else { + } else if (hdmi_img) { fprintf(stderr, "\nHDMI FW:\n"); fprintf(stderr, " header_hdmi_off \t0x%x\n hdmi_off \t\t0x%x\n header_hdmi_2_off \t0x%x\n csf_hdmi_off \t\t0x%x\n", header_hdmi_off, hdmi_off, header_hdmi_2_off, csf_hdmi_off); } - fprintf(stderr, "\nPLUGIN:\n"); - fprintf(stderr, " header_plugin_off \t0x%x\n plugin_off \t\t0x%x\n csf_plugin_off \t0x%x\n", - header_plugin_off, plugin_off, csf_plugin_off); + if (plugin_img) { + fprintf(stderr, "\nPLUGIN:\n"); + fprintf(stderr, " header_plugin_off \t0x%x\n plugin_off \t\t0x%x\n csf_plugin_off \t0x%x\n", + header_plugin_off, plugin_off, csf_plugin_off); + } + + /* The FLEXSPI configuration parameters will add to flash.bin by script, so need add 0x1000 offset to every offset prints */ + if (ivt_offset == IVT_OFFSET_FLEXSPI) { + header_image_off += ivt_offset; + dcd_off += ivt_offset; + image_off += ivt_offset; + csf_off += ivt_offset; + sld_header_off += ivt_offset; + sld_csf_off += ivt_offset; + } fprintf(stderr, "\nLoader IMAGE:\n"); fprintf(stderr, " header_image_off \t0x%x\n dcd_off \t\t0x%x\n image_off \t\t0x%x\n csf_off \t\t0x%x\n", diff --git a/iMX8M/print_fit_hab.sh b/iMX8M/print_fit_hab.sh index b5a41cf..e371374 100755 --- a/iMX8M/print_fit_hab.sh +++ b/iMX8M/print_fit_hab.sh @@ -12,8 +12,14 @@ if [ -z "$ATF_LOAD_ADDR" ]; then exit 0 fi -# We dd flash.bin to 33KB "0x8400" offset, so need minus 0x8400 -let uboot_sign_off=$((fit_off - 0x8400 + 0x3000)) +if [ "$BOOT_DEV" = "flexspi" ]; then + # We dd flash.bin to 0 offset for flexspi + let uboot_sign_off=$((fit_off + 0x3000)) +else + # We dd flash.bin to 33KB "0x8400" offset, so need minus 0x8400 + let uboot_sign_off=$((fit_off - 0x8400 + 0x3000)) +fi + let uboot_size=$(ls -lct u-boot-nodtb.bin | awk '{print $5}') let uboot_load_addr=0x40200000 diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak index 5bfa00a..bc6acc1 100644 --- a/iMX8M/soc.mak +++ b/iMX8M/soc.mak @@ -180,6 +180,10 @@ print_fit_hab: u-boot-nodtb.bin bl31.bin $(dtbs) ./$(PAD_IMAGE) bl31.bin TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./print_fit_hab.sh 0x60000 $(dtbs) +print_fit_hab_flexspi: u-boot-nodtb.bin bl31.bin $(dtbs) + ./$(PAD_IMAGE) bl31.bin + TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) BOOT_DEV="flexspi" ./print_fit_hab.sh 0x60000 $(dtbs) + nightly : $(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/lpddr4_pmu_train_1d_dmem.bin -O lpddr4_pmu_train_1d_dmem.bin $(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/lpddr4_pmu_train_1d_imem.bin -O lpddr4_pmu_train_1d_imem.bin |