aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2022-12-28 19:18:39 +0100
committerTom Rini <trini@konsulko.com>2023-01-06 08:14:19 -0500
commit1b697407aede9d545f7229d2defa64c7ae1eb070 (patch)
tree5e5151ce1ef883694d4171a9988ba6a47a8fd75a /arch
parent8d6cbf5e6bc4e10e38b954763fa025caed517cc2 (diff)
powerpc/mpc85xx: socrates: Re-enable building u-boot-socrates.bin
U-Boot build system builds final U-Boot binary for socrates board in custom file u-boot-socrates.bin (instead of standard u-boot.bin). Output target file u-boot-socrates.bin is generated by binman as defined in board binman config file arch/powerpc/dts/socrates-u-boot.dtsi. But binman was disabled in commit 5af42eafd7e1 ("Makefile: Reduce usage of custom mpc85xx u-boot.bin target") for all mpc85xx boards which do not use standard powerpc binman config file arch/powerpc/dts/u-boot.dtsi and boards which do not require binman at all. The only such mpc85xx board is socrates. So since that commit, U-Boot does not final binary for socrates board anymore. Fix this issue by re-enabling binman for socrates board. And build process starts again producing u-boot-socrates.bin binary. Note that build process for this socrates board always produce u-boot.bin binary which is broken and not usable for socrates board. Long term solution should be to disable building broken binary u-boot.bin and then renaming u-boot-socrates.bin to u-boot.bin, or switching to use common powerpc binman config file arch/powerpc/dts/socrates-u-boot.dtsi (if it is possible). Fixes: 5af42eafd7e1 ("Makefile: Reduce usage of custom mpc85xx u-boot.bin target") Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/cpu/mpc85xx/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 9d12bf168d95..687c51a8c690 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -72,6 +72,7 @@ choice
config TARGET_SOCRATES
bool "Support socrates"
select ARCH_MPC8544
+ select BINMAN
config TARGET_P3041DS
bool "Support P3041DS"