Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device tree") and commit 03c25bcd263a ("fdt: Build an SPL binary without device tree"), we can use shorter file names for the output images.
The default configuration for UniPhier SoCs enables CONFIG_OF_SEPARATE and CONFIG_SPL_OF_CONTROL. In this case, spl/u-boot-spl-dtb.bin is the same as spl/u-boot-spl.bin. Likewise, u-boot-dtb.img is the same as u-boot.img. So, this change of the flow has no impact.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
Changes in v2: - Also update include/configs/uniphier.h
doc/README.uniphier | 6 +++--- include/configs/uniphier.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/README.uniphier b/doc/README.uniphier index bce70cf..bcf0ac3 100644 --- a/doc/README.uniphier +++ b/doc/README.uniphier @@ -68,8 +68,8 @@ Burn U-Boot images to NAND --------------------------
Write two files to the NAND device as follows: - - spl/u-boot-spl-dtb.bin at the offset address 0x00000000 - - u-boot-dtb.img at the offset address 0x00010000 + - spl/u-boot-spl.bin at the offset address 0x00000000 + - u-boot.img at the offset address 0x00010000
If a TFTP server is available, the images can be easily updated. Just copy the u-boot-spl-dtb.bin and u-boot-dtb.img to the TFTP public @@ -145,4 +145,4 @@ newer SoCs. Even if it is, EA[25] is not connected on most of the boards.
-- Masahiro Yamada yamada.masahiro@socionext.com -Aug. 2015 +Feb. 2016 diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 97168e9..8856044 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -230,9 +230,9 @@ "nor_base=0x42000000\0" \ "bootm_low=0x80000000\0" \ "nandupdate=nand erase 0 0x00100000 &&" \ - "tftpboot u-boot-spl-dtb.bin &&" \ + "tftpboot u-boot-spl.bin &&" \ "nand write $loadaddr 0 0x00010000 &&" \ - "tftpboot u-boot-dtb.img &&" \ + "tftpboot u-boot.img &&" \ "nand write $loadaddr 0x00010000 0x000f0000\0" \ LINUXBOOT_ENV_SETTINGS