ARM: uniphier: update U-Boot file names in workflow

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.bin is the
same as spl/u-boot-spl-dtb.bin.  Likewise, u-boot.img is the same as
as u-boot-dtb.img.  So, this change of the flow has no impact.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/doc/README.uniphier b/doc/README.uniphier
index bce70cf5fe433ecb64e77b21f4973658a695f788..bcf0ac3d4b5147b34542fccec518209f1431c388 100644 (file)
--- 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 b340f63cdef6157a41e4be86f8a88472b16bc7cd..6f91ee61ae63dd4d243ed0ea852744fd0a9deeca 100644 (file)
--- 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