diff options
| author | Pali Rohár <pali@kernel.org> | 2022-05-02 18:36:39 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-05-23 09:33:10 -0400 |
| commit | 827a232623e9b00e7d1b4b62b46e803d7168bbf5 (patch) | |
| tree | 1e09e8a690ef2e6f3dd532fc9e7ac131c35ed6d3 /Makefile | |
| parent | b898f6a6db7608785c34a127a2ec714ff4496621 (diff) | |
| download | u-boot-socfpga-827a232623e9b00e7d1b4b62b46e803d7168bbf5.tar.gz | |
powerpc: mpc85xx: Fix CONFIG_OF_EMBED support for NOR booting
mpc85xx NOR binary contains also reset vector and therefore option
CONFIG_MPC85XX_HAVE_RESET_VECTOR must be defined.
When build system uses binman, it takes care of constructing final image
which consist of u-boot-without-reset-vector, DTB and reset-vector.
CONFIG_OF_EMBED does not use binman, there is no external DTB and Makefile
produce directly final u-boot.bin binary.
So in this case mpc85xx reset vector must not be stripped from the final
u-boot.bin binary. Fix it.
Signed-off-by: Pali Rohár <pali@kernel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1263,7 +1263,7 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \ - $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),-R .bootpg -R .resetvec) + $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),$(if $(CONFIG_OF_EMBED),,-R .bootpg -R .resetvec)) binary_size_check: u-boot-nodtb.bin FORCE @file_size=$(shell wc -c u-boot-nodtb.bin | awk '{print $$1}') ; \ |