Makefile: Build final mpc85xx non-SPL image in standard file u-boot.bin
Currently Makefile produces final mpc85xx image when SPL is not used in custom file u-boot-with-dtb.bin. It is quite confusing name as build process produce also intermediate file standard file u-boot-dtb.bin (which is just intermediate and not bootable). Other platforms use u-boot.bin (UBOOT_BIN) as standard name for final bootable raw image. So change Makefile rules and binman to produce final bootable file for mpc85xx also into file u-boot.bin. There is just need for mpc85xx to not define default rule for u-boot.bin then instruct binman (via DTS file) to store final image into u-boot.bin (instead of u-boot-with-dtb.bin) and finally rename target u-boot-with-dtb.bin to u-boot.bin. With this change are also removed custom Makefile hacks for mpc85xx that it produced non-standard output file. And also updated documentation. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Tom Rini <trini@konsulko.com> Signed-off-by: Marek Behún <kabel@kernel.org>
This commit is contained in:
@@ -60,5 +60,5 @@ enabled in relative defconfig file,
|
||||
CONFIG_RESET_VECTOR_ADDRESS - 0xffc
|
||||
|
||||
If device tree support is enabled in defconfig,
|
||||
1. use 'u-boot-with-dtb.bin' for NOR boot.
|
||||
1. use 'u-boot.bin' for NOR boot.
|
||||
2. use 'u-boot-with-spl.bin' for other boot.
|
||||
|
||||
@@ -100,9 +100,6 @@ enabled in relative defconfig file,
|
||||
3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
|
||||
CONFIG_RESET_VECTOR_ADDRESS - 0xffc
|
||||
|
||||
If device tree support is enabled in defconfig, use 'u-boot-with-dtb.bin'
|
||||
instead of u-boot.bin for all boot.
|
||||
|
||||
CPLD command
|
||||
============
|
||||
The CPLD is used to control the power sequence and some serdes lane
|
||||
|
||||
@@ -267,7 +267,7 @@ enabled in relative defconfig file,
|
||||
config_reset_vector_address - 0xffc
|
||||
|
||||
if device tree support is enabled in defconfig,
|
||||
1. use 'u-boot-with-dtb.bin' for nor boot.
|
||||
1. use 'u-boot.bin' for nor boot.
|
||||
2. use 'u-boot-with-spl-pbl.bin' for other boot.
|
||||
|
||||
2-stage NAND/SPI/SD boot loader
|
||||
|
||||
@@ -382,5 +382,5 @@ enabled in relative defconfig file,
|
||||
CONFIG_RESET_VECTOR_ADDRESS - 0xffc
|
||||
|
||||
If device tree support is enabled in defconfig,
|
||||
1. use 'u-boot-with-dtb.bin' for NOR boot.
|
||||
1. use 'u-boot.bin' for NOR boot.
|
||||
2. use 'u-boot-with-spl-pbl.bin' for other boot.
|
||||
|
||||
@@ -288,5 +288,5 @@ enabled in relative defconfig file,
|
||||
CONFIG_RESET_VECTOR_ADDRESS - 0xffc
|
||||
|
||||
If device tree support is enabled in defconfig,
|
||||
1. use 'u-boot-with-dtb.bin' for NOR boot.
|
||||
1. use 'u-boot.bin' for NOR boot.
|
||||
2. use 'u-boot-with-spl-pbl.bin' for other boot.
|
||||
|
||||
@@ -284,5 +284,5 @@ enabled in relative defconfig file,
|
||||
CONFIG_RESET_VECTOR_ADDRESS - 0xffc
|
||||
|
||||
If device tree support is enabled in defconfig,
|
||||
1. use 'u-boot-with-dtb.bin' for NOR boot.
|
||||
1. use 'u-boot.bin' for NOR boot.
|
||||
2. use 'u-boot-with-spl-pbl.bin' for other boot.
|
||||
|
||||
Reference in New Issue
Block a user