Commit 5a8b634aaee121ecf033c99fc684a1e39519e669
1 parent
07ef0fab23
Exists in
smarc-imx_v2017.03_o8.1.0_1.3.0_8m
and in
1 other branch
MLK-17922 imx8qm: hdp load only when the firmware is ready
There is no need to run hdp load when there is no hdmi firmware in ddr. Signed-off-by: Peng Fan <peng.fan@nxp.com>
Showing 2 changed files with 5 additions and 4 deletions Side-by-side Diff
include/configs/imx8qm_arm2.h
| ... | ... | @@ -186,7 +186,7 @@ |
| 186 | 186 | "hdp_file=dpfw.bin\0" \ |
| 187 | 187 | "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \ |
| 188 | 188 | "mmcboot=echo Booting from mmc ...; " \ |
| 189 | - "run loadhdp; hdp load ${hdp_addr}; " \ | |
| 189 | + "if run loadhdp; then; hdp load ${hdp_addr}; fi;" \ | |
| 190 | 190 | "run mmcargs; " \ |
| 191 | 191 | "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ |
| 192 | 192 | "if run loadfdt; then " \ |
| ... | ... | @@ -208,7 +208,7 @@ |
| 208 | 208 | "else " \ |
| 209 | 209 | "setenv get_cmd tftp; " \ |
| 210 | 210 | "fi; " \ |
| 211 | - "${get_cmd} ${hdp_addr} ${hdp_file}; hdp load ${hdp_addr}; " \ | |
| 211 | + "if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi;" \ | |
| 212 | 212 | "${get_cmd} ${loadaddr} ${image}; " \ |
| 213 | 213 | "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ |
| 214 | 214 | "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ |
include/configs/imx8qm_mek.h
| ... | ... | @@ -99,6 +99,7 @@ |
| 99 | 99 | "${get_cmd} ${loadaddr} xen;" \ |
| 100 | 100 | "${get_cmd} ${fdt_addr} fsl-imx8qm-mek-dom0.dtb;" \ |
| 101 | 101 | "${get_cmd} ${initrd_addr} ${image};" \ |
| 102 | + "if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi" \ | |
| 102 | 103 | "fdt addr ${fdt_addr};" \ |
| 103 | 104 | "fdt resize 256;" \ |
| 104 | 105 | "fdt set /chosen/module@0 reg <0x00000000 ${initrd_addr} 0x00000000 0x${filesize}>; " \ |
| ... | ... | @@ -176,7 +177,7 @@ |
| 176 | 177 | "hdp_file=hdmitxfw.bin\0" \ |
| 177 | 178 | "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \ |
| 178 | 179 | "mmcboot=echo Booting from mmc ...; " \ |
| 179 | - "run loadhdp; hdp load ${hdp_addr}; " \ | |
| 180 | + "if run loadhdp; then; hdp load ${hdp_addr}; fi;" \ | |
| 180 | 181 | "run mmcargs; " \ |
| 181 | 182 | "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ |
| 182 | 183 | "if run loadfdt; then " \ |
| ... | ... | @@ -198,7 +199,7 @@ |
| 198 | 199 | "else " \ |
| 199 | 200 | "setenv get_cmd tftp; " \ |
| 200 | 201 | "fi; " \ |
| 201 | - "${get_cmd} ${hdp_addr} ${hdp_file}; hdp load ${hdp_addr}; " \ | |
| 202 | + "if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi" \ | |
| 202 | 203 | "${get_cmd} ${loadaddr} ${image}; " \ |
| 203 | 204 | "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ |
| 204 | 205 | "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ |